aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-07-03 15:14:03 +0000
committerChristian Grothoff <christian@grothoff.org>2011-07-03 15:14:03 +0000
commitfecd1c767db54ba18e060ba59dd922b75cd544e7 (patch)
treee8cc8fed1fe39dc0a21b3bbfd59a2d4187143956
parent93850e77594963bd40ef4cc1e54ceabc51a5d51b (diff)
downloadgnunet-fecd1c767db54ba18e060ba59dd922b75cd544e7.tar.gz
gnunet-fecd1c767db54ba18e060ba59dd922b75cd544e7.zip
invalid addresses cause transport trouble, removing to avoid for now
-rw-r--r--TODO5
-rw-r--r--src/core/test_core_api.c1
-rw-r--r--src/core/test_core_api_peer1.conf5
-rw-r--r--src/core/test_core_api_peer2.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer1.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_recv_limited_peer2.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer1.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_send_limit_peer2.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_send_limited_peer1.conf3
-rw-r--r--src/core/test_core_quota_asymmetric_send_limited_peer2.conf3
-rw-r--r--src/core/test_core_quota_peer1.conf4
-rw-r--r--src/core/test_core_quota_peer2.conf3
-rw-r--r--src/dht/test_dht_api_peer1.conf2
-rw-r--r--src/dht/test_dht_multipeer_data.conf2
-rw-r--r--src/dht/test_dht_twopeer_data.conf2
-rw-r--r--src/dht/test_dhtlog_data.conf2
-rw-r--r--src/dv/test_transport_dv_data.conf4
-rw-r--r--src/fs/fs_test_lib_data.conf4
-rw-r--r--src/fs/test_fs_download_data.conf6
-rw-r--r--src/fs/test_gnunet_service_fs_migration_data.conf4
-rw-r--r--src/testing/test_testing_connect_peer1.conf2
-rw-r--r--src/testing/test_testing_connect_peer2.conf4
-rw-r--r--src/testing/test_testing_data.conf2
-rw-r--r--src/testing/test_testing_data_remote.conf4
-rw-r--r--src/testing/test_testing_data_topology_2d_torus.conf4
-rw-r--r--src/testing/test_testing_data_topology_blacklist.conf4
-rw-r--r--src/testing/test_testing_data_topology_churn.conf4
-rw-r--r--src/testing/test_testing_data_topology_clique.conf4
-rw-r--r--src/testing/test_testing_data_topology_clique_dfs.conf4
-rw-r--r--src/testing/test_testing_data_topology_clique_minimum.conf4
-rw-r--r--src/testing/test_testing_data_topology_clique_random.conf4
-rw-r--r--src/testing/test_testing_data_topology_erdos_renyi.conf4
-rw-r--r--src/testing/test_testing_data_topology_internat.conf4
-rw-r--r--src/testing/test_testing_data_topology_none.conf4
-rw-r--r--src/testing/test_testing_data_topology_ring.conf4
-rw-r--r--src/testing/test_testing_data_topology_scale_free.conf4
-rw-r--r--src/testing/test_testing_data_topology_small_world_ring.conf4
-rw-r--r--src/testing/test_testing_data_topology_small_world_torus.conf4
-rw-r--r--src/testing/test_testing_data_topology_stability.conf4
-rw-r--r--src/testing/test_testing_peergroup_data.conf4
-rw-r--r--src/topology/test_gnunet_daemon_topology_data.conf2
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 @@
10.9.0pre3: 10.9.0pre3:
2* connections fail if transport-plugin/nat produces
3 some addresses that don't work (enable 'use_localaddr' with bindto for example,
4 so that some of the 'local' IPs do not work due to the bindto); the result
5 seems to be that the plugin tries some of the broken addresses, fails and the
6 transport-level connection never comes up.
2* clean buildbots 7* clean buildbots
3 8
40.9.0pre4: 90.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 @@
35#include "gnunet_transport_service.h" 35#include "gnunet_transport_service.h"
36 36
37#define VERBOSE GNUNET_NO 37#define VERBOSE GNUNET_NO
38
38#define START_ARM GNUNET_YES 39#define START_ARM GNUNET_YES
39 40
40#define MTYPE 12345 41#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
16#PREFIX= xterm -e xterm -T transport1 -e gdb --args 16#PREFIX= xterm -e xterm -T transport1 -e gdb --args
17#PREFIX = xterm -T transport1 -e gdb --args 17#PREFIX = xterm -T transport1 -e gdb --args
18#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck 18#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
19DEBUG = YES 19#DEBUG = YES
20 20
21[arm] 21[arm]
22PORT = 12466 22PORT = 12466
@@ -32,16 +32,15 @@ PORT = 12467
32PORT = 12468 32PORT = 12468
33BINDTO = 127.0.0.1 33BINDTO = 127.0.0.1
34#DEBUG = YES 34#DEBUG = YES
35USE_LOCALADDR = YES
36 35
37[nat] 36[nat]
38DISABLEV6 = YES 37DISABLEV6 = YES
39BINDTO = 127.0.0.1
40ENABLE_UPNP = NO 38ENABLE_UPNP = NO
41BEHIND_NAT = NO 39BEHIND_NAT = NO
42ALLOW_NAT = NO 40ALLOW_NAT = NO
43INTERNAL_ADDRESS = 127.0.0.1 41INTERNAL_ADDRESS = 127.0.0.1
44EXTERNAL_ADDRESS = 127.0.0.1 42EXTERNAL_ADDRESS = 127.0.0.1
43USE_LOCALADDR = NO
45 44
46[peerinfo] 45[peerinfo]
47PORT = 12469 46PORT = 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
21 21
22[nat] 22[nat]
23DISABLEV6 = YES 23DISABLEV6 = YES
24BINDTO = 127.0.0.1
25ENABLE_UPNP = NO 24ENABLE_UPNP = NO
26BEHIND_NAT = NO 25BEHIND_NAT = NO
27ALLOW_NAT = NO 26ALLOW_NAT = NO
28INTERNAL_ADDRESS = 127.0.0.1 27INTERNAL_ADDRESS = 127.0.0.1
29EXTERNAL_ADDRESS = 127.0.0.1 28EXTERNAL_ADDRESS = 127.0.0.1
29USE_LOCALADDR = NO
30 30
31[arm] 31[arm]
32PORT = 22466 32PORT = 22466
@@ -43,7 +43,6 @@ UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
43PORT = 22468 43PORT = 22468
44BINDTO = 127.0.0.1 44BINDTO = 127.0.0.1
45#DEBUG = YES 45#DEBUG = YES
46USE_LOCALADDR = YES
47 46
48[peerinfo] 47[peerinfo]
49PORT = 22469 48PORT = 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
33PORT = 12488 33PORT = 12488
34BINDTO = 127.0.0.1 34BINDTO = 127.0.0.1
35#DEBUG = YES 35#DEBUG = YES
36USE_LOCALADDR = YES
37 36
38[nat] 37[nat]
39DISABLEV6 = YES 38DISABLEV6 = YES
40BINDTO = 127.0.0.1
41ENABLE_UPNP = NO 39ENABLE_UPNP = NO
42BEHIND_NAT = NO 40BEHIND_NAT = NO
43ALLOW_NAT = NO 41ALLOW_NAT = NO
44INTERNAL_ADDRESS = 127.0.0.1 42INTERNAL_ADDRESS = 127.0.0.1
45EXTERNAL_ADDRESS = 127.0.0.1 43EXTERNAL_ADDRESS = 127.0.0.1
44USE_LOCALADDR = NO
46 45
47[peerinfo] 46[peerinfo]
48PORT = 12489 47PORT = 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
34PORT = 22488 34PORT = 22488
35BINDTO = 127.0.0.1 35BINDTO = 127.0.0.1
36#DEBUG = YES 36#DEBUG = YES
37USE_LOCALADDR = YES
38 37
39[nat] 38[nat]
40DISABLEV6 = YES 39DISABLEV6 = YES
41BINDTO = 127.0.0.1
42ENABLE_UPNP = NO 40ENABLE_UPNP = NO
43BEHIND_NAT = NO 41BEHIND_NAT = NO
44ALLOW_NAT = NO 42ALLOW_NAT = NO
45INTERNAL_ADDRESS = 127.0.0.1 43INTERNAL_ADDRESS = 127.0.0.1
46EXTERNAL_ADDRESS = 127.0.0.1 44EXTERNAL_ADDRESS = 127.0.0.1
45USE_LOCALADDR = NO
47 46
48[peerinfo] 47[peerinfo]
49PORT = 22489 48PORT = 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
33PORT = 12488 33PORT = 12488
34BINDTO = 127.0.0.1 34BINDTO = 127.0.0.1
35#DEBUG = YES 35#DEBUG = YES
36USE_LOCALADDR = YES
37 36
38[nat] 37[nat]
39DISABLEV6 = YES 38DISABLEV6 = YES
40BINDTO = 127.0.0.1
41ENABLE_UPNP = NO 39ENABLE_UPNP = NO
42BEHIND_NAT = NO 40BEHIND_NAT = NO
43ALLOW_NAT = NO 41ALLOW_NAT = NO
44INTERNAL_ADDRESS = 127.0.0.1 42INTERNAL_ADDRESS = 127.0.0.1
45EXTERNAL_ADDRESS = 127.0.0.1 43EXTERNAL_ADDRESS = 127.0.0.1
44USE_LOCALADDR = NO
46 45
47[peerinfo] 46[peerinfo]
48PORT = 12489 47PORT = 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
34PORT = 22488 34PORT = 22488
35BINDTO = 127.0.0.1 35BINDTO = 127.0.0.1
36#DEBUG = YES 36#DEBUG = YES
37USE_LOCALADDR = YES
38 37
39[nat] 38[nat]
40DISABLEV6 = YES 39DISABLEV6 = YES
41BINDTO = 127.0.0.1
42ENABLE_UPNP = NO 40ENABLE_UPNP = NO
43BEHIND_NAT = NO 41BEHIND_NAT = NO
44ALLOW_NAT = NO 42ALLOW_NAT = NO
45INTERNAL_ADDRESS = 127.0.0.1 43INTERNAL_ADDRESS = 127.0.0.1
46EXTERNAL_ADDRESS = 127.0.0.1 44EXTERNAL_ADDRESS = 127.0.0.1
45USE_LOCALADDR = NO
47 46
48[peerinfo] 47[peerinfo]
49PORT = 22489 48PORT = 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
33PORT = 12428 33PORT = 12428
34BINDTO = 127.0.0.1 34BINDTO = 127.0.0.1
35#DEBUG = YES 35#DEBUG = YES
36USE_LOCALADDR = YES
37 36
38[nat] 37[nat]
39DISABLEV6 = YES 38DISABLEV6 = YES
40BINDTO = 127.0.0.1
41ENABLE_UPNP = NO 39ENABLE_UPNP = NO
42BEHIND_NAT = NO 40BEHIND_NAT = NO
43ALLOW_NAT = NO 41ALLOW_NAT = NO
44INTERNAL_ADDRESS = 127.0.0.1 42INTERNAL_ADDRESS = 127.0.0.1
45EXTERNAL_ADDRESS = 127.0.0.1 43EXTERNAL_ADDRESS = 127.0.0.1
44USE_LOCALADDR = NO
46 45
47[peerinfo] 46[peerinfo]
48PORT = 12429 47PORT = 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
34PORT = 22428 34PORT = 22428
35BINDTO = 127.0.0.1 35BINDTO = 127.0.0.1
36#DEBUG = YES 36#DEBUG = YES
37USE_LOCALADDR = YES
38 37
39[nat] 38[nat]
40DISABLEV6 = YES 39DISABLEV6 = YES
41BINDTO = 127.0.0.1
42ENABLE_UPNP = NO 40ENABLE_UPNP = NO
43BEHIND_NAT = NO 41BEHIND_NAT = NO
44ALLOW_NAT = NO 42ALLOW_NAT = NO
45INTERNAL_ADDRESS = 127.0.0.1 43INTERNAL_ADDRESS = 127.0.0.1
46EXTERNAL_ADDRESS = 127.0.0.1 44EXTERNAL_ADDRESS = 127.0.0.1
45USE_LOCALADDR = NO
47 46
48[peerinfo] 47[peerinfo]
49PORT = 22429 48PORT = 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
33[transport-tcp] 33[transport-tcp]
34PORT = 12468 34PORT = 12468
35BINDTO = 127.0.0.1 35BINDTO = 127.0.0.1
36#DEBUG = YES
37USE_LOCALADDR = YES
38 36
39[nat] 37[nat]
40DISABLEV6 = YES 38DISABLEV6 = YES
41BINDTO = 127.0.0.1
42ENABLE_UPNP = NO 39ENABLE_UPNP = NO
43BEHIND_NAT = NO 40BEHIND_NAT = NO
44ALLOW_NAT = NO 41ALLOW_NAT = NO
45INTERNAL_ADDRESS = 127.0.0.1 42INTERNAL_ADDRESS = 127.0.0.1
46EXTERNAL_ADDRESS = 127.0.0.1 43EXTERNAL_ADDRESS = 127.0.0.1
44USE_LOCALADDR = NO
47 45
48[peerinfo] 46[peerinfo]
49PORT = 12479 47PORT = 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
34PORT = 22478 34PORT = 22478
35BINDTO = 127.0.0.1 35BINDTO = 127.0.0.1
36#DEBUG = YES 36#DEBUG = YES
37USE_LOCALADDR = YES
38 37
39[nat] 38[nat]
40DISABLEV6 = YES 39DISABLEV6 = YES
41BINDTO = 127.0.0.1
42ENABLE_UPNP = NO 40ENABLE_UPNP = NO
43BEHIND_NAT = NO 41BEHIND_NAT = NO
44ALLOW_NAT = NO 42ALLOW_NAT = NO
45INTERNAL_ADDRESS = 127.0.0.1 43INTERNAL_ADDRESS = 127.0.0.1
46EXTERNAL_ADDRESS = 127.0.0.1 44EXTERNAL_ADDRESS = 127.0.0.1
45USE_LOCALADDR = NO
47 46
48[peerinfo] 47[peerinfo]
49PORT = 22479 48PORT = 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/
54 54
55[nat] 55[nat]
56DISABLEV6 = YES 56DISABLEV6 = YES
57BINDTO = 127.0.0.1
58ENABLE_UPNP = NO 57ENABLE_UPNP = NO
59BEHIND_NAT = NO 58BEHIND_NAT = NO
60ALLOW_NAT = NO 59ALLOW_NAT = NO
61INTERNAL_ADDRESS = 127.0.0.1 60INTERNAL_ADDRESS = 127.0.0.1
62EXTERNAL_ADDRESS = 127.0.0.1 61EXTERNAL_ADDRESS = 127.0.0.1
62USE_LOCALADDR = NO
63 63
64[dns] 64[dns]
65AUTOSTART = NO 65AUTOSTART = 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/
99 99
100[nat] 100[nat]
101DISABLEV6 = YES 101DISABLEV6 = YES
102BINDTO = 127.0.0.1
103ENABLE_UPNP = NO 102ENABLE_UPNP = NO
104BEHIND_NAT = NO 103BEHIND_NAT = NO
105ALLOW_NAT = NO 104ALLOW_NAT = NO
106INTERNAL_ADDRESS = 127.0.0.1 105INTERNAL_ADDRESS = 127.0.0.1
107EXTERNAL_ADDRESS = 127.0.0.1 106EXTERNAL_ADDRESS = 127.0.0.1
107USE_LOCALADDR = NO
108 108
109[dns] 109[dns]
110AUTOSTART = NO 110AUTOSTART = 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/
54 54
55[nat] 55[nat]
56DISABLEV6 = YES 56DISABLEV6 = YES
57BINDTO = 127.0.0.1
58ENABLE_UPNP = NO 57ENABLE_UPNP = NO
59BEHIND_NAT = NO 58BEHIND_NAT = NO
60ALLOW_NAT = NO 59ALLOW_NAT = NO
61INTERNAL_ADDRESS = 127.0.0.1 60INTERNAL_ADDRESS = 127.0.0.1
62EXTERNAL_ADDRESS = 127.0.0.1 61EXTERNAL_ADDRESS = 127.0.0.1
62USE_LOCALADDR = NO
63 63
64[dns] 64[dns]
65AUTOSTART = NO 65AUTOSTART = 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
49 49
50[nat] 50[nat]
51DISABLEV6 = YES 51DISABLEV6 = YES
52BINDTO = 127.0.0.1
53ENABLE_UPNP = NO 52ENABLE_UPNP = NO
54BEHIND_NAT = NO 53BEHIND_NAT = NO
55ALLOW_NAT = NO 54ALLOW_NAT = NO
56INTERNAL_ADDRESS = 127.0.0.1 55INTERNAL_ADDRESS = 127.0.0.1
57EXTERNAL_ADDRESS = 127.0.0.1 56EXTERNAL_ADDRESS = 127.0.0.1
57USE_LOCALADDR = NO
58 58
59[dns] 59[dns]
60AUTOSTART = NO 60AUTOSTART = 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
57[fs] 57[fs]
58AUTOSTART = NO 58AUTOSTART = NO
59 59
60
61
62[nat] 60[nat]
63DISABLEV6 = YES 61DISABLEV6 = YES
64BINDTO = 127.0.0.1
65ENABLE_UPNP = NO 62ENABLE_UPNP = NO
66BEHIND_NAT = NO 63BEHIND_NAT = NO
67ALLOW_NAT = NO 64ALLOW_NAT = NO
68INTERNAL_ADDRESS = 127.0.0.1 65INTERNAL_ADDRESS = 127.0.0.1
69EXTERNAL_ADDRESS = 127.0.0.1 66EXTERNAL_ADDRESS = 127.0.0.1
67USE_LOCALADDR = NO
70 68
71[dns] 69[dns]
72AUTOSTART = NO 70AUTOSTART = 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
18 18
19[nat] 19[nat]
20DISABLEV6 = YES 20DISABLEV6 = YES
21BINDTO = 127.0.0.1
22ENABLE_UPNP = NO 21ENABLE_UPNP = NO
23BEHIND_NAT = NO 22BEHIND_NAT = NO
24ALLOW_NAT = NO 23ALLOW_NAT = NO
25INTERNAL_ADDRESS = 127.0.0.1 24INTERNAL_ADDRESS = 127.0.0.1
26EXTERNAL_ADDRESS = 127.0.0.1 25EXTERNAL_ADDRESS = 127.0.0.1
26USE_LOCALADDR = NO
27 27
28[arm] 28[arm]
29PORT = 43466 29PORT = 43466
@@ -41,7 +41,7 @@ PORT = 43467
41HOSTNAME = localhost 41HOSTNAME = localhost
42 42
43[transport-tcp] 43[transport-tcp]
44TIMEOUT = 300000 44BINDTO = 127.0.0.1
45PORT = 43468 45PORT = 43468
46 46
47[peerinfo] 47[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
48 48
49[dhtcache] 49[dhtcache]
50QUOTA=65536 50QUOTA=65536
51
52DATABASE=sqlite 51DATABASE=sqlite
52
53[mesh] 53[mesh]
54AUTOSTART = NO 54AUTOSTART = NO
55 55
56
57
58[dns] 56[dns]
59AUTOSTART = NO 57AUTOSTART = NO
60
61
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
70 70
71[dhtcache] 71[dhtcache]
72QUOTA=65536 72QUOTA=65536
73
74DATABASE=sqlite 73DATABASE=sqlite
74
75[mesh] 75[mesh]
76AUTOSTART = NO 76AUTOSTART = NO
77 77
78
79
80[dns] 78[dns]
81AUTOSTART = NO 79AUTOSTART = NO
82 80
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
59 59
60[nat] 60[nat]
61DISABLEV6 = YES 61DISABLEV6 = YES
62BINDTO = 127.0.0.1
63ENABLE_UPNP = NO 62ENABLE_UPNP = NO
64BEHIND_NAT = NO 63BEHIND_NAT = NO
65ALLOW_NAT = NO 64ALLOW_NAT = NO
66INTERNAL_ADDRESS = 127.0.0.1 65INTERNAL_ADDRESS = 127.0.0.1
67EXTERNAL_ADDRESS = 127.0.0.1 66EXTERNAL_ADDRESS = 127.0.0.1
67USE_LOCALADDR = NO
68 68
69[dns] 69[dns]
70AUTOSTART = NO 70AUTOSTART = 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
57[mesh] 57[mesh]
58AUTOSTART = NO 58AUTOSTART = NO
59 59
60
61
62[nat] 60[nat]
63DISABLEV6 = YES 61DISABLEV6 = YES
64BINDTO = 127.0.0.1
65ENABLE_UPNP = NO 62ENABLE_UPNP = NO
66BEHIND_NAT = NO 63BEHIND_NAT = NO
67ALLOW_NAT = NO 64ALLOW_NAT = NO
68INTERNAL_ADDRESS = 127.0.0.1 65INTERNAL_ADDRESS = 127.0.0.1
69EXTERNAL_ADDRESS = 127.0.0.1 66EXTERNAL_ADDRESS = 127.0.0.1
67USE_LOCALADDR = NO
70 68
71[dns] 69[dns]
72AUTOSTART = NO 70AUTOSTART = 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
46 46
47[nat] 47[nat]
48DISABLEV6 = YES 48DISABLEV6 = YES
49BINDTO = 127.0.0.1
50ENABLE_UPNP = NO 49ENABLE_UPNP = NO
51BEHIND_NAT = NO 50BEHIND_NAT = NO
52ALLOW_NAT = NO 51ALLOW_NAT = NO
53INTERNAL_ADDRESS = 127.0.0.1 52INTERNAL_ADDRESS = 127.0.0.1
54EXTERNAL_ADDRESS = 127.0.0.1 53EXTERNAL_ADDRESS = 127.0.0.1
54USE_LOCALADDR = NO
55 55
56[dns] 56[dns]
57AUTOSTART = NO 57AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
52[dht] 52[dht]
53AUTOSTART = NO 53AUTOSTART = NO
54 54
55
56
57[nat] 55[nat]
58DISABLEV6 = YES 56DISABLEV6 = YES
59BINDTO = 127.0.0.1
60ENABLE_UPNP = NO 57ENABLE_UPNP = NO
61BEHIND_NAT = NO 58BEHIND_NAT = NO
62ALLOW_NAT = NO 59ALLOW_NAT = NO
63INTERNAL_ADDRESS = 127.0.0.1 60INTERNAL_ADDRESS = 127.0.0.1
64EXTERNAL_ADDRESS = 127.0.0.1 61EXTERNAL_ADDRESS = 127.0.0.1
62USE_LOCALADDR = NO
65 63
66[dns] 64[dns]
67AUTOSTART = NO 65AUTOSTART = 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
47[dht] 47[dht]
48AUTOSTART = NO 48AUTOSTART = NO
49 49
50
51
52[nat] 50[nat]
53DISABLEV6 = YES 51DISABLEV6 = YES
54BINDTO = 127.0.0.1
55ENABLE_UPNP = NO 52ENABLE_UPNP = NO
56BEHIND_NAT = NO 53BEHIND_NAT = NO
57ALLOW_NAT = NO 54ALLOW_NAT = NO
58INTERNAL_ADDRESS = 127.0.0.1 55INTERNAL_ADDRESS = 127.0.0.1
59EXTERNAL_ADDRESS = 127.0.0.1 56EXTERNAL_ADDRESS = 127.0.0.1
57USE_LOCALADDR = NO
60 58
61[dns] 59[dns]
62AUTOSTART = NO 60AUTOSTART = 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
54[dht] 54[dht]
55AUTOSTART = NO 55AUTOSTART = NO
56 56
57
58
59[nat] 57[nat]
60DISABLEV6 = YES 58DISABLEV6 = YES
61BINDTO = 127.0.0.1
62ENABLE_UPNP = NO 59ENABLE_UPNP = NO
63BEHIND_NAT = NO 60BEHIND_NAT = NO
64ALLOW_NAT = NO 61ALLOW_NAT = NO
65INTERNAL_ADDRESS = 127.0.0.1 62INTERNAL_ADDRESS = 127.0.0.1
66EXTERNAL_ADDRESS = 127.0.0.1 63EXTERNAL_ADDRESS = 127.0.0.1
64USE_LOCALADDR = NO
67 65
68[dns] 66[dns]
69AUTOSTART = NO 67AUTOSTART = 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
51[dht] 51[dht]
52AUTOSTART = NO 52AUTOSTART = NO
53 53
54
55
56[nat] 54[nat]
57DISABLEV6 = YES 55DISABLEV6 = YES
58BINDTO = 127.0.0.1
59ENABLE_UPNP = NO 56ENABLE_UPNP = NO
60BEHIND_NAT = NO 57BEHIND_NAT = NO
61ALLOW_NAT = NO 58ALLOW_NAT = NO
62INTERNAL_ADDRESS = 127.0.0.1 59INTERNAL_ADDRESS = 127.0.0.1
63EXTERNAL_ADDRESS = 127.0.0.1 60EXTERNAL_ADDRESS = 127.0.0.1
61USE_LOCALADDR = NO
64 62
65[dns] 63[dns]
66AUTOSTART = NO 64AUTOSTART = 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
51[dht] 51[dht]
52AUTOSTART = NO 52AUTOSTART = NO
53 53
54
55
56[nat] 54[nat]
57DISABLEV6 = YES 55DISABLEV6 = YES
58BINDTO = 127.0.0.1
59ENABLE_UPNP = NO 56ENABLE_UPNP = NO
60BEHIND_NAT = NO 57BEHIND_NAT = NO
61ALLOW_NAT = NO 58ALLOW_NAT = NO
62INTERNAL_ADDRESS = 127.0.0.1 59INTERNAL_ADDRESS = 127.0.0.1
63EXTERNAL_ADDRESS = 127.0.0.1 60EXTERNAL_ADDRESS = 127.0.0.1
61USE_LOCALADDR = NO
64 62
65[dns] 63[dns]
66AUTOSTART = NO 64AUTOSTART = 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
53[dht] 53[dht]
54AUTOSTART = NO 54AUTOSTART = NO
55 55
56
57
58[nat] 56[nat]
59DISABLEV6 = YES 57DISABLEV6 = YES
60BINDTO = 127.0.0.1
61ENABLE_UPNP = NO 58ENABLE_UPNP = NO
62BEHIND_NAT = NO 59BEHIND_NAT = NO
63ALLOW_NAT = NO 60ALLOW_NAT = NO
64INTERNAL_ADDRESS = 127.0.0.1 61INTERNAL_ADDRESS = 127.0.0.1
65EXTERNAL_ADDRESS = 127.0.0.1 62EXTERNAL_ADDRESS = 127.0.0.1
63USE_LOCALADDR = NO
66 64
67[dns] 65[dns]
68AUTOSTART = NO 66AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
56[dht] 56[dht]
57AUTOSTART = NO 57AUTOSTART = NO
58 58
59
60
61[nat] 59[nat]
62DISABLEV6 = YES 60DISABLEV6 = YES
63BINDTO = 127.0.0.1
64ENABLE_UPNP = NO 61ENABLE_UPNP = NO
65BEHIND_NAT = NO 62BEHIND_NAT = NO
66ALLOW_NAT = NO 63ALLOW_NAT = NO
67INTERNAL_ADDRESS = 127.0.0.1 64INTERNAL_ADDRESS = 127.0.0.1
68EXTERNAL_ADDRESS = 127.0.0.1 65EXTERNAL_ADDRESS = 127.0.0.1
66USE_LOCALADDR = NO
69 67
70[dns] 68[dns]
71AUTOSTART = NO 69AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
49[dht] 49[dht]
50AUTOSTART = NO 50AUTOSTART = NO
51 51
52
53
54[nat] 52[nat]
55DISABLEV6 = YES 53DISABLEV6 = YES
56BINDTO = 127.0.0.1
57ENABLE_UPNP = NO 54ENABLE_UPNP = NO
58BEHIND_NAT = NO 55BEHIND_NAT = NO
59ALLOW_NAT = NO 56ALLOW_NAT = NO
60INTERNAL_ADDRESS = 127.0.0.1 57INTERNAL_ADDRESS = 127.0.0.1
61EXTERNAL_ADDRESS = 127.0.0.1 58EXTERNAL_ADDRESS = 127.0.0.1
59USE_LOCALADDR = NO
62 60
63[dns] 61[dns]
64AUTOSTART = NO 62AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
39[dht] 39[dht]
40AUTOSTART = NO 40AUTOSTART = NO
41 41
42
43
44[nat] 42[nat]
45DISABLEV6 = YES 43DISABLEV6 = YES
46BINDTO = 127.0.0.1
47ENABLE_UPNP = NO 44ENABLE_UPNP = NO
48BEHIND_NAT = NO 45BEHIND_NAT = NO
49ALLOW_NAT = NO 46ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
49USE_LOCALADDR = NO
52 50
53[dns] 51[dns]
54AUTOSTART = NO 52AUTOSTART = 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
53[dht] 53[dht]
54AUTOSTART = NO 54AUTOSTART = NO
55 55
56
57
58[nat] 56[nat]
59DISABLEV6 = YES 57DISABLEV6 = YES
60BINDTO = 127.0.0.1
61ENABLE_UPNP = NO 58ENABLE_UPNP = NO
62BEHIND_NAT = NO 59BEHIND_NAT = NO
63ALLOW_NAT = NO 60ALLOW_NAT = NO
64INTERNAL_ADDRESS = 127.0.0.1 61INTERNAL_ADDRESS = 127.0.0.1
65EXTERNAL_ADDRESS = 127.0.0.1 62EXTERNAL_ADDRESS = 127.0.0.1
63USE_LOCALADDR = NO
66 64
67[dns] 65[dns]
68AUTOSTART = NO 66AUTOSTART = 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
56[dht] 56[dht]
57AUTOSTART = NO 57AUTOSTART = NO
58 58
59
60
61[nat] 59[nat]
62DISABLEV6 = YES 60DISABLEV6 = YES
63BINDTO = 127.0.0.1
64ENABLE_UPNP = NO 61ENABLE_UPNP = NO
65BEHIND_NAT = NO 62BEHIND_NAT = NO
66ALLOW_NAT = NO 63ALLOW_NAT = NO
67INTERNAL_ADDRESS = 127.0.0.1 64INTERNAL_ADDRESS = 127.0.0.1
68EXTERNAL_ADDRESS = 127.0.0.1 65EXTERNAL_ADDRESS = 127.0.0.1
66USE_LOCALADDR = NO
69 67
70[dns] 68[dns]
71AUTOSTART = NO 69AUTOSTART = 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
24 24
25[nat] 25[nat]
26DISABLEV6 = YES 26DISABLEV6 = YES
27BINDTO = 127.0.0.1
28ENABLE_UPNP = NO 27ENABLE_UPNP = NO
29BEHIND_NAT = NO 28BEHIND_NAT = NO
30ALLOW_NAT = NO 29ALLOW_NAT = NO
31INTERNAL_ADDRESS = 127.0.0.1 30INTERNAL_ADDRESS = 127.0.0.1
32EXTERNAL_ADDRESS = 127.0.0.1 31EXTERNAL_ADDRESS = 127.0.0.1
32USE_LOCALADDR = NO
33 33
34[peerinfo] 34[peerinfo]
35PORT = 2669 35PORT = 2669