test case configuration changes, to make nat tests more realistic

diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 082bf1c27c6fc2479765dcfcaa88fb79b613c1ed..a60bd6ff58ecb314853a4cb3c202499da407fb7b 100644 (file)
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -38,6 +38,7 @@ else
 install-exec-hook:
 endif
 
+#noinst_PROGRAMS = ${check_PROGRAMS}
 
 lib_LTLIBRARIES = \
   libgnunettransport.la

diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index c0f7a1088d6d2729d8d63c27e41c77eacb43c5cf..f6b38dde3cfdc87f59568bdf185740d9a066de79 100644 (file)
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,4 +1,5 @@
 [transport-tcp]
+DISABLEV6 = YES
 PORT = 12368
 BINDTO = 127.0.0.1
 BEHIND_NAT = YES
@@ -103,6 +104,7 @@ PORT = 12368
 WEAKRANDOM = YES
 
 [gnunetd]
+DISABLEV6 = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]

diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index dd24a3bf37ea1e24521887fcad2ac7078542e0c9..90587da0b6a66548ebfc8f6643fb7d12cd62bdad 100644 (file)
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,4 +1,5 @@
 [transport-tcp]
+DISABLEV6 = YES
 PORT = 22368
 BINDTO = 127.0.0.1
 BEHIND_NAT = NO
@@ -102,6 +103,7 @@ PORT = 22368
 WEAKRANDOM = YES
 
 [gnunetd]
+DISABLEV6 = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]

diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index bd16a64a7c86457f9f58086ee4e4c687fd31c3e1..db3940cb70c7634bcfb90f21d7c671ecd0f23890 100644 (file)
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,6 +1,7 @@
 [transport-udp]
 PORT = 12368
 BEHIND_NAT = YES
+BINDTO = 127.0.0.1
 ALLOW_NAT = NO
 ONLY_NAT_ADDRESSES = YES
 INTERNAL_ADDRESS = 127.0.0.1

diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 9645acca897461f7995537b6e142ec6ae6658044..68907430255be3064ccdc204904c9f08af7ce727 100644 (file)
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,5 +1,6 @@
 [transport-udp]
 PORT = 22368
+BINDTO = 127.0.0.1
 BEHIND_NAT = NO
 ALLOW_NAT = YES
 EXTERNAL_ADDRESS = 127.0.0.1