Merge branch 'master' of git://git1.srn.ano

20 files changed, 47 insertions, 16 deletions

diff --git a/contrib/peer2anonet/peer2anonet b/contrib/peer2anonet/peer2anonet
index 64af216..4bbb164 100644
--- a/contrib/peer2anonet/peer2anonet
+++ b/contrib/peer2anonet/peer2anonet
@@ -136,7 +136,15 @@ mkdir -p /services/"$PEERNAME"
 #########################################################################
 # Create files to configure the new peering session:
 echo "#!/bin/sh
+# uncomment if your peer has a dynamic IP
+#
 #export REMOTE_FLOAT=1
+
+# uncomment for debugging. you'll need to use ./run to view output instead
+# of svc -u /service/<peer name>
+#
+#export DEBUG=1
+
 export REMOTE_ADDRESS=$REMOTEIP
 export REMOTE_PORT=$PEERPORT
 export LOCAL_PORT=$ADDPORT
@@ -144,11 +152,25 @@ export PRIVATE_KEY=\"\$(cat seckey)\"
 export PUBLIC_KEY=$PUBKEY
 export TUN_MODE=1
 export INTERFACE=ppp-$PEERNAME
+
+# uncomment if you want to nuke your default gateway and configure
+# routes only to peers through IcannNet. If any of your peers use
+# dynamic IP's or you use Tor or i2p then this is probably NOT a
+# good idea. You may need to modify the DEFAULT_ROUTE code below.
+# If you run into problems with this please email d3v11@d3v11.ano
+# so I can create a patch.
+#
+#DEFAULT_ROUTE=\`ip route show | grep default | cut -d' ' -f 3\`
+#route del default gw \$DEFAULT_ROUTE
+#route add \$REMOTE_ADDRESS gw \$DEFAULT_ROUTE
+
 ( sleep 5;
  ip addr add $P2A_IP peer $PEERIP/32 dev \$INTERFACE scope link
  ip addr add $P2A_ROUTE/32 dev \$INTERFACE scope global
  ip link set dev \$INTERFACE up
- ping -c 1 -I $INTERFACE -r -w 5
+# comment the following ping line to remove pinghack. this is a
+# trick used to help bird connect.
+ ping -c 1 -I \$INTERFACE $PEERIP -r -w 5
 ) &
 exec /usr/sbin/quicktun.nacltai" > /services/"$PEERNAME"/run
 chmod +x /services/"$PEERNAME"/run
@@ -161,8 +183,9 @@ echo 'Secret Key Goes Here!' > "/services/$PEERNAME/seckey"
 echo "peer2anonet: New peering session configured.
 Please place your secret key in: /services/$PEERNAME/seckey
 
-To allow remote floating:
-uncomment REMOTE_FLOAT=1 in /services/$PEERNAME/run"
+Some additional options are available in /services/$PEERNAME/run
+Please read the comments in the file for details. You may need to
+restart the bird daemon. ie, svc -t /service/bird "
 
 
 
diff --git a/contrib/tor2dns/tor2dns/README b/contrib/tor2dns/tor2dns/README
index 4379a98..5194c76 100644
--- a/contrib/tor2dns/tor2dns/README
+++ b/contrib/tor2dns/tor2dns/README
@@ -23,21 +23,10 @@ echo 'new dns link >>> http://'`cat /var/lib/tor/tor2dns/hostname`':8053'
 
 UPDATE:
 
-# pull a copy using tor 
-usewithtor wget http://nbafkr7odek2wh6r.onion/peer2anonet.tgz
-
 # pull a copy from AnoNet2
-wget http://d3v11.ano/peer2anonet.tgz
-
-
-POST INSTALL:
-	You will want to make sure port fowarding is turned on, on
-	port 8053 of your router, you may also need to adjust your
-	firewall. you can test for success by opening your browser
-	with tor enabled and going to the link given @ the end of
-	your installation. :-) enjoy.
+wget http://d3v11.ano/tor2dns.tgz
 
 NOTE:
 	On some systems /var/lib/tor/tor2dns will need a special owner
 	like "debian-tor". If tor2dns fails for you please troubleshoot
