for the nat we need the client and server?

diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 682edf989049b944cc48e43e01998eacbd62047b..93a36abda9942e85ff95689ee720c64e560e3c8a 100644 (file)
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -3,7 +3,7 @@ DISABLEV6 = YES
 PORT = 12368
 BINDTO = 127.0.0.1
 BEHIND_NAT = YES
-ALLOW_NAT = NO
+ENABLE_NAT_SERVER = YES
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
@@ -37,8 +37,8 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = tcp
-DEBUG = NO
-#PREFIX = xterm -T transport2 -e gdb --args
+DEBUG = YES
+#PREFIX = xterm -T transport2 --args
 #PREFIX = valgrind --leak-check=full
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
@@ -95,9 +95,7 @@ HOSTNAME = localhost
 PORT = 12366
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368[mesh]
+[mesh]
 AUTOSTART = NO
 PORT = 10511
 HOSTNAME = localhost

diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index c3e4e1f01cea0f1980d3a132634810c51379b6e0..ccc888e4b00a0d5e153b1c95cf212551dff2423c 100644 (file)
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,9 +1,9 @@
 [transport-tcp]
 DISABLEV6 = YES
-PORT = 22368
+PORT = 0
 BINDTO = 127.0.0.1
 BEHIND_NAT = NO
-ALLOW_NAT = YES
+ENABLE_NAT_CLIENT = YES
 EXTERNAL_ADDRESS = 127.0.0.1
 INTERNAL_ADDRESS = 127.0.0.1
 
@@ -37,7 +37,7 @@ MINIMUM-FRIENDS = 0
 
 [transport]
 PLUGINS = tcp
-DEBUG = NO
+DEBUG = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
@@ -95,10 +95,6 @@ HOSTNAME = localhost
 PORT = 22366
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
 
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
 [TESTING]
 WEAKRANDOM = YES