- fixed bug with broadcast test.

- added configurable port for router in netjail_start.sh.
- added key for configuring broadcast in topo.sh.
- port for communicators can variable.
- added variable additional_connects in GNUNET_TESTING_NetjailTopology.
- additional connects can be configured in topology file.
- added distance vector test with circle topology.
- Reassambly for fragmentation is now stored at VirtualLink, not at Neighbour.
- DV forwarding distingush between control flow and payload.
- handling fragment box switch to be based on VirtualLink.
- reliability box will not be handled like a fragment.
- propagating next retransmission attempt variable of fragment to the root message.
- check for fragmentation when adding reliability box.
- several smaller bug fixes.

2 files changed, 12 insertions, 1 deletions

diff --git a/contrib/netjail/netjail_start.sh b/contrib/netjail/netjail_start.sh
index 997ad0a95..f7c417c27 100755
--- a/contrib/netjail/netjail_start.sh
+++ b/contrib/netjail/netjail_start.sh
@@ -11,6 +11,8 @@ filename=$1
 PREFIX=$2
 readfile=$3
 
+BROADCAST=0
+
 if [ $readfile -eq 0 ]
 then
     read_topology_string "$filename"
@@ -25,6 +27,11 @@ LOCAL_GROUP="192.168.15"
 GLOBAL_GROUP="92.68.150"
 KNOWN_GROUP="92.68.151"
 
+if [ $BROADCAST -eq 0  ]; then
+   PORT="60002"
+else
+    PORT="2086"
+fi
 
 echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16]"
 
@@ -75,7 +82,7 @@ for N in $(seq $GLOBAL_N); do
     fi
     if [ "1" == "${R_UDP[$N]}" ]
     then
-        ip netns exec ${ROUTERS[$N]} iptables -t nat -A PREROUTING -p udp -d $GLOBAL_GROUP.$N --dport 60002 -j DNAT --to $LOCAL_GROUP.1
+        ip netns exec ${ROUTERS[$N]} iptables -t nat -A PREROUTING -p udp -d $GLOBAL_GROUP.$N --dport $PORT -j DNAT --to $LOCAL_GROUP.1
         ip netns exec ${ROUTERS[$N]} iptables -A FORWARD -d $LOCAL_GROUP.1  -m state --state NEW,RELATED,ESTABLISHED -j ACCEPT
     fi
 done
diff --git a/contrib/netjail/topo.sh b/contrib/netjail/topo.sh
index 9af017ff0..d7586d425 100755
--- a/contrib/netjail/topo.sh
+++ b/contrib/netjail/topo.sh
@@ -76,6 +76,10 @@ parse_line(){
     then
         PLUGIN=$(cut -d : -f 2 <<< $line)
         echo $PLUGIN
+    elif [ "$key" = "B" ]
+    then
+        BROADCAST=$(cut -d : -f 2 <<< $line)
+        echo $BROADCAST
     elif [ "$key" = "K" ]
     then
         echo know node