diff options
author | t3sserakt <t3ss@posteo.de> | 2021-08-17 20:37:50 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-08-17 20:37:50 +0200 |
commit | 48b633f2a47f47200fb72cca8d84b1f0c2d44ee0 (patch) | |
tree | 5d91e9191e3d4def1da30314818a8d9edf0deb73 | |
parent | 32a8c505c1fa27bb43c4e7c8d288566d51417f56 (diff) | |
download | gnunet-48b633f2a47f47200fb72cca8d84b1f0c2d44ee0.tar.gz gnunet-48b633f2a47f47200fb72cca8d84b1f0c2d44ee0.zip |
- moved additional files from testbed to testing
-rwxr-xr-x | src/testbed/netjail_exec.sh | 16 | ||||
-rwxr-xr-x | src/testbed/netjail_start.sh | 52 | ||||
-rwxr-xr-x | src/testbed/netjail_stop.sh | 26 | ||||
-rwxr-xr-x | src/testing/netjail_core.sh (renamed from src/testbed/netjail_core.sh) | 0 | ||||
-rwxr-xr-x | src/testing/netjail_exec.sh | 2 | ||||
-rwxr-xr-x | src/testing/netjail_start.sh | 2 | ||||
-rwxr-xr-x | src/testing/netjail_stop.sh | 2 |
7 files changed, 3 insertions, 97 deletions
diff --git a/src/testbed/netjail_exec.sh b/src/testbed/netjail_exec.sh deleted file mode 100755 index b76d2e444..000000000 --- a/src/testbed/netjail_exec.sh +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | . "./../testbed/netjail_core.sh" | ||
3 | |||
4 | set -eu | ||
5 | set -x | ||
6 | |||
7 | export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" | ||
8 | |||
9 | M=$1 | ||
10 | N=$2 | ||
11 | |||
12 | NODE=$(netjail_print_name "N" $N $M) | ||
13 | |||
14 | |||
15 | |||
16 | netjail_node_exec_without_fds $NODE $3 $4 $5 $1 $2 | ||
diff --git a/src/testbed/netjail_start.sh b/src/testbed/netjail_start.sh deleted file mode 100755 index 4c1c33c83..000000000 --- a/src/testbed/netjail_start.sh +++ /dev/null | |||
@@ -1,52 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | . "./../testbed/netjail_core.sh" | ||
3 | |||
4 | set -eu | ||
5 | set -x | ||
6 | |||
7 | export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" | ||
8 | |||
9 | LOCAL_M=$1 | ||
10 | GLOBAL_N=$2 | ||
11 | |||
12 | # TODO: stunserver? ..and globally known peer? | ||
13 | |||
14 | shift 2 | ||
15 | |||
16 | LOCAL_GROUP="192.168.15" | ||
17 | GLOBAL_GROUP="92.68.150" | ||
18 | |||
19 | NETWORK_NET=$(netjail_print_name "n" $GLOBAL_N $LOCAL_M) | ||
20 | |||
21 | netjail_bridge $NETWORK_NET | ||
22 | |||
23 | for N in $(seq $GLOBAL_N); do | ||
24 | ROUTER=$(netjail_print_name "R" $N) | ||
25 | |||
26 | netjail_node $ROUTER | ||
27 | netjail_node_link_bridge $ROUTER $NETWORK_NET "$GLOBAL_GROUP.$N" 24 | ||
28 | |||
29 | ROUTER_NET=$(netjail_print_name "r" $N) | ||
30 | |||
31 | netjail_bridge $ROUTER_NET | ||
32 | |||
33 | for M in $(seq $LOCAL_M); do | ||
34 | NODE=$(netjail_print_name "N" $N $M) | ||
35 | |||
36 | netjail_node $NODE | ||
37 | netjail_node_link_bridge $NODE $ROUTER_NET "$LOCAL_GROUP.$M" 24 | ||
38 | done | ||
39 | |||
40 | ROUTER_ADDR="$LOCAL_GROUP.$(($LOCAL_M+1))" | ||
41 | |||
42 | netjail_node_link_bridge $ROUTER $ROUTER_NET $ROUTER_ADDR 24 | ||
43 | netjail_node_add_nat $ROUTER $ROUTER_ADDR 24 | ||
44 | |||
45 | for M in $(seq $LOCAL_M); do | ||
46 | NODE=$(netjail_print_name "N" $N $M) | ||
47 | |||
48 | netjail_node_add_default $NODE $ROUTER_ADDR | ||
49 | done | ||
50 | done | ||
51 | |||
52 | |||
diff --git a/src/testbed/netjail_stop.sh b/src/testbed/netjail_stop.sh deleted file mode 100755 index 689bf7ae9..000000000 --- a/src/testbed/netjail_stop.sh +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | . "./../testbed/netjail_core.sh" | ||
3 | |||
4 | set -eu | ||
5 | set -x | ||
6 | |||
7 | export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" | ||
8 | |||
9 | LOCAL_M=$1 | ||
10 | GLOBAL_N=$2 | ||
11 | NETWORK_NET=$(netjail_print_name "n" $GLOBAL_N $LOCAL_M) | ||
12 | |||
13 | shift 2 | ||
14 | |||
15 | for N in $(seq $GLOBAL_N); do | ||
16 | for M in $(seq $LOCAL_M); do | ||
17 | netjail_node_clear $(netjail_print_name "N" $N $M) | ||
18 | done | ||
19 | |||
20 | netjail_bridge_clear $(netjail_print_name "r" $N) | ||
21 | netjail_node_clear $(netjail_print_name "R" $N) | ||
22 | done | ||
23 | |||
24 | netjail_bridge_clear $NETWORK_NET | ||
25 | |||
26 | echo "Done" | ||
diff --git a/src/testbed/netjail_core.sh b/src/testing/netjail_core.sh index f49d4b312..f49d4b312 100755 --- a/src/testbed/netjail_core.sh +++ b/src/testing/netjail_core.sh | |||
diff --git a/src/testing/netjail_exec.sh b/src/testing/netjail_exec.sh index b76d2e444..c20a8c117 100755 --- a/src/testing/netjail_exec.sh +++ b/src/testing/netjail_exec.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | . "./../testbed/netjail_core.sh" | 2 | . "./../testing/netjail_core.sh" |
3 | 3 | ||
4 | set -eu | 4 | set -eu |
5 | set -x | 5 | set -x |
diff --git a/src/testing/netjail_start.sh b/src/testing/netjail_start.sh index 4c1c33c83..0984a3c42 100755 --- a/src/testing/netjail_start.sh +++ b/src/testing/netjail_start.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | . "./../testbed/netjail_core.sh" | 2 | . "./../testing/netjail_core.sh" |
3 | 3 | ||
4 | set -eu | 4 | set -eu |
5 | set -x | 5 | set -x |
diff --git a/src/testing/netjail_stop.sh b/src/testing/netjail_stop.sh index 689bf7ae9..08f68cf7f 100755 --- a/src/testing/netjail_stop.sh +++ b/src/testing/netjail_stop.sh | |||
@@ -1,5 +1,5 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | . "./../testbed/netjail_core.sh" | 2 | . "./../testing/netjail_core.sh" |
3 | 3 | ||
4 | set -eu | 4 | set -eu |
5 | set -x | 5 | set -x |