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() {
         FD_OUT=$3
         shift 3
 
-        unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
+        ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
 }
 
 netjail_node_exec_without_fds() {
         NODE=$1
         shift 1
 
-        unshare -fp --kill-child -- ip netns exec $NODE sudo -u $JAILOR -- $@
+        ip netns exec $NODE sudo -u $JAILOR -- $@
 }
 
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 @@
+@INLINE@ template_cfg_peer1.conf
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
+
+[transport]
+BINARY = gnunet-service-tng
+PLUGINS = tcp
+#PREFIX = valgrind --log-file=/tmp/vg_peer1-%p
+UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p1.sock
+
+[communicator-tcp]
+BINARY = gnunet-communicator-tcp
+BINDTO = 192.168.15.1:60002
+DISABLE_V6 = YES
+IMMEDIATE_START = YES
+UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p1.sock
+#PREFIX = valgrind --log-file=/tmp/vg_cpeer1-%p
+
+[peerstore]
+IMMEDIATE_START = YES
+
+#[transport]
+#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 @@
+@INLINE@ template_cfg_peer2.conf
+[PATHS]
+GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
+
+[transport]
+BINARY = gnunet-service-tng
+#PREFIX = valgrind --log-file=/tmp/vg_peer2-%p
+UNIXPATH = $GNUNET_RUNTIME_DIR/tng-p2.sock
+
+[communicator-tcp]
+BINARY = gnunet-communicator-tcp
+BINDTO = 192.168.15.2:60003
+DISABLE_V6 = YES
+IMMEDIATE_START = YES
+#PREFIX = valgrind --log-file=/tmp/vg_comm2-%p
+UNIXPATH = $GNUNET_RUNTIME_DIR/tcp-comm-p2.sock
+
+[peerstore]
+IMMEDIATE_START = YES
+
+#[transport]
+#PREFIX = valgrind