# HG changeset patch
# User d3v11 <d3v11@d3v11.ano>
# Date 1324426244 0
# Node ID 3750fcc21c33d05b61f8cedfff3aa0cf5b5f1030
# Parent  c76e4877f972d0b76b08a28a8c057de15efed1ca
updates to peer2anonet, added "static bird"

diff -r c76e4877f972 -r 3750fcc21c33 contrib/peer2anonet/README.html
--- a/contrib/peer2anonet/README.html	Mon Dec 19 04:17:04 2011 +0000
+++ b/contrib/peer2anonet/README.html	Wed Dec 21 00:10:44 2011 +0000
@@ -93,6 +93,10 @@
 
             <b>CONFIGURATION FILES:</b>
 
+                If /etc/peer2anonet/bird.conf exists, then peer2anonet
+                will not create a new bird. Instead it will use this
+                bird.conf and append new protocols to it. 
+
                 /etc/peer2anonet/peers/$PEER/* contains:
                 
                     asn  local_port  peering_ip  pubkey  remote_ip  remote_port  run  seckey
diff -r c76e4877f972 -r 3750fcc21c33 contrib/peer2anonet/peer2anonet
--- a/contrib/peer2anonet/peer2anonet	Mon Dec 19 04:17:04 2011 +0000
+++ b/contrib/peer2anonet/peer2anonet	Wed Dec 21 00:10:44 2011 +0000
@@ -142,7 +142,10 @@
 bird -c bird.conf -d' > /services/bird/run
     chmod +x /services/bird/run
 
-    echo "function n_AnoNet_mine (prefix arg) {
+    if [ -e /etc/peer2anonet/bird.conf ]; then
+        cp /etc/peer2anonet/bird.conf /services/bird/bird.conf
+    else
+        echo "function n_AnoNet_mine (prefix arg) {
  if arg ~ [ $P2A_NET/24+ ] then return true;
 return false; };
 
@@ -190,6 +193,7 @@
  interface \"eth0\";
  import filter only_AnoNet;
 }" > /services/bird/bird.conf
+    fi
 
     for PEER in `ls /etc/peer2anonet/peers`; do
         mkdir -p /services/"$PEER"