# HG changeset patch
# User icann <icann@icann.ano>
# Date 1348329439 0
# Node ID cd6c3110c354679eb79fee7f3bf995b6a3d32f9d
# Parent  48b9a040a04bc7ac2b99d1f3ecd930e82388a37c# Parent  4b4db105ae32bb4efd07332c6826525f6fb463e5
Merge branch 'master' of git://git1.srn.ano

diff -r 4b4db105ae32 -r cd6c3110c354 db/as/975/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/as/975/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+Name
diff -r 4b4db105ae32 -r cd6c3110c354 db/dom/ano/name/ns/1.22.22.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/name/ns/1.22.22.1	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+
diff -r 4b4db105ae32 -r cd6c3110c354 db/dom/ano/name/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/dom/ano/name/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+Name
diff -r 4b4db105ae32 -r cd6c3110c354 db/ip/01/16/16/cidr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/16/16/cidr	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+1.22.22.0/24
diff -r 4b4db105ae32 -r cd6c3110c354 db/ip/01/16/16/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/ip/01/16/16/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+Name
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/FFF/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/FFF/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/FFF/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/FFF/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+e514dbf335addab8f95e14084f9948e549b73078befbbf61328bf63c5dcfca27
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/FFF/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/FFF/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+keiko
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/FFF/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/FFF/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/FFF
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+042e1a6f24b0847ceee261a9f213ffe1fa17dfd4e62348604cb2e2156ce20d3a
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+icann
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/IcannNet
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/Clandestine/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/Clandestine/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+3de75a1b61212b15838ebb57cc29dd5731d240cb83816894e761ccd0e1ef6d42
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/Clandestine/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+d3v11
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/IcannNet/Clandestine/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/IcannNet/Clandestine/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/IcannNet/Clandestine
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/NeXuS/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/NeXuS/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+ab6f47bcfd1a50ae62762bd94c4a8ec5e2b5bf60cb97aae2d4f52fa519fd447f
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/NeXuS/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+mama
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/NeXuS/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/NeXuS/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/NeXus
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/WeeD/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/WeeD/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+c26b04eaeadb83e256b915e911e4c3c3f52ba9dbd71cd226fc0ef3db08cb006c
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/WeeD/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+weed
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/WeeD/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/WeeD/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/relayhell/WeeD
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/nyx/@/.gitignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/.gitignore	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+temp.keys
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/nyx/@/default.key
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/default.key	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+89b2093e7579c5568cc2301ad08efea743059ecb4e0b15b28fca9b1abdc41267
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/nyx/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+nyx
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4/relayhell/nyx/@/path
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4/relayhell/nyx/@/path	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+/relayhell/nyx
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4_chat/anonet/@/owner
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4_chat/anonet/@/owner	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+legion
\ No newline at end of file
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4_chat/anonet/@/pubkey
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4_chat/anonet/@/pubkey	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+f5fc06fc146eb7ebabe2dbfa7711346703e976ba021062b4e976f9007f0dda4f
\ No newline at end of file
diff -r 4b4db105ae32 -r cd6c3110c354 db/udpmsg4_chat/anonet/@/seckey
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/db/udpmsg4_chat/anonet/@/seckey	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,1 @@
+f0b05bc6e944a3e9f5315df5a8b57706b25d8c02e4d86f8558664d015fb3f784
\ No newline at end of file
diff -r 4b4db105ae32 -r cd6c3110c354 scripts/add_udpmsg4_chat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/add_udpmsg4_chat	Sat Sep 22 15:57:19 2012 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+if [ -z $3 ]; then
+ echo "Usage: $0 <chat> <owner> <pubkey> <seckey>" >&2; exit 255
+fi
+chat="$1"
+owner="$2"
+pubkey="$3"
+seckey="$4"
+
+if [ "$(echo -n "${chat/chat\//}" | tr -d 'A-Za-z0-9_-' | wc -c | tr -d ' \t')" != 0 ]; then
+ echo "udpmsg4 chats do not allow funny chars." >&2; exit 255
+fi
+if ((`echo -n "${chat/chat\//}" | wc -c` > 32)); then
+ echo "udpmsg4 chats cannot be greater than 32 chars." >&2; exit 255
+fi
+if [ "$(echo "$chat" | head -c5)" != chat/ ]; then
+ echo "udpmsg4 chats start with chat/." >&2; exit 255
+fi
+if ((`echo -n "$pubkey$seckey" | tr -d 'a-fA-F0-9' | wc -c | tr -d ' \t'` != 0)); then
+ echo "nacl keys are hex chars." >&2; exit 255
+fi
+if ((`echo -n "$pubkey$seckey" | wc -c` != 128)); then
+ echo "nacl keys are 64 chars." >&2; exit 255
+fi
+
+fullchat=db/udpmsg4_chat/${chat/chat\//}
+mkdir -p $fullchat || exit 1
+mkdir -p $fullchat/@ || exit 1
+echo -n "$owner" >"$fullchat/@/owner"
+echo -n "$pubkey" >"$fullchat/@/pubkey"
+echo -n "$seckey" >"$fullchat/@/seckey"