# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1320381896 0
# Node ID 5c32a4038766a1873cec9a55b335e507333d1922
# Parent  3e088515f09222fc3951377f338f5996fed764ba# Parent  824811bd9163a847f2489dbc538401813bb134f7
Merge commit 'ee0c10851ec8410ceceda6f6e576a493d0ac005c'

diff -r 824811bd9163 -r 5c32a4038766 contrib/peer2anonet/peer2anonet
--- a/contrib/peer2anonet/peer2anonet	Fri Nov 04 04:28:03 2011 +0000
+++ b/contrib/peer2anonet/peer2anonet	Fri Nov 04 04:44:56 2011 +0000
@@ -136,7 +136,15 @@
 #########################################################################
 # 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 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 "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 -r 824811bd9163 -r 5c32a4038766 contrib/tor2dns/tor2dns/README
--- a/contrib/tor2dns/tor2dns/README	Fri Nov 04 04:28:03 2011 +0000
+++ b/contrib/tor2dns/tor2dns/README	Fri Nov 04 04:44:56 2011 +0000
@@ -23,21 +23,10 @@
 
 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.