2 files changed, 163 insertions, 32 deletions

diff --git a/contrib/scripts/netjail/netjail_core.sh b/contrib/scripts/netjail/netjail_core.sh
index 6a18ea902..1cdbca816 100755
--- a/contrib/scripts/netjail/netjail_core.sh
+++ b/contrib/scripts/netjail/netjail_core.sh
@@ -9,10 +9,28 @@ JAILOR=${SUDO_USER:?must run in sudo}
 
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
-netjail_check() {
-        NODE_COUNT=$1
+netjail_opt() {
+        local OPT=$1
+        shift 1
+
+        INDEX=1
+
+        while [ $# -gt 0 ]; do
+                if [ "$1" = "$OPT" ]; then
+                        printf "%d" $INDEX
+                        return
+                fi
+
+                INDEX=$(($INDEX + 1))
+                shift 1
+        done
 
-        FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4))
+        printf "%d" 0
+}
+
+netjail_check() {
+        local NODE_COUNT=$1
+        local FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4))
 
         # quit if `$FD_COUNT < ($LOCAL_M * $GLOBAL_N * 2)`:
         # the script also requires `sudo -C ($FD_COUNT + 4)`
@@ -25,43 +43,56 @@ netjail_check() {
         fi
 }
 
+netjail_check_bin() {
+        local PROGRAM=$1
+        local MATCH=$(ls $(echo $PATH | tr ":" "\n") | grep "^$PROGRAM\$" | tr "\n" " " | awk '{ print $1 }')
+
+        # quit if the required binary $PROGRAM can not be
+        # found in the used $PATH.
+
+        if [ "$MATCH" != "$PROGRAM" ]; then
+                echo "Required binary not found: $PROGRAM" >&2
+                exit 1
+        fi
+}
+
 netjail_print_name() {
         printf "%s%02x%02x" $1 $2 ${3:-0}
 }
 
 netjail_bridge() {
-        BRIDGE=$1
+        local BRIDGE=$1
 
         ip link add $BRIDGE type bridge
         ip link set dev $BRIDGE up
 }
 
 netjail_bridge_clear() {
-        BRIDGE=$1
+        local BRIDGE=$1
 
         ip link delete $BRIDGE
 }
 
 netjail_node() {
-        NODE=$1
+        local NODE=$1
 
         ip netns add $NODE
 }
 
 netjail_node_clear() {
-        NODE=$1
+        local NODE=$1
 
         ip netns delete $NODE
 }
 
 netjail_node_link_bridge() {
-        NODE=$1
-        BRIDGE=$2
-        ADDRESS=$3
-        MASK=$4
+        local NODE=$1
+        local BRIDGE=$2
+        local ADDRESS=$3
+        local MASK=$4
         
-        LINK_IF="$NODE-$BRIDGE-0"
-        LINK_BR="$NODE-$BRIDGE-1"
+        local LINK_IF="$NODE-$BRIDGE-0"
+        local LINK_BR="$NODE-$BRIDGE-1"
 
         ip link add $LINK_IF type veth peer name $LINK_BR
         ip link set $LINK_IF netns $NODE
@@ -74,27 +105,71 @@ netjail_node_link_bridge() {
         ip link set $LINK_BR up
 }
 
+netjail_node_unlink_bridge() {
+        local NODE=$1
+        local BRIDGE=$2
+        
+        local LINK_BR="$NODE-$BRIDGE-1"
+
+        ip link delete $LINK_BR
+}
+
 netjail_node_add_nat() {
-        NODE=$1
-        ADDRESS=$2
-        MASK=$3
+        local NODE=$1
+        local ADDRESS=$2
+        local MASK=$3
 
         ip netns exec $NODE iptables -t nat -A POSTROUTING -s "$ADDRESS/$MASK" -j MASQUERADE
 }
 
 netjail_node_add_default() {
-        NODE=$1
-        ADDRESS=$2
+        local NODE=$1
+        local ADDRESS=$2
 
         ip -n $NODE route add default via $ADDRESS
 }
 
 netjail_node_exec() {
-        NODE=$1
-        FD_IN=$2
-        FD_OUT=$3
+        local NODE=$1
+        local FD_IN=$2
+        local FD_OUT=$3
         shift 3
 
         unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
 }
 
+netjail_kill() {
+        local PID=$1
+        local MATCH=$(ps --pid $PID | awk "{ if ( \$1 == $PID ) { print \$1 } }" | wc -l)
+
+        if [ $MATCH -gt 0 ]; then
+                kill -n 19 $PID
+
+                for CHILD in $(ps -o pid,ppid -ax | awk "{ if ( \$2 == $PID ) { print \$1 } }"); do
+                        netjail_kill $CHILD
+                done
+
+                kill $PID
+        fi
+}
+
+netjail_killall() {
+        if [ $# -gt 0 ]; then
+                local PIDS=$1
+
+                for PID in $PIDS; do
+                        netjail_kill $PID
+                done
+        fi
+}
+
+netjail_waitall() {
+        if [ $# -gt 0 ]; then
+                local PIDS=$1
+
+                for PID in $PIDS; do
+                        wait $PID
+                done
+        fi
+}
+
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"