1 files changed, 67 insertions, 11 deletions

diff --git a/contrib/scripts/netjail/netjail_setup_internet.sh b/contrib/scripts/netjail/netjail_setup_internet.sh
index d99709555..de8ef8f15 100755
--- a/contrib/scripts/netjail/netjail_setup_internet.sh
+++ b/contrib/scripts/netjail/netjail_setup_internet.sh
@@ -9,16 +9,30 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 LOCAL_M=$1
 GLOBAL_N=$2
 
-# TODO: stunserver? ..and globally known peer?
+# TODO: globally known peer?
 
 shift 2
 
 netjail_check $(($LOCAL_M * $GLOBAL_N))
 
+# Starts optionally 'stunserver' on "92.68.150.$(($GLOBAL_N + 1))":
+STUN=$(netjail_opt '--stun' $@)
+
+if [ $STUN -gt 0 ]; then
+        netjail_check_bin stunserver
+        
+        shift 1
+        
+        STUN_NODE=$(netjail_print_name "S" 254)
+fi
+
+netjail_check_bin $1
+
 LOCAL_GROUP="192.168.15"
 GLOBAL_GROUP="92.68.150"
 
-echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/24]"
+CLEANUP=0
+echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/24, stun: $STUN]"
 
 NETWORK_NET=$(netjail_print_name "n" $GLOBAL_N $LOCAL_M)
 
@@ -53,6 +67,17 @@ for N in $(seq $GLOBAL_N); do
         done
 done
 
+WAITING=""
+KILLING=""
+
+if [ $STUN -gt 0 ]; then
+        netjail_node $STUN_NODE
+        netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.254" 24
+
+        netjail_node_exec $STUN_NODE 0 1 stunserver &
+        KILLING="$!"
+fi
+
 for N in $(seq $GLOBAL_N); do
         for M in $(seq $LOCAL_M); do
                 NODE=$(netjail_print_name "N" $N $M)
@@ -62,20 +87,51 @@ for N in $(seq $GLOBAL_N); do
                 FD_Y=$(($INDEX * 2 + 3 + 1))
 
                 netjail_node_exec $NODE $FD_X $FD_Y $@ &
+                WAITING="$! $WAITING"
         done
 done
 
-wait
+cleanup() {
+        if [ $STUN -gt 0 ]; then
+                STUN_NODE=$(netjail_print_name "S" 254)
 
-for N in $(seq $GLOBAL_N); do
-        for M in $(seq $LOCAL_M); do
-                netjail_node_clear $(netjail_print_name "N" $N $M)
+                netjail_node_unlink_bridge $STUN_NODE $NETWORK_NET
+                netjail_node_clear $STUN_NODE
+        fi
+
+        for N in $(seq $GLOBAL_N); do
+                ROUTER_NET=$(netjail_print_name "r" $N)
+
+                for M in $(seq $LOCAL_M); do
+                        NODE=$(netjail_print_name "N" $N $M)
+
+                        netjail_node_unlink_bridge $NODE $ROUTER_NET
+                        netjail_node_clear $NODE
+                done
+
+                ROUTER=$(netjail_print_name "R" $N)
+                
+                netjail_bridge_clear $ROUTER_NET
+                netjail_node_unlink_bridge $ROUTER $NETWORK_NET
+                netjail_node_clear $ROUTER
         done
-        
-        netjail_bridge_clear $(netjail_print_name "r" $N)
-        netjail_node_clear $(netjail_print_name "R" $N)
-done
 
-netjail_bridge_clear $NETWORK_NET
+        netjail_bridge_clear $NETWORK_NET
+}
+
+trapped_cleanup() {
+        netjail_killall $WAITING
+        netjail_killall $KILLING
+
+        cleanup
+}
+
+trap 'trapped_cleanup' 2
+
+netjail_waitall $WAITING
+netjail_killall $KILLING
+wait
+
+cleanup
 
 echo "Done"