# HG changeset patch
# User pikaj00 <pikaj00@gmail.com>
# Date 1325014754 18000
# Node ID ac62c140366baf86b1a2d7370dfddb30bbc946d6
# Parent  fd59bad51e2583fd9f7980faeff008239f6a7e0b# Parent  1a037f07507059b50cb87cab683fe105539fb714
Merge branch 'master' of git://git1.srn.ano

diff -r 1a037f075070 -r ac62c140366b contrib/peer2anonet/README.html
--- a/contrib/peer2anonet/README.html	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/peer2anonet/README.html	Tue Dec 27 14:39:14 2011 -0500
@@ -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 1a037f075070 -r ac62c140366b contrib/peer2anonet/peer2anonet
--- a/contrib/peer2anonet/peer2anonet	Wed Dec 21 18:43:03 2011 +0000
+++ b/contrib/peer2anonet/peer2anonet	Tue Dec 27 14:39:14 2011 -0500
@@ -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"