-	your logs, port fowarding, etc.
+	your logs.
diff --git a/db/as/125/owner b/db/as/125/owner
new file mode 100644
index 0000000..577ea5f
--- /dev/null
+++ b/db/as/125/owner
@@ -0,0 +1 @@
+Richard
diff --git a/db/as/14/owner b/db/as/14/owner
new file mode 100644
index 0000000..e8e4de5
--- /dev/null
+++ b/db/as/14/owner
@@ -0,0 +1 @@
+Obee
diff --git a/db/dom/ano/cotichopa/ns/a.ns.cotichopa.ano b/db/dom/ano/cotichopa/ns/a.ns.cotichopa.ano
new file mode 100644
index 0000000..4a57dff
--- /dev/null
+++ b/db/dom/ano/cotichopa/ns/a.ns.cotichopa.ano
@@ -0,0 +1 @@
+1.2.5.3
diff --git a/db/dom/ano/cotichopa/owner b/db/dom/ano/cotichopa/owner
new file mode 100644
index 0000000..577ea5f
--- /dev/null
+++ b/db/dom/ano/cotichopa/owner
@@ -0,0 +1 @@
+Richard
diff --git a/db/dom/ano/onet/ns/ns.onet.ano b/db/dom/ano/onet/ns/ns.onet.ano
new file mode 100644
index 0000000..b0b45e5
--- /dev/null
+++ b/db/dom/ano/onet/ns/ns.onet.ano
@@ -0,0 +1 @@
+1.1.12.2
diff --git a/db/dom/ano/onet/owner b/db/dom/ano/onet/owner
new file mode 100644
index 0000000..e8e4de5
--- /dev/null
+++ b/db/dom/ano/onet/owner
@@ -0,0 +1 @@
+Obee
diff --git a/db/ip/01/01/0E/cidr b/db/ip/01/01/0E/cidr
new file mode 100644
index 0000000..aae6890
--- /dev/null
+++ b/db/ip/01/01/0E/cidr
@@ -0,0 +1 @@
+1.1.14.0/24
diff --git a/db/ip/01/01/0E/owner b/db/ip/01/01/0E/owner
new file mode 100644
index 0000000..e8e4de5
--- /dev/null
+++ b/db/ip/01/01/0E/owner
@@ -0,0 +1 @@
+Obee
diff --git a/db/ip/01/01/42/cidr b/db/ip/01/01/42/cidr
new file mode 100644
index 0000000..15edfc0
--- /dev/null
+++ b/db/ip/01/01/42/cidr
@@ -0,0 +1 @@
+1.1.66.0/24
diff --git a/db/ip/01/01/42/owner b/db/ip/01/01/42/owner
new file mode 100644
index 0000000..e8e4de5
--- /dev/null
+++ b/db/ip/01/01/42/owner
@@ -0,0 +1 @@
+Obee
diff --git a/db/ip/01/02/05/cidr b/db/ip/01/02/05/cidr
new file mode 100644
index 0000000..a397d39
--- /dev/null
+++ b/db/ip/01/02/05/cidr
@@ -0,0 +1 @@
+1.2.5.0/24
diff --git a/db/ip/01/02/05/owner b/db/ip/01/02/05/owner
new file mode 100644
index 0000000..577ea5f
--- /dev/null
+++ b/db/ip/01/02/05/owner
@@ -0,0 +1 @@
+Richard
diff --git a/db/udpmsg4/HackInt/@/.gitignore b/db/udpmsg4/HackInt/@/.gitignore
new file mode 100644
index 0000000..b19a917
--- /dev/null
+++ b/db/udpmsg4/HackInt/@/.gitignore
@@ -0,0 +1 @@
+temp.keys
diff --git a/db/udpmsg4/HackInt/@/default.key b/db/udpmsg4/HackInt/@/default.key
new file mode 100644
index 0000000..a3df7d7
--- /dev/null
+++ b/db/udpmsg4/HackInt/@/default.key
@@ -0,0 +1 @@
+46db3ee63c69084e330fd40c7295bd98a09e3d053f3995aeb2c93e256a71f14c
diff --git a/db/udpmsg4/HackInt/@/owner b/db/udpmsg4/HackInt/@/owner
new file mode 100644
index 0000000..095936c
--- /dev/null
+++ b/db/udpmsg4/HackInt/@/owner
@@ -0,0 +1 @@
+somerandomnick
diff --git a/db/udpmsg4/HackInt/@/path b/db/udpmsg4/HackInt/@/path
new file mode 100644
index 0000000..8bbef09
--- /dev/null
+++ b/db/udpmsg4/HackInt/@/path
@@ -0,0 +1 @@
+/HackInt
diff --git a/db/usr/Richard/git b/db/usr/Richard/git
new file mode 100644
index 0000000..d8ae071
--- /dev/null
+++ b/db/usr/Richard/git
@@ -0,0 +1 @@
+git://1.2.5.1/
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod
index 85edb59..a59d1d7 100644
--- a/doc/www.anonet2.org/public_pod/index.pod
+++ b/doc/www.anonet2.org/public_pod/index.pod
@@ -61,6 +61,8 @@ Z<><table>
  <tr><td>IRCZ<></td><td>L<UFO|irc://anortr.ucis.nl:8805/anonet></td><td>L<aooo|http://www.anonet2.org/irc_anonymity> (Hidden IP, visible username and realname)</td></tr>
  <tr><td>IRCZ<></td><td>L<UFO|irc://irc.kwaaknet.org:6667/anonet></td><td>L<nooo|http://www.anonet2.org/irc_anonymity> (Visible IP, username and realname (warning!))</td></tr>
 -->
+ <tr><td>IRCZ<></td><td>L<d3v11|irc://v7ygpbs5s62zqei6.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
+ <tr><td>IRCZ<></td><td>L<whatis-theplan|irc://mjf6cqigsjeqhsb3.onion/anonet></td><td>L<aaoa|http://www.anonet2.org/irc_anonymity> (Hidden IP, username and realname, custom nickname)</td></tr>
 <!--
  <tr><td>TelnetZ<></td><td>L<SRN|telnet://anortr.ucis.nl:8803/></td><td>L<aaya|http://www.anonet2.org/irc_anonymity> (Hidden IP and username, custom nickname)</td></tr>
 -->