diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2021-07-01 20:37:51 +0200 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2021-07-01 20:37:51 +0200 |
commit | e8db1a67cdd270d655e677ffff52f72d5fe4000b (patch) | |
tree | 1d76393653187b07dab5ed6ef4d6ff606a4e5ac8 /contrib/scripts | |
parent | b6252033387779338051eb617f2594a0b3c851bc (diff) | |
download | gnunet-e8db1a67cdd270d655e677ffff52f72d5fe4000b.tar.gz gnunet-e8db1a67cdd270d655e677ffff52f72d5fe4000b.zip |
-added global nodes without NAT to netjail
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat (limited to 'contrib/scripts')
-rwxr-xr-x | contrib/scripts/netjail/netjail_core.sh | 17 | ||||
-rwxr-xr-x | contrib/scripts/netjail/netjail_setup_internet.sh | 50 |
2 files changed, 60 insertions, 7 deletions
diff --git a/contrib/scripts/netjail/netjail_core.sh b/contrib/scripts/netjail/netjail_core.sh index 1cdbca816..d070f7220 100755 --- a/contrib/scripts/netjail/netjail_core.sh +++ b/contrib/scripts/netjail/netjail_core.sh | |||
@@ -28,6 +28,23 @@ netjail_opt() { | |||
28 | printf "%d" 0 | 28 | printf "%d" 0 |
29 | } | 29 | } |
30 | 30 | ||
31 | netjail_opts() { | ||
32 | local OPT=$1 | ||
33 | local DEF=$2 | ||
34 | shift 2 | ||
35 | |||
36 | while [ $# -gt 0 ]; do | ||
37 | if [ "$1" = "$OPT" ]; then | ||
38 | printf "$2" | ||
39 | return | ||
40 | fi | ||
41 | |||
42 | shift 1 | ||
43 | done | ||
44 | |||
45 | printf "$DEF" | ||
46 | } | ||
47 | |||
31 | netjail_check() { | 48 | netjail_check() { |
32 | local NODE_COUNT=$1 | 49 | local NODE_COUNT=$1 |
33 | local FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4)) | 50 | local FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4)) |
diff --git a/contrib/scripts/netjail/netjail_setup_internet.sh b/contrib/scripts/netjail/netjail_setup_internet.sh index de8ef8f15..6ae047274 100755 --- a/contrib/scripts/netjail/netjail_setup_internet.sh +++ b/contrib/scripts/netjail/netjail_setup_internet.sh | |||
@@ -9,15 +9,25 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" | |||
9 | LOCAL_M=$1 | 9 | LOCAL_M=$1 |
10 | GLOBAL_N=$2 | 10 | GLOBAL_N=$2 |
11 | 11 | ||
12 | # TODO: globally known peer? | ||
13 | |||
14 | shift 2 | 12 | shift 2 |
15 | 13 | ||
16 | netjail_check $(($LOCAL_M * $GLOBAL_N)) | 14 | netjail_check $(($LOCAL_M * $GLOBAL_N)) |
17 | 15 | ||
18 | # Starts optionally 'stunserver' on "92.68.150.$(($GLOBAL_N + 1))": | 16 | # Starts optionally an amount of nodes without NAT starting with "92.68.151.1" |
17 | KNOWN=$(netjail_opt '--known' $@) | ||
18 | KNOWN_NUM=$(netjail_opts '--known' 0 $@) | ||
19 | |||
20 | # Starts optionally 'stunserver' on "92.68.150.254": | ||
19 | STUN=$(netjail_opt '--stun' $@) | 21 | STUN=$(netjail_opt '--stun' $@) |
20 | 22 | ||
23 | if [ $KNOWN -gt 0 ]; then | ||
24 | shift 2 | ||
25 | |||
26 | KNOWN=$KNOWN_NUM | ||
27 | |||
28 | netjail_check $(($LOCAL_M * $GLOBAL_N + $KNOWN)) | ||
29 | fi | ||
30 | |||
21 | if [ $STUN -gt 0 ]; then | 31 | if [ $STUN -gt 0 ]; then |
22 | netjail_check_bin stunserver | 32 | netjail_check_bin stunserver |
23 | 33 | ||
@@ -30,19 +40,27 @@ netjail_check_bin $1 | |||
30 | 40 | ||
31 | LOCAL_GROUP="192.168.15" | 41 | LOCAL_GROUP="192.168.15" |
32 | GLOBAL_GROUP="92.68.150" | 42 | GLOBAL_GROUP="92.68.150" |
43 | KNOWN_GROUP="92.68.151" | ||
33 | 44 | ||
34 | CLEANUP=0 | 45 | CLEANUP=0 |
35 | echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/24, stun: $STUN]" | 46 | echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16, stun: $STUN]" |
36 | 47 | ||
37 | NETWORK_NET=$(netjail_print_name "n" $GLOBAL_N $LOCAL_M) | 48 | NETWORK_NET=$(netjail_print_name "n" $GLOBAL_N $LOCAL_M) |
38 | 49 | ||
39 | netjail_bridge $NETWORK_NET | 50 | netjail_bridge $NETWORK_NET |
40 | 51 | ||
52 | for X in $(seq $KNOWN); do | ||
53 | KNOWN_NODE=$(netjail_print_name "K" $X) | ||
54 | |||
55 | netjail_node $KNOWN_NODE | ||
56 | netjail_node_link_bridge $KNOWN_NODE $NETWORK_NET "$KNOWN_GROUP.$X" 16 | ||
57 | done | ||
58 | |||
41 | for N in $(seq $GLOBAL_N); do | 59 | for N in $(seq $GLOBAL_N); do |
42 | ROUTER=$(netjail_print_name "R" $N) | 60 | ROUTER=$(netjail_print_name "R" $N) |
43 | 61 | ||
44 | netjail_node $ROUTER | 62 | netjail_node $ROUTER |
45 | netjail_node_link_bridge $ROUTER $NETWORK_NET "$GLOBAL_GROUP.$N" 24 | 63 | netjail_node_link_bridge $ROUTER $NETWORK_NET "$GLOBAL_GROUP.$N" 16 |
46 | 64 | ||
47 | ROUTER_NET=$(netjail_print_name "r" $N) | 65 | ROUTER_NET=$(netjail_print_name "r" $N) |
48 | 66 | ||
@@ -72,16 +90,27 @@ KILLING="" | |||
72 | 90 | ||
73 | if [ $STUN -gt 0 ]; then | 91 | if [ $STUN -gt 0 ]; then |
74 | netjail_node $STUN_NODE | 92 | netjail_node $STUN_NODE |
75 | netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.254" 24 | 93 | netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.254" 16 |
76 | 94 | ||
77 | netjail_node_exec $STUN_NODE 0 1 stunserver & | 95 | netjail_node_exec $STUN_NODE 0 1 stunserver & |
78 | KILLING="$!" | 96 | KILLING="$!" |
79 | fi | 97 | fi |
80 | 98 | ||
99 | for X in $(seq $KNOWN); do | ||
100 | KNOWN_NODE=$(netjail_print_name "K" $X) | ||
101 | INDEX=$(($X - 1)) | ||
102 | |||
103 | FD_X=$(($INDEX * 2 + 3 + 0)) | ||
104 | FD_Y=$(($INDEX * 2 + 3 + 1)) | ||
105 | |||
106 | netjail_node_exec $KNOWN_NODE $FD_X $FD_Y $@ & | ||
107 | WAITING="$! $WAITING" | ||
108 | done | ||
109 | |||
81 | for N in $(seq $GLOBAL_N); do | 110 | for N in $(seq $GLOBAL_N); do |
82 | for M in $(seq $LOCAL_M); do | 111 | for M in $(seq $LOCAL_M); do |
83 | NODE=$(netjail_print_name "N" $N $M) | 112 | NODE=$(netjail_print_name "N" $N $M) |
84 | INDEX=$(($LOCAL_M * ($N - 1) + $M - 1)) | 113 | INDEX=$(($LOCAL_M * ($N - 1) + $M - 1 + $KNOWN)) |
85 | 114 | ||
86 | FD_X=$(($INDEX * 2 + 3 + 0)) | 115 | FD_X=$(($INDEX * 2 + 3 + 0)) |
87 | FD_Y=$(($INDEX * 2 + 3 + 1)) | 116 | FD_Y=$(($INDEX * 2 + 3 + 1)) |
@@ -99,6 +128,13 @@ cleanup() { | |||
99 | netjail_node_clear $STUN_NODE | 128 | netjail_node_clear $STUN_NODE |
100 | fi | 129 | fi |
101 | 130 | ||
131 | for X in $(seq $KNOWN); do | ||
132 | KNOWN_NODE=$(netjail_print_name "K" $X) | ||
133 | |||
134 | netjail_node_unlink_bridge $KNOWN_NODE $NETWORK_NET | ||
135 | netjail_node_clear $KNOWN_NODE | ||
136 | done | ||
137 | |||
102 | for N in $(seq $GLOBAL_N); do | 138 | for N in $(seq $GLOBAL_N); do |
103 | ROUTER_NET=$(netjail_print_name "r" $N) | 139 | ROUTER_NET=$(netjail_print_name "r" $N) |
104 | 140 | ||