From fecd1c767db54ba18e060ba59dd922b75cd544e7 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sun, 3 Jul 2011 15:14:03 +0000 Subject: [PATCH] invalid addresses cause transport trouble, removing to avoid for now --- TODO | 5 +++++ src/core/test_core_api.c | 1 + src/core/test_core_api_peer1.conf | 5 ++--- src/core/test_core_api_peer2.conf | 3 +-- src/core/test_core_quota_asymmetric_recv_limited_peer1.conf | 3 +-- src/core/test_core_quota_asymmetric_recv_limited_peer2.conf | 3 +-- src/core/test_core_quota_asymmetric_send_limit_peer1.conf | 3 +-- src/core/test_core_quota_asymmetric_send_limit_peer2.conf | 3 +-- src/core/test_core_quota_asymmetric_send_limited_peer1.conf | 3 +-- src/core/test_core_quota_asymmetric_send_limited_peer2.conf | 3 +-- src/core/test_core_quota_peer1.conf | 4 +--- src/core/test_core_quota_peer2.conf | 3 +-- src/dht/test_dht_api_peer1.conf | 2 +- src/dht/test_dht_multipeer_data.conf | 2 +- src/dht/test_dht_twopeer_data.conf | 2 +- src/dht/test_dhtlog_data.conf | 2 +- src/dv/test_transport_dv_data.conf | 4 +--- src/fs/fs_test_lib_data.conf | 4 ++-- src/fs/test_fs_download_data.conf | 6 +----- src/fs/test_gnunet_service_fs_migration_data.conf | 4 +--- src/testing/test_testing_connect_peer1.conf | 2 +- src/testing/test_testing_connect_peer2.conf | 4 +--- src/testing/test_testing_data.conf | 2 +- src/testing/test_testing_data_remote.conf | 4 +--- src/testing/test_testing_data_topology_2d_torus.conf | 4 +--- src/testing/test_testing_data_topology_blacklist.conf | 4 +--- src/testing/test_testing_data_topology_churn.conf | 4 +--- src/testing/test_testing_data_topology_clique.conf | 4 +--- src/testing/test_testing_data_topology_clique_dfs.conf | 4 +--- src/testing/test_testing_data_topology_clique_minimum.conf | 4 +--- src/testing/test_testing_data_topology_clique_random.conf | 4 +--- src/testing/test_testing_data_topology_erdos_renyi.conf | 4 +--- src/testing/test_testing_data_topology_internat.conf | 4 +--- src/testing/test_testing_data_topology_none.conf | 4 +--- src/testing/test_testing_data_topology_ring.conf | 4 +--- src/testing/test_testing_data_topology_scale_free.conf | 4 +--- .../test_testing_data_topology_small_world_ring.conf | 4 +--- .../test_testing_data_topology_small_world_torus.conf | 4 +--- src/testing/test_testing_data_topology_stability.conf | 4 +--- src/testing/test_testing_peergroup_data.conf | 4 +--- src/topology/test_gnunet_daemon_topology_data.conf | 2 +- 41 files changed, 47 insertions(+), 96 deletions(-) diff --git a/TODO b/TODO index b1f359759..2e41bbcc5 100644 --- 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 9423062db..d45560a5d 100644 --- 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 e8a6ed2cf..efdb81a67 100644 --- 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 4e6fe519f..cba5dbcca 100644 --- 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 bd23c4e74..3ddf375b2 100644 --- 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 02cd22967..5a52e202d 100644 --- 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 accdcb054..19b1e3b64 100644 --- 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 ff9256337..a7389a80d 100644 --- 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 fd97964cb..5ed6ed87a 100644 --- 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 d6f82a520..f900f04fb 100644 --- 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 5d3f2042c..443b383aa 100644 --- 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 b9f1cc136..b8d58f388 100644 --- 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 bb3c43d0d..e0e1e09eb 100644 --- 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 2b749f195..037ec19d9 100644 --- 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 68268bc43..3f1128847 100644 --- 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 3fd228cd6..3ea98b640 100644 --- 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 912b2bb87..25d9c1d8a 100644 --- 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 3442da354..67ffcde57 100644 --- 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 528642749..8ede4662c 100644 --- 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 98e8a88d6..b30a87510 100644 --- 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 7a2886d4b..2c8dfe91f 100644 --- 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 8826c1d6a..0938cfe29 100644 --- 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 c51cceea2..a8018585f 100644 --- 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 2b6f4ef28..ce9d57858 100644 --- 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 5607385c6..df579e2a9 100644 --- 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 43bbbdc39..ade33fd5b 100644 --- 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 b212778bd..ddd76a04d 100644 --- 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 14dac2473..092caf985 100644 --- 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 a1a62d07f..842ab29d5 100644 --- 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 e2e741329..ddf9157ee 100644 --- 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 b7d4668dc..bc1f7c02d 100644 --- 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 6685e1ff0..b714fab2b 100644 --- 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 d764ee02e..addf1abab 100644 --- 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 bef097ddd..a9e97806a 100644 --- 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 3ac345b34..8ebd4c295 100644 --- 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 c44fdadad..0212cc773 100644 --- 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 5e78d18d6..49a6fab78 100644 --- 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 5171a1e34..5580cf961 100644 --- 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 a92392b16..44719ddd7 100644 --- 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 29c32e1a1..3fae75a98 100644 --- 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 586c1eaff..7bbdeea16 100644 --- 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 -- 2.25.1