diff options
author | t3sserakt <t3ss@posteo.de> | 2021-08-01 14:59:33 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2021-08-01 14:59:33 +0200 |
commit | 61375320041b2c11ef9c10c21239fd2e24692a9a (patch) | |
tree | 81da891fe2b69e26ef241c7a8eeb31c7f501b526 | |
parent | f15deffc74ae9cb9ea9b32c14f55e4e125d0f4ba (diff) | |
download | gnunet-61375320041b2c11ef9c10c21239fd2e24692a9a.tar.gz gnunet-61375320041b2c11ef9c10c21239fd2e24692a9a.zip |
- added config files for netjail testing. removed unshare from netjail script
-rwxr-xr-x | src/testbed/netjail_core.sh | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api2_tcp_node1.conf | 23 | ||||
-rw-r--r-- | src/transport/test_transport_api2_tcp_node2.conf | 22 |
3 files changed, 47 insertions, 2 deletions
diff --git a/src/testbed/netjail_core.sh b/src/testbed/netjail_core.sh index 792b1df24..f49d4b312 100755 --- a/src/testbed/netjail_core.sh +++ b/src/testbed/netjail_core.sh | |||
@@ -95,13 +95,13 @@ netjail_node_exec() { | |||
95 | FD_OUT=$3 | 95 | FD_OUT=$3 |
96 | shift 3 | 96 | shift 3 |
97 | 97 | ||
98 | unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN | 98 | ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN |
99 | } | 99 | } |
100 | 100 | ||
101 | netjail_node_exec_without_fds() { | 101 | netjail_node_exec_without_fds() { |
102 | NODE=$1 | 102 | NODE=$1 |
103 | shift 1 | 103 | shift 1 |
104 | 104 | ||
105 | unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@ | 105 | ip netns exec $NODE sudo -u $JAILOR -- $@ |
106 | } | 106 | } |
107 | 107 | ||
diff --git a/src/transport/test_transport_api2_tcp_node1.conf b/src/transport/test_transport_api2_tcp_node1.conf new file mode 100644 index 000000000..a867ea81a --- /dev/null +++ b/src/transport/test_transport_api2_tcp_node1.conf | |||
@@ -0,0 +1,23 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | ||
2 | [PATHS] | ||
3 | GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/ | ||
4 | |||
5 | [transport] | ||
6 | BINARY = gnunet-service-tng | ||
7 | PLUGINS = tcp | ||
8 | #PREFIX = valgrind --log-file=/tmp/vg_peer1-%p | ||
9 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock | ||
10 | |||
11 | [communicator-tcp] | ||
12 | BINARY = gnunet-communicator-tcp | ||
13 | BINDTO = 192.168.15.1:60002 | ||
14 | DISABLE_V6 = YES | ||
15 | IMMEDIATE_START = YES | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock | ||
17 | #PREFIX = valgrind --log-file=/tmp/vg_cpeer1-%p | ||
18 | |||
19 | [peerstore] | ||
20 | IMMEDIATE_START = YES | ||
21 | |||
22 | #[transport] | ||
23 | #PREFIX = valgrind | ||
diff --git a/src/transport/test_transport_api2_tcp_node2.conf b/src/transport/test_transport_api2_tcp_node2.conf new file mode 100644 index 000000000..f94368b3f --- /dev/null +++ b/src/transport/test_transport_api2_tcp_node2.conf | |||
@@ -0,0 +1,22 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | ||
2 | [PATHS] | ||
3 | GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/ | ||
4 | |||
5 | [transport] | ||
6 | BINARY = gnunet-service-tng | ||
7 | #PREFIX = valgrind --log-file=/tmp/vg_peer2-%p | ||
8 | UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock | ||
9 | |||
10 | [communicator-tcp] | ||
11 | BINARY = gnunet-communicator-tcp | ||
12 | BINDTO = 192.168.15.2:60003 | ||
13 | DISABLE_V6 = YES | ||
14 | IMMEDIATE_START = YES | ||
15 | #PREFIX = valgrind --log-file=/tmp/vg_comm2-%p | ||
16 | UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock | ||
17 | |||
18 | [peerstore] | ||
19 | IMMEDIATE_START = YES | ||
20 | |||
21 | #[transport] | ||
22 | #PREFIX = valgrind | ||