invalid addresses cause transport trouble, removing to avoid for now

diff --git a/TODO b/TODO
index b1f359759f801f5c589f0c7530876fa5290903d5..2e41bbcc532075a760186165ff19dc0760684627 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,9 @@
 0.9.0pre3:
+* connections fail if transport-plugin/nat produces 
+  some addresses that don't work (enable 'use_localaddr' with bindto for example,
+  so that some of the 'local' IPs do not work due to the bindto);  the result
+  seems to be that the plugin tries some of the broken addresses, fails and the
+  transport-level connection never comes up.
 * clean buildbots
 
 0.9.0pre4:

diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index 9423062db3c25f41269527718a65afa6c27ae357..d45560a5da195021d19dcd8d0ea80b0e3b03c555 100644 (file)
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -35,6 +35,7 @@
 #include "gnunet_transport_service.h"
 
 #define VERBOSE GNUNET_NO
+
 #define START_ARM GNUNET_YES
 
 #define MTYPE 12345

diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index e8a6ed2cf963e8d5516695aff03e3ceb087d13d3..efdb81a67e17bfe266d14be91bed110159535580 100644 (file)
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -16,7 +16,7 @@ PLUGINS = tcp
 #PREFIX= xterm -e xterm -T transport1 -e gdb --args
 #PREFIX = xterm -T transport1 -e gdb --args
 #PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 12466
@@ -32,16 +32,15 @@ PORT = 12467
 PORT = 12468
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 12469

diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index 4e6fe519fb070bc7112650052e67dbee39aa318e..cba5dbcca1ef5e38658a49053b4b63489953459c 100644 (file)
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -21,12 +21,12 @@ PLUGINS = tcp
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [arm]
 PORT = 22466
@@ -43,7 +43,6 @@ UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
 PORT = 22468
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [peerinfo]
 PORT = 22469

diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index bd23c4e7442bcd52a3d01f0d918df4e39c753385..3ddf375b2af7e4b664eb2aae5228fa932f9182e1 100644 (file)
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -33,16 +33,15 @@ UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-statistics.sock
 PORT = 12488
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 12489

diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index 02cd22967d4de30e5ecf51545112ac30314bf6d9..5a52e202d99fb89554a5b42cca78a275387e7752 100644 (file)
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -34,16 +34,15 @@ UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-statistics.sock
 PORT = 22488
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 22489

diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
index accdcb054487f1bc507fc73c2e809b187f39a96b..19b1e3b6463e3f69e5f683085a49c50395bc472d 100644 (file)
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -33,16 +33,15 @@ UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock
 PORT = 12488
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 12489

diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
index ff9256337f7ad3c9f8fc35f51dfd4a21c2c3aea6..a7389a80df73a8c48cdcf510864eec2e28302fbb 100644 (file)
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -34,16 +34,15 @@ UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock
 PORT = 22488
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 22489

diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
index fd97964cba98071f97a99d6707a6778f39ba4f83..5ed6ed87ae5e9ae35703e0260437e0faefb7687e 100644 (file)
--- a/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer1.conf
@@ -33,16 +33,15 @@ UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock
 PORT = 12428
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 12429

diff --git a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
index d6f82a52025bed5d422ae9a5f61c1ed9aa2d4bea..f900f04fb2ea3101bcf09fdad8ef600a9c9caa22 100644 (file)
--- a/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limited_peer2.conf
@@ -34,16 +34,15 @@ UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock
 PORT = 22428
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 22429

diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index 5d3f2042cfb078989f1a6f1308fe26b337bfc054..443b383aac4fac6998705b3c21021226b5a7bae7 100644 (file)
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -33,17 +33,15 @@ PORT = 12477
 [transport-tcp]
 PORT = 12468
 BINDTO = 127.0.0.1
-#DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 12479

diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index b9f1cc13604aa4935d175e74ad317888e3712df0..b8d58f388c833619d0bc74c52af47d89d913c1c3 100644 (file)
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -34,16 +34,15 @@ UNIXPATH = /tmp/gnunet-core-sym-p2-service-statistics.sock
 PORT = 22478
 BINDTO = 127.0.0.1
 #DEBUG = YES
