[GNUnet-SVN] r12593 - gnunet/src/transport

[gnunet]

Author: nevans
Date: 2010-08-18 10:42:02 +0200 (Wed, 18 Aug 2010)
New Revision: 12593

Modified:
   gnunet/src/transport/Makefile.am
   gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
   gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
   gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
   gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
Log:
test case configuration changes, to make nat tests more realistic

Modified: gnunet/src/transport/Makefile.am
===================================================================
--- gnunet/src/transport/Makefile.am    2010-08-18 08:36:07 UTC (rev 12592)
+++ gnunet/src/transport/Makefile.am    2010-08-18 08:42:02 UTC (rev 12593)
@@ -38,6 +38,7 @@
 install-exec-hook:
 endif
 
+#noinst_PROGRAMS = ${check_PROGRAMS}
 
 lib_LTLIBRARIES = \
   libgnunettransport.la

Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf  2010-08-18 
08:36:07 UTC (rev 12592)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf  2010-08-18 
08:42:02 UTC (rev 12593)
@@ -1,4 +1,5 @@
 [transport-tcp]
+DISABLEV6 = YES
 PORT = 12368
 BINDTO = 127.0.0.1
 BEHIND_NAT = YES
@@ -103,6 +104,7 @@
 WEAKRANDOM = YES
 
 [gnunetd]
+DISABLEV6 = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]

Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf  2010-08-18 
08:36:07 UTC (rev 12592)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf  2010-08-18 
08:42:02 UTC (rev 12593)
@@ -1,4 +1,5 @@
 [transport-tcp]
+DISABLEV6 = YES
 PORT = 22368
 BINDTO = 127.0.0.1
 BEHIND_NAT = NO
@@ -102,6 +103,7 @@
 WEAKRANDOM = YES
 
 [gnunetd]
+DISABLEV6 = YES
 HOSTKEY = $SERVICEHOME/.hostkey
 
 [PATHS]

Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf  2010-08-18 
08:36:07 UTC (rev 12592)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf  2010-08-18 
08:42:02 UTC (rev 12593)
@@ -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

Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf  2010-08-18 
08:36:07 UTC (rev 12592)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf  2010-08-18 
08:42:02 UTC (rev 12593)
@@ -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