tools/multiple-bgpd: Fix the PREV calculation so it works for <4 bgpd

* tools/multiple-bgpd: Make PREV more general and correct. Add comment
  to route-map about why rt/soo sets are there - cause it's still broken.

diff --git a/tools/multiple-bgpd.sh b/tools/multiple-bgpd.sh
index d6a38ed4511f69b26f17773a9575db9549a1f0c5..20a92a91606c01c69a01a2ae3fdf44933720263f 100644 (file)
--- a/tools/multiple-bgpd.sh
+++ b/tools/multiple-bgpd.sh
@@ -20,7 +20,7 @@ for H in `seq 1 ${NUM}` ; do
        if [ ! -e "$CONF" ] ; then
                # This sets up a ring of bgpd peerings
                NEXT=$(( ($H % ${NUM}) + 1 ))
-               PREV=$(( (($H + 3) % ${NUM}) + 1 ))
+               PREV=$(( (($H + $NUM - 2) % ${NUM}) + 1 ))
                NEXTADDR="${PREFIX}${NEXT}"
                NEXTAS=$((${ASBASE} + $NEXT))
                PREVADDR="${PREFIX}${PREV}"
@@ -60,6 +60,7 @@ for H in `seq 1 ${NUM}` ; do
                         neighbor ${PREVADDR} peer-group default
                         exit-address-family
                        !
+                       ! bgpd still has problems with extcommunity rt/soo
                        route-map test permit 10
                         set extcommunity rt ${ASN}:1
                         set extcommunity soo ${ASN}:2