diff options
Diffstat (limited to 'contrib')
-rwxr-xr-x | contrib/netjail/netjail_start.sh | 9 | ||||
-rwxr-xr-x | contrib/netjail/topo.sh | 4 |
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 | |||
11 | PREFIX=$2 | 11 | PREFIX=$2 |
12 | readfile=$3 | 12 | readfile=$3 |
13 | 13 | ||
14 | BROADCAST=0 | ||
15 | |||
14 | if [ $readfile -eq 0 ] | 16 | if [ $readfile -eq 0 ] |
15 | then | 17 | then |
16 | read_topology_string "$filename" | 18 | read_topology_string "$filename" |
@@ -25,6 +27,11 @@ LOCAL_GROUP="192.168.15" | |||
25 | GLOBAL_GROUP="92.68.150" | 27 | GLOBAL_GROUP="92.68.150" |
26 | KNOWN_GROUP="92.68.151" | 28 | KNOWN_GROUP="92.68.151" |
27 | 29 | ||
30 | if [ $BROADCAST -eq 0 ]; then | ||
31 | PORT="60002" | ||
32 | else | ||
33 | PORT="2086" | ||
34 | fi | ||
28 | 35 | ||
29 | echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16]" | 36 | echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16]" |
30 | 37 | ||
@@ -75,7 +82,7 @@ for N in $(seq $GLOBAL_N); do | |||
75 | fi | 82 | fi |
76 | if [ "1" == "${R_UDP[$N]}" ] | 83 | if [ "1" == "${R_UDP[$N]}" ] |
77 | then | 84 | then |
78 | ip netns exec ${ROUTERS[$N]} iptables -t nat -A PREROUTING -p udp -d $GLOBAL_GROUP.$N --dport 60002 -j DNAT --to $LOCAL_GROUP.1 | 85 | ip netns exec ${ROUTERS[$N]} iptables -t nat -A PREROUTING -p udp -d $GLOBAL_GROUP.$N --dport $PORT -j DNAT --to $LOCAL_GROUP.1 |
79 | ip netns exec ${ROUTERS[$N]} iptables -A FORWARD -d $LOCAL_GROUP.1 -m state --state NEW,RELATED,ESTABLISHED -j ACCEPT | 86 | ip netns exec ${ROUTERS[$N]} iptables -A FORWARD -d $LOCAL_GROUP.1 -m state --state NEW,RELATED,ESTABLISHED -j ACCEPT |
80 | fi | 87 | fi |
81 | done | 88 | 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(){ | |||
76 | then | 76 | then |
77 | PLUGIN=$(cut -d : -f 2 <<< $line) | 77 | PLUGIN=$(cut -d : -f 2 <<< $line) |
78 | echo $PLUGIN | 78 | echo $PLUGIN |
79 | elif [ "$key" = "B" ] | ||
80 | then | ||
81 | BROADCAST=$(cut -d : -f 2 <<< $line) | ||
82 | echo $BROADCAST | ||
79 | elif [ "$key" = "K" ] | 83 | elif [ "$key" = "K" ] |
80 | then | 84 | then |
81 | echo know node | 85 | echo know node |