From 6d8da6d92a633fe812f8c4d0630c232de6a0e04d Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 17 May 2011 15:46:11 +0000 Subject: for the nat we need the client and server? --- src/transport/test_transport_api_tcp_nat_peer1.conf | 10 ++++------ src/transport/test_transport_api_tcp_nat_peer2.conf | 10 +++------- 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 682edf989..93a36abda 100644 --- 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 c3e4e1f01..ccc888e4b 100644 --- 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 -- cgit v1.2.3