diff options
Diffstat (limited to 'contrib/scripts/netjail/netjail_setup_internet.sh')
-rwxr-xr-x | contrib/scripts/netjail/netjail_setup_internet.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/contrib/scripts/netjail/netjail_setup_internet.sh b/contrib/scripts/netjail/netjail_setup_internet.sh index 94aec007e..7ff25c014 100755 --- a/contrib/scripts/netjail/netjail_setup_internet.sh +++ b/contrib/scripts/netjail/netjail_setup_internet.sh | |||
@@ -18,6 +18,16 @@ netjail_check $(($LOCAL_M * $GLOBAL_N)) | |||
18 | # Starts optionally 'stunserver' on "92.68.150.$(($GLOBAL_N + 1))": | 18 | # Starts optionally 'stunserver' on "92.68.150.$(($GLOBAL_N + 1))": |
19 | STUN=$(netjail_opt '--stun' $@) | 19 | STUN=$(netjail_opt '--stun' $@) |
20 | 20 | ||
21 | if [ $STUN -gt 0 ]; then | ||
22 | netjail_check_bin stunserver | ||
23 | |||
24 | shift 1 | ||
25 | |||
26 | STUN_NODE=$(netjail_print_name "S" 254) | ||
27 | fi | ||
28 | |||
29 | netjail_check_bin $1 | ||
30 | |||
21 | LOCAL_GROUP="192.168.15" | 31 | LOCAL_GROUP="192.168.15" |
22 | GLOBAL_GROUP="92.68.150" | 32 | GLOBAL_GROUP="92.68.150" |
23 | 33 | ||
@@ -60,13 +70,8 @@ WAITING="" | |||
60 | KILLING="" | 70 | KILLING="" |
61 | 71 | ||
62 | if [ $STUN -gt 0 ]; then | 72 | if [ $STUN -gt 0 ]; then |
63 | shift 1 | ||
64 | |||
65 | S=$(($GLOBAL_N + 1)) | ||
66 | STUN_NODE=$(netjail_print_name "S" $S) | ||
67 | |||
68 | netjail_node $STUN_NODE | 73 | netjail_node $STUN_NODE |
69 | netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.$S" 24 | 74 | netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.254" 24 |
70 | 75 | ||
71 | netjail_node_exec $STUN_NODE 0 1 stunserver & | 76 | netjail_node_exec $STUN_NODE 0 1 stunserver & |
72 | KILLING="$!" | 77 | KILLING="$!" |
@@ -90,7 +95,7 @@ for PID in $KILLING; do netjail_kill $PID; done | |||
90 | wait | 95 | wait |
91 | 96 | ||
92 | if [ $STUN -gt 0 ]; then | 97 | if [ $STUN -gt 0 ]; then |
93 | STUN_NODE=$(netjail_print_name "S" $(($GLOBAL_N + 1))) | 98 | STUN_NODE=$(netjail_print_name "S" 254) |
94 | 99 | ||
95 | netjail_node_unlink_bridge $STUN_NODE $NETWORK_NET | 100 | netjail_node_unlink_bridge $STUN_NODE $NETWORK_NET |
96 | netjail_node_clear $STUN_NODE | 101 | netjail_node_clear $STUN_NODE |