-USE_LOCALADDR = YES 
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 22479

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index bb3c43d0dbdeb13f588a400f30af457991393e9e..e0e1e09eba1e03d1dc3a26ea163b4305b71fee8d 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -54,12 +54,12 @@ SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/dht/test_dht_multipeer_data.conf b/src/dht/test_dht_multipeer_data.conf
index 2b749f195710ca4ede6e3c5da862f5b738577046..037ec19d9590fd84498e6d7a093e5448d75a6bbd 100644 (file)
--- a/src/dht/test_dht_multipeer_data.conf
+++ b/src/dht/test_dht_multipeer_data.conf
@@ -99,12 +99,12 @@ SERVICEHOME = /tmp/test-dht-multipeer/
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/dht/test_dht_twopeer_data.conf b/src/dht/test_dht_twopeer_data.conf
index 68268bc43aed1667d241c8553cec4a3cd912c065..3f11288475495063c102bdfb1393b08de7b869d4 100644 (file)
--- a/src/dht/test_dht_twopeer_data.conf
+++ b/src/dht/test_dht_twopeer_data.conf
@@ -54,12 +54,12 @@ SERVICEHOME = /tmp/test-dht-twopeer/
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/dht/test_dhtlog_data.conf b/src/dht/test_dhtlog_data.conf
index 3fd228cd6c88b357d6af68143c0d627307124bfd..3ea98b640201919d2cddfa04af3980215955994b 100644 (file)
--- a/src/dht/test_dhtlog_data.conf
+++ b/src/dht/test_dhtlog_data.conf
@@ -49,12 +49,12 @@ MYSQL_PORT = 3306
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index 912b2bb87a80c4048c237efc67ce292bd85bb844..25d9c1d8afdd8e8e4e7eab9967cf436d28b3180e 100644 (file)
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -57,16 +57,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [fs]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 3442da3549d5237dfe7b0a7d285a6fa467b73bd0..67ffcde57ea7db7f4fb244dff19c1893afa6ee11 100644 (file)
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -18,12 +18,12 @@ PLUGINS = tcp
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [arm]
 PORT = 43466
@@ -41,7 +41,7 @@ PORT = 43467
 HOSTNAME = localhost
 
 [transport-tcp]
-TIMEOUT = 300000
+BINDTO = 127.0.0.1
 PORT = 43468
 
 [peerinfo]

diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index 5286427491e2ab874f3a7206a656d439ac42d050..8ede4662c40e5975aa15588fc77cc2be37078ccc 100644 (file)
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -48,14 +48,10 @@ WEAKRANDOM = YES
 
 [dhtcache]
 QUOTA=65536
-
 DATABASE=sqlite
+
 [mesh]
 AUTOSTART = NO
 
-
-
 [dns]
 AUTOSTART = NO
-
-

diff --git a/src/fs/test_gnunet_service_fs_migration_data.conf b/src/fs/test_gnunet_service_fs_migration_data.conf
index 98e8a88d641656d947e68d3a2bc4427550c8787e..b30a87510a2543ef7c5a43dfe5b508e8e3bd4fbb 100644 (file)
--- a/src/fs/test_gnunet_service_fs_migration_data.conf
+++ b/src/fs/test_gnunet_service_fs_migration_data.conf
@@ -70,13 +70,11 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
 [dhtcache]
 QUOTA=65536
-
 DATABASE=sqlite
+
 [mesh]
 AUTOSTART = NO
 
-
-
 [dns]
 AUTOSTART = NO
 

diff --git a/src/testing/test_testing_connect_peer1.conf b/src/testing/test_testing_connect_peer1.conf
index 7a2886d4b5afc67767fe57c6f5c5174bfc24eb94..2c8dfe91fb697e9c9e120e7aaf8019eb22e1bfd1 100644 (file)
--- a/src/testing/test_testing_connect_peer1.conf
+++ b/src/testing/test_testing_connect_peer1.conf
@@ -59,12 +59,12 @@ AUTOSTART = NO
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_connect_peer2.conf b/src/testing/test_testing_connect_peer2.conf
index 8826c1d6a5d4a3ce8dcc51e0e5f3820d062af12a..0938cfe29a6b18b43638e555ee6213b2898b85e4 100644 (file)
--- a/src/testing/test_testing_connect_peer2.conf
+++ b/src/testing/test_testing_connect_peer2.conf
@@ -57,16 +57,14 @@ AUTOSTART = NO
 [mesh]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data.conf b/src/testing/test_testing_data.conf
index c51cceea23b2b47507e167fe15e0ea6aeaf4617b..a8018585f984687ab745d0f5b0a7e99622fd1d48 100644 (file)
--- a/src/testing/test_testing_data.conf
+++ b/src/testing/test_testing_data.conf
@@ -46,12 +46,12 @@ AUTOSTART = NO
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_remote.conf b/src/testing/test_testing_data_remote.conf
index 2b6f4ef287fb71a6327e06ae24b14eec8091b5a2..ce9d57858ca13eddb5d786b5f88f02f02da66293 100644 (file)
--- a/src/testing/test_testing_data_remote.conf
+++ b/src/testing/test_testing_data_remote.conf
@@ -39,16 +39,14 @@ MAX_OUTSTANDING_SSH = 5
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_2d_torus.conf b/src/testing/test_testing_data_topology_2d_torus.conf
index 5607385c6f82f9eb8347d56f183411847bf45f77..df579e2a98a3afb6b19d0cf63566f7b0b3fee58f 100644 (file)
--- a/src/testing/test_testing_data_topology_2d_torus.conf
+++ b/src/testing/test_testing_data_topology_2d_torus.conf
@@ -39,16 +39,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_blacklist.conf b/src/testing/test_testing_data_topology_blacklist.conf
index 43bbbdc390aaf60edad77c7849febf94ccb3e748..ade33fd5bf9d4a465d5625b43d0d8771553be4a1 100644 (file)
--- a/src/testing/test_testing_data_topology_blacklist.conf
+++ b/src/testing/test_testing_data_topology_blacklist.conf
@@ -52,16 +52,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_churn.conf b/src/testing/test_testing_data_topology_churn.conf
index b212778bd73e0eb4e78918e88682a5d917af1485..ddd76a04d4b0fba8a1c18e0037aa203720d0f270 100644 (file)
--- a/src/testing/test_testing_data_topology_churn.conf
+++ b/src/testing/test_testing_data_topology_churn.conf
@@ -47,16 +47,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_clique.conf b/src/testing/test_testing_data_topology_clique.conf
index 14dac247322555c2364beb79bcbeec9c2eda6c4c..092caf985939cb49506722bb3a495b5836ba5ed3 100644 (file)
--- a/src/testing/test_testing_data_topology_clique.conf
+++ b/src/testing/test_testing_data_topology_clique.conf
@@ -54,16 +54,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_clique_dfs.conf b/src/testing/test_testing_data_topology_clique_dfs.conf
index a1a62d07fd32dc7bf1c576af88d28fae143cfd67..842ab29d58097a559da880c996df5408bae5481e 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_dfs.conf
+++ b/src/testing/test_testing_data_topology_clique_dfs.conf
@@ -51,16 +51,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_clique_minimum.conf b/src/testing/test_testing_data_topology_clique_minimum.conf
index e2e741329cde0407a200f7e0ecee5812bb13143f..ddf9157ee424a0812dd2a6be660e00453a4a9a26 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_minimum.conf
+++ b/src/testing/test_testing_data_topology_clique_minimum.conf
@@ -51,16 +51,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_clique_random.conf b/src/testing/test_testing_data_topology_clique_random.conf
index b7d4668dcb04d27f136cdec2d83fef731bbc48fd..bc1f7c02dbfaf38654bd96a7be138508dc239353 100644 (file)
--- a/src/testing/test_testing_data_topology_clique_random.conf
+++ b/src/testing/test_testing_data_topology_clique_random.conf
@@ -53,16 +53,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_erdos_renyi.conf b/src/testing/test_testing_data_topology_erdos_renyi.conf
index 6685e1ff091896f21b830a295fdc74159648dfcd..b714fab2b0a3be89d6ee1061dd007c109c331f76 100644 (file)
--- a/src/testing/test_testing_data_topology_erdos_renyi.conf
+++ b/src/testing/test_testing_data_topology_erdos_renyi.conf
@@ -39,16 +39,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_internat.conf b/src/testing/test_testing_data_topology_internat.conf
index d764ee02e0546408e10a1cfb8fbbe3f8a7109177..addf1abab61c53f686b758baff779018fc587c4b 100644 (file)
--- a/src/testing/test_testing_data_topology_internat.conf
+++ b/src/testing/test_testing_data_topology_internat.conf
@@ -39,16 +39,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_none.conf b/src/testing/test_testing_data_topology_none.conf
index bef097dddd7aea8d67333b4fd708ed6c42f15871..a9e97806ac6a1e3f72b54c7f0567346b4bbc4e41 100644 (file)
--- a/src/testing/test_testing_data_topology_none.conf
+++ b/src/testing/test_testing_data_topology_none.conf
@@ -56,16 +56,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_ring.conf b/src/testing/test_testing_data_topology_ring.conf
index 3ac345b345b130effd5efa3a0f158e49a1d39a87..8ebd4c29588dcd8e37c369c9c55569765b7faf6d 100644 (file)
--- a/src/testing/test_testing_data_topology_ring.conf
+++ b/src/testing/test_testing_data_topology_ring.conf
@@ -39,16 +39,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_scale_free.conf b/src/testing/test_testing_data_topology_scale_free.conf
index c44fdadadf436dfa918bbe1b6cbcc8a67fe695b6..0212cc7730d3f69dbf8e5b3cc297d32d546dc8e8 100644 (file)
--- a/src/testing/test_testing_data_topology_scale_free.conf
+++ b/src/testing/test_testing_data_topology_scale_free.conf
@@ -49,16 +49,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_small_world_ring.conf b/src/testing/test_testing_data_topology_small_world_ring.conf
index 5e78d18d65a2034e79cc600f061bbf4e046a5447..49a6fab78afd057890d915b3d7af6964d7367783 100644 (file)
--- a/src/testing/test_testing_data_topology_small_world_ring.conf
+++ b/src/testing/test_testing_data_topology_small_world_ring.conf
@@ -39,16 +39,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_small_world_torus.conf b/src/testing/test_testing_data_topology_small_world_torus.conf
index 5171a1e34df0e44dca2544140fbd164cec243089..5580cf9612b53fca99048d240f457595eeb99eb9 100644 (file)
--- a/src/testing/test_testing_data_topology_small_world_torus.conf
+++ b/src/testing/test_testing_data_topology_small_world_torus.conf
@@ -39,16 +39,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_data_topology_stability.conf b/src/testing/test_testing_data_topology_stability.conf
index a92392b1666dcf74e83e238c65c94c67c2f920cd..44719ddd71a2925c705981f388c44ea51ec99497 100644 (file)
--- a/src/testing/test_testing_data_topology_stability.conf
+++ b/src/testing/test_testing_data_topology_stability.conf
@@ -53,16 +53,14 @@ HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/testing/test_testing_peergroup_data.conf b/src/testing/test_testing_peergroup_data.conf
index 29c32e1a1b1ec589a418c515d91306689a9795fd..3fae75a98954c82537bd18495175d388a1aedc2b 100644 (file)
--- a/src/testing/test_testing_peergroup_data.conf
+++ b/src/testing/test_testing_peergroup_data.conf
@@ -56,16 +56,14 @@ AUTOSTART = NO
 [dht]
 AUTOSTART = NO
 
-
-
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [dns]
 AUTOSTART = NO

diff --git a/src/topology/test_gnunet_daemon_topology_data.conf b/src/topology/test_gnunet_daemon_topology_data.conf
index 586c1eaff311a0f06d0b434950b528690a79f762..7bbdeea162153571a34d637f0d9693acb52a1b79 100644 (file)
--- a/src/topology/test_gnunet_daemon_topology_data.conf
+++ b/src/topology/test_gnunet_daemon_topology_data.conf
@@ -24,12 +24,12 @@ PORT = 2668
 
 [nat]
 DISABLEV6 = YES
-BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+USE_LOCALADDR = NO
 
 [peerinfo]
 PORT = 2669