3 files changed, 28 insertions, 12 deletions

diff --git a/contrib/netjail/netjail_core.sh b/contrib/netjail/netjail_core.sh
index 8c1744853..302ae922f 100755
--- a/contrib/netjail/netjail_core.sh
+++ b/contrib/netjail/netjail_core.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 #
 
-
+INTERFACE_FORMAT_STRING="%s%06x-%06x"
+PREPREFIX=if
 PREFIX=${PPID:?must run from a parent process}
 
 # running with `sudo` is required to be
@@ -93,7 +94,7 @@ netjail_check_bin() {
 netjail_bridge() {
         netjail_next_interface
         local NUM=$RESULT
-        local BRIDGE=$(printf "%06x-%08x" $PREFIX $NUM)
+        local BRIDGE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
 
         ip link add $BRIDGE type bridge
         ip link set dev $BRIDGE up
@@ -104,7 +105,7 @@ netjail_bridge() {
 netjail_bridge_name() {
         netjail_next_interface
         local NUM=$RESULT
-        local BRIDGE=$(printf "%06x-%08x" $PREFIX $NUM)
+        local BRIDGE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
         
         RESULT=$BRIDGE
 }
@@ -118,7 +119,7 @@ netjail_bridge_clear() {
 netjail_node() {
         netjail_next_namespace
         local NUM=$RESULT
-        local NODE=$(printf "%06x-%08x" $PREFIX $NUM)
+        local NODE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
 
         ip netns add $NODE
         
@@ -128,7 +129,7 @@ netjail_node() {
 netjail_node_name() {
         netjail_next_namespace
         local NUM=$RESULT
-        local NODE=$(printf "%06x-%08x" $PREFIX $NUM)
+        local NODE=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM)
         
         RESULT=$NODE
 }
@@ -150,8 +151,8 @@ netjail_node_link_bridge() {
         netjail_next_interface
         local NUM_BR=$RESULT
         
-        local LINK_IF=$(printf "%06x-%08x" $PREFIX $NUM_IF)
-        local LINK_BR=$(printf "%06x-%08x" $PREFIX $NUM_BR)
+        local LINK_IF=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM_IF)
+        local LINK_BR=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM_BR)
 
         ip link add $LINK_IF type veth peer name $LINK_BR
         ip link set $LINK_IF netns $NODE
@@ -172,7 +173,7 @@ netjail_node_link_bridge_name() {
         netjail_next_interface
         local NUM_BR=$RESULT
         
-        local LINK_BR=$(printf "%06x-%08x" $PREFIX $NUM_BR)
+        local LINK_BR=$(printf $INTERFACE_FORMAT_STRING $PREPREFIX $PREFIX $NUM_BR)
         
         RESULT=$LINK_BR
 }
@@ -192,7 +193,7 @@ netjail_node_add_nat() {
   ip netns exec $NODE nft add table nat
   ip netns exec $NODE nft add chain nat postrouting { type nat hook postrouting priority 0 \; }
   ip netns exec $NODE nft add rule ip nat postrouting ip saddr "$ADDRESS/$MASK" counter masquerade
-        # ip netns exec $NODE iptables -t nat -A POSTROUTING -s "$ADDRESS/$MASK" -j MASQUERADE
+  # ip netns exec $NODE iptables -t nat -A POSTROUTING -s "$ADDRESS/$MASK" -j MASQUERADE
 }
 
 netjail_node_add_default() {
diff --git a/contrib/netjail/netjail_start.sh b/contrib/netjail/netjail_start.sh
index 5e613048f..e68745746 100755
--- a/contrib/netjail/netjail_start.sh
+++ b/contrib/netjail/netjail_start.sh
@@ -24,8 +24,17 @@ fi
 shift 2
 
 LOCAL_GROUP="192.168.15"
-GLOBAL_GROUP="172.16.150"
-KNOWN_GROUP="172.16.151"
+GLOBAL_GROUP="92.68.150"
+KNOWN_GROUP="92.68.151"
+# Use the IP addresses below instead of the public ones,
+# if the script was not started from within a new namespace
+# created by unshare. The UPNP test case needs public IP
+# addresse for miniupnpd to function.
+# FIXME The ip addresses are used in the c code too. We should
+# introduce a switch indicating if public addresses should be
+# used or not. This info has to be propagated to the c code.
+#GLOBAL_GROUP="172.16.150"
+#KNOWN_GROUP="172.16.151"
 
 if [ $BROADCAST -eq 0  ]; then
    PORT="60002"
@@ -123,6 +132,6 @@ for N in $(seq $GLOBAL_N); do
     fi
     if [ "" != "${R_SCRIPT[$N]}" ]
     then
-        ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]}
+        ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]} ${ROUTER_NETS[$N]} 1
     fi
 done
diff --git a/contrib/netjail/netjail_stop.sh b/contrib/netjail/netjail_stop.sh
index c8739dc94..55bcf2a5e 100755
--- a/contrib/netjail/netjail_stop.sh
+++ b/contrib/netjail/netjail_stop.sh
@@ -43,6 +43,12 @@ for N in $(seq $GLOBAL_N); do
     netjail_node_link_bridge_name
     ROUTER_LINKS[$N]=$RESULT
 
+    if [ -d /tmp/netjail_scripts ]
+    then
+        ip netns exec ${ROUTERS[$N]} ./${R_SCRIPT[$N]} ${ROUTER_NETS[$N]} 0
+        rm -rf /tmp/netjail_scripts
+    fi
+
     netjail_node_unlink_bridge ${ROUTER_LINKS[$N]}
     
         for M in $(seq $LOCAL_M); do