summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2010-11-11 13:28:59 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2010-11-11 13:28:59 +0000
commit26dbab092216d23db2c51061d1291015b4e01f94 (patch)
treebbfd69940f13ed5a8212c9de11559e8552207351 /src
parentb3ed5b2cba088e93f928cf9d49f3f6e4c2f54e42 (diff)
Next try to fix the tcp reliability test problem
This config fixes the failing at least on my system
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf15
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf13
2 files changed, 15 insertions, 13 deletions
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index b06b53d24..554f01246 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,7 +1,12 @@
[transport-tcp]
+DISABLEV6 = YES
PORT = 12368
BINDTO = 127.0.0.1
-
+BEHIND_NAT = YES
+ONLY_NAT_ADDRESSES = YES
+ALLOW_NAT = NO
+INTERNAL_ADDRESS = 127.0.0.1
+EXTERNAL_ADDRESS = 127.0.0.1
[fs]
AUTOSTART = NO
@@ -32,7 +37,7 @@ MINIMUM-FRIENDS = 0
[transport]
PLUGINS = tcp
-DEBUG = NO
+#DEBUG = YES
#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p
ACCEPT_FROM6 = ::1;
@@ -90,10 +95,6 @@ HOSTNAME = localhost
PORT = 12366
UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 12368
-
[TESTING]
WEAKRANDOM = YES
@@ -101,7 +102,7 @@ WEAKRANDOM = YES
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
+#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 55fb76076..96ae620ca 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -1,6 +1,11 @@
[transport-tcp]
+DISABLEV6 = YES
PORT = 22368
BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+ALLOW_NAT = YES
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
[core]
AUTOSTART = NO
@@ -32,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
@@ -91,10 +96,6 @@ HOSTNAME = localhost
PORT = 22366
UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-[transport-tcp]
-TIMEOUT = 300000
-PORT = 22368
-
[TESTING]
WEAKRANDOM = YES
@@ -102,7 +103,7 @@ WEAKRANDOM = YES
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
+#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/