diff options
Diffstat (limited to 'src/testing')
-rwxr-xr-x | src/testing/netjail_exec.sh | 16 | ||||
-rwxr-xr-x | src/testing/netjail_start.sh | 52 | ||||
-rwxr-xr-x | src/testing/netjail_stop.sh | 26 | ||||
-rw-r--r-- | src/testing/testing_api_cmd_send_peer_ready.c | 4 |
4 files changed, 96 insertions, 2 deletions
diff --git a/src/testing/netjail_exec.sh b/src/testing/netjail_exec.sh new file mode 100755 index 000000000..b76d2e444 --- /dev/null +++ b/src/testing/netjail_exec.sh | |||
@@ -0,0 +1,16 @@ | |||
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/testing/netjail_start.sh b/src/testing/netjail_start.sh new file mode 100755 index 000000000..4c1c33c83 --- /dev/null +++ b/src/testing/netjail_start.sh | |||
@@ -0,0 +1,52 @@ | |||
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/testing/netjail_stop.sh b/src/testing/netjail_stop.sh new file mode 100755 index 000000000..689bf7ae9 --- /dev/null +++ b/src/testing/netjail_stop.sh | |||
@@ -0,0 +1,26 @@ | |||
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/testing/testing_api_cmd_send_peer_ready.c b/src/testing/testing_api_cmd_send_peer_ready.c index 27761c4d5..e5e004924 100644 --- a/src/testing/testing_api_cmd_send_peer_ready.c +++ b/src/testing/testing_api_cmd_send_peer_ready.c | |||
@@ -32,7 +32,7 @@ | |||
32 | 32 | ||
33 | struct SendPeerReadyState | 33 | struct SendPeerReadyState |
34 | { | 34 | { |
35 | TESTBED_CMD_HELPER_write_cb write_message; | 35 | TESTING_CMD_HELPER_write_cb write_message; |
36 | 36 | ||
37 | struct GNUNET_CMDS_PEER_STARTED *reply; | 37 | struct GNUNET_CMDS_PEER_STARTED *reply; |
38 | }; | 38 | }; |
@@ -85,7 +85,7 @@ send_peer_ready_run (void *cls, | |||
85 | */ | 85 | */ |
86 | struct GNUNET_TESTING_Command | 86 | struct GNUNET_TESTING_Command |
87 | GNUNET_TESTING_cmd_send_peer_ready (const char *label, | 87 | GNUNET_TESTING_cmd_send_peer_ready (const char *label, |
88 | TESTBED_CMD_HELPER_write_cb write_message) | 88 | TESTING_CMD_HELPER_write_cb write_message) |
89 | { | 89 | { |
90 | struct SendPeerReadyState *sprs; | 90 | struct SendPeerReadyState *sprs; |
91 | 91 | ||