aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/netjail/netjail_start.sh9
-rwxr-xr-xcontrib/netjail/topo.sh4
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
11PREFIX=$2 11PREFIX=$2
12readfile=$3 12readfile=$3
13 13
14BROADCAST=0
15
14if [ $readfile -eq 0 ] 16if [ $readfile -eq 0 ]
15then 17then
16 read_topology_string "$filename" 18 read_topology_string "$filename"
@@ -25,6 +27,11 @@ LOCAL_GROUP="192.168.15"
25GLOBAL_GROUP="92.68.150" 27GLOBAL_GROUP="92.68.150"
26KNOWN_GROUP="92.68.151" 28KNOWN_GROUP="92.68.151"
27 29
30if [ $BROADCAST -eq 0 ]; then
31 PORT="60002"
32else
33 PORT="2086"
34fi
28 35
29echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16]" 36echo "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
81done 88done
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