diff options
41 files changed, 47 insertions, 96 deletions
@@ -1,4 +1,9 @@ | |||
1 | 0.9.0pre3: | 1 | 0.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 | ||
4 | 0.9.0pre4: | 9 | 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 @@ | |||
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 |
19 | DEBUG = YES | 19 | #DEBUG = YES |
20 | 20 | ||
21 | [arm] | 21 | [arm] |
22 | PORT = 12466 | 22 | PORT = 12466 |
@@ -32,16 +32,15 @@ PORT = 12467 | |||
32 | PORT = 12468 | 32 | PORT = 12468 |
33 | BINDTO = 127.0.0.1 | 33 | BINDTO = 127.0.0.1 |
34 | #DEBUG = YES | 34 | #DEBUG = YES |
35 | USE_LOCALADDR = YES | ||
36 | 35 | ||
37 | [nat] | 36 | [nat] |
38 | DISABLEV6 = YES | 37 | DISABLEV6 = YES |
39 | BINDTO = 127.0.0.1 | ||
40 | ENABLE_UPNP = NO | 38 | ENABLE_UPNP = NO |
41 | BEHIND_NAT = NO | 39 | BEHIND_NAT = NO |
42 | ALLOW_NAT = NO | 40 | ALLOW_NAT = NO |
43 | INTERNAL_ADDRESS = 127.0.0.1 | 41 | INTERNAL_ADDRESS = 127.0.0.1 |
44 | EXTERNAL_ADDRESS = 127.0.0.1 | 42 | EXTERNAL_ADDRESS = 127.0.0.1 |
43 | USE_LOCALADDR = NO | ||
45 | 44 | ||
46 | [peerinfo] | 45 | [peerinfo] |
47 | PORT = 12469 | 46 | 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 | |||
21 | 21 | ||
22 | [nat] | 22 | [nat] |
23 | DISABLEV6 = YES | 23 | DISABLEV6 = YES |
24 | BINDTO = 127.0.0.1 | ||
25 | ENABLE_UPNP = NO | 24 | ENABLE_UPNP = NO |
26 | BEHIND_NAT = NO | 25 | BEHIND_NAT = NO |
27 | ALLOW_NAT = NO | 26 | ALLOW_NAT = NO |
28 | INTERNAL_ADDRESS = 127.0.0.1 | 27 | INTERNAL_ADDRESS = 127.0.0.1 |
29 | EXTERNAL_ADDRESS = 127.0.0.1 | 28 | EXTERNAL_ADDRESS = 127.0.0.1 |
29 | USE_LOCALADDR = NO | ||
30 | 30 | ||
31 | [arm] | 31 | [arm] |
32 | PORT = 22466 | 32 | PORT = 22466 |
@@ -43,7 +43,6 @@ UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | |||
43 | PORT = 22468 | 43 | PORT = 22468 |
44 | BINDTO = 127.0.0.1 | 44 | BINDTO = 127.0.0.1 |
45 | #DEBUG = YES | 45 | #DEBUG = YES |
46 | USE_LOCALADDR = YES | ||
47 | 46 | ||
48 | [peerinfo] | 47 | [peerinfo] |
49 | PORT = 22469 | 48 | 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 | |||
33 | PORT = 12488 | 33 | PORT = 12488 |
34 | BINDTO = 127.0.0.1 | 34 | BINDTO = 127.0.0.1 |
35 | #DEBUG = YES | 35 | #DEBUG = YES |
36 | USE_LOCALADDR = YES | ||
37 | 36 | ||
38 | [nat] | 37 | [nat] |
39 | DISABLEV6 = YES | 38 | DISABLEV6 = YES |
40 | BINDTO = 127.0.0.1 | ||
41 | ENABLE_UPNP = NO | 39 | ENABLE_UPNP = NO |
42 | BEHIND_NAT = NO | 40 | BEHIND_NAT = NO |
43 | ALLOW_NAT = NO | 41 | ALLOW_NAT = NO |
44 | INTERNAL_ADDRESS = 127.0.0.1 | 42 | INTERNAL_ADDRESS = 127.0.0.1 |
45 | EXTERNAL_ADDRESS = 127.0.0.1 | 43 | EXTERNAL_ADDRESS = 127.0.0.1 |
44 | USE_LOCALADDR = NO | ||
46 | 45 | ||
47 | [peerinfo] | 46 | [peerinfo] |
48 | PORT = 12489 | 47 | 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 | |||
34 | PORT = 22488 | 34 | PORT = 22488 |
35 | BINDTO = 127.0.0.1 | 35 | BINDTO = 127.0.0.1 |
36 | #DEBUG = YES | 36 | #DEBUG = YES |
37 | USE_LOCALADDR = YES | ||
38 | 37 | ||
39 | [nat] | 38 | [nat] |
40 | DISABLEV6 = YES | 39 | DISABLEV6 = YES |
41 | BINDTO = 127.0.0.1 | ||
42 | ENABLE_UPNP = NO | 40 | ENABLE_UPNP = NO |
43 | BEHIND_NAT = NO | 41 | BEHIND_NAT = NO |
44 | ALLOW_NAT = NO | 42 | ALLOW_NAT = NO |
45 | INTERNAL_ADDRESS = 127.0.0.1 | 43 | INTERNAL_ADDRESS = 127.0.0.1 |
46 | EXTERNAL_ADDRESS = 127.0.0.1 | 44 | EXTERNAL_ADDRESS = 127.0.0.1 |
45 | USE_LOCALADDR = NO | ||
47 | 46 | ||
48 | [peerinfo] | 47 | [peerinfo] |
49 | PORT = 22489 | 48 | 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 | |||
33 | PORT = 12488 | 33 | PORT = 12488 |
34 | BINDTO = 127.0.0.1 | 34 | BINDTO = 127.0.0.1 |
35 | #DEBUG = YES | 35 | #DEBUG = YES |
36 | USE_LOCALADDR = YES | ||
37 | 36 | ||
38 | [nat] | 37 | [nat] |
39 | DISABLEV6 = YES | 38 | DISABLEV6 = YES |
40 | BINDTO = 127.0.0.1 | ||
41 | ENABLE_UPNP = NO | 39 | ENABLE_UPNP = NO |
42 | BEHIND_NAT = NO | 40 | BEHIND_NAT = NO |
43 | ALLOW_NAT = NO | 41 | ALLOW_NAT = NO |
44 | INTERNAL_ADDRESS = 127.0.0.1 | 42 | INTERNAL_ADDRESS = 127.0.0.1 |
45 | EXTERNAL_ADDRESS = 127.0.0.1 | 43 | EXTERNAL_ADDRESS = 127.0.0.1 |
44 | USE_LOCALADDR = NO | ||
46 | 45 | ||
47 | [peerinfo] | 46 | [peerinfo] |
48 | PORT = 12489 | 47 | 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 | |||
34 | PORT = 22488 | 34 | PORT = 22488 |
35 | BINDTO = 127.0.0.1 | 35 | BINDTO = 127.0.0.1 |
36 | #DEBUG = YES | 36 | #DEBUG = YES |
37 | USE_LOCALADDR = YES | ||
38 | 37 | ||
39 | [nat] | 38 | [nat] |
40 | DISABLEV6 = YES | 39 | DISABLEV6 = YES |
41 | BINDTO = 127.0.0.1 | ||
42 | ENABLE_UPNP = NO | 40 | ENABLE_UPNP = NO |
43 | BEHIND_NAT = NO | 41 | BEHIND_NAT = NO |
44 | ALLOW_NAT = NO | 42 | ALLOW_NAT = NO |
45 | INTERNAL_ADDRESS = 127.0.0.1 | 43 | INTERNAL_ADDRESS = 127.0.0.1 |
46 | EXTERNAL_ADDRESS = 127.0.0.1 | 44 | EXTERNAL_ADDRESS = 127.0.0.1 |
45 | USE_LOCALADDR = NO | ||
47 | 46 | ||
48 | [peerinfo] | 47 | [peerinfo] |
49 | PORT = 22489 | 48 | 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 | |||
33 | PORT = 12428 | 33 | PORT = 12428 |
34 | BINDTO = 127.0.0.1 | 34 | BINDTO = 127.0.0.1 |
35 | #DEBUG = YES | 35 | #DEBUG = YES |
36 | USE_LOCALADDR = YES | ||
37 | 36 | ||
38 | [nat] | 37 | [nat] |
39 | DISABLEV6 = YES | 38 | DISABLEV6 = YES |
40 | BINDTO = 127.0.0.1 | ||
41 | ENABLE_UPNP = NO | 39 | ENABLE_UPNP = NO |
42 | BEHIND_NAT = NO | 40 | BEHIND_NAT = NO |
43 | ALLOW_NAT = NO | 41 | ALLOW_NAT = NO |
44 | INTERNAL_ADDRESS = 127.0.0.1 | 42 | INTERNAL_ADDRESS = 127.0.0.1 |
45 | EXTERNAL_ADDRESS = 127.0.0.1 | 43 | EXTERNAL_ADDRESS = 127.0.0.1 |
44 | USE_LOCALADDR = NO | ||
46 | 45 | ||
47 | [peerinfo] | 46 | [peerinfo] |
48 | PORT = 12429 | 47 | 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 | |||
34 | PORT = 22428 | 34 | PORT = 22428 |
35 | BINDTO = 127.0.0.1 | 35 | BINDTO = 127.0.0.1 |
36 | #DEBUG = YES | 36 | #DEBUG = YES |
37 | USE_LOCALADDR = YES | ||
38 | 37 | ||
39 | [nat] | 38 | [nat] |
40 | DISABLEV6 = YES | 39 | DISABLEV6 = YES |
41 | BINDTO = 127.0.0.1 | ||
42 | ENABLE_UPNP = NO | 40 | ENABLE_UPNP = NO |
43 | BEHIND_NAT = NO | 41 | BEHIND_NAT = NO |
44 | ALLOW_NAT = NO | 42 | ALLOW_NAT = NO |
45 | INTERNAL_ADDRESS = 127.0.0.1 | 43 | INTERNAL_ADDRESS = 127.0.0.1 |
46 | EXTERNAL_ADDRESS = 127.0.0.1 | 44 | EXTERNAL_ADDRESS = 127.0.0.1 |
45 | USE_LOCALADDR = NO | ||
47 | 46 | ||
48 | [peerinfo] | 47 | [peerinfo] |
49 | PORT = 22429 | 48 | 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 | |||
33 | [transport-tcp] | 33 | [transport-tcp] |
34 | PORT = 12468 | 34 | PORT = 12468 |
35 | BINDTO = 127.0.0.1 | 35 | BINDTO = 127.0.0.1 |
36 | #DEBUG = YES | ||
37 | USE_LOCALADDR = YES | ||
38 | 36 | ||
39 | [nat] | 37 | [nat] |
40 | DISABLEV6 = YES | 38 | DISABLEV6 = YES |
41 | BINDTO = 127.0.0.1 | ||
42 | ENABLE_UPNP = NO | 39 | ENABLE_UPNP = NO |
43 | BEHIND_NAT = NO | 40 | BEHIND_NAT = NO |
44 | ALLOW_NAT = NO | 41 | ALLOW_NAT = NO |
45 | INTERNAL_ADDRESS = 127.0.0.1 | 42 | INTERNAL_ADDRESS = 127.0.0.1 |
46 | EXTERNAL_ADDRESS = 127.0.0.1 | 43 | EXTERNAL_ADDRESS = 127.0.0.1 |
44 | USE_LOCALADDR = NO | ||
47 | 45 | ||
48 | [peerinfo] | 46 | [peerinfo] |
49 | PORT = 12479 | 47 | 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 | |||
34 | PORT = 22478 | 34 | PORT = 22478 |
35 | BINDTO = 127.0.0.1 | 35 | BINDTO = 127.0.0.1 |
36 | #DEBUG = YES | 36 | #DEBUG = YES |
37 | USE_LOCALADDR = YES | ||
38 | 37 | ||
39 | [nat] | 38 | [nat] |
40 | DISABLEV6 = YES | 39 | DISABLEV6 = YES |
41 | BINDTO = 127.0.0.1 | ||
42 | ENABLE_UPNP = NO | 40 | ENABLE_UPNP = NO |
43 | BEHIND_NAT = NO | 41 | BEHIND_NAT = NO |
44 | ALLOW_NAT = NO | 42 | ALLOW_NAT = NO |
45 | INTERNAL_ADDRESS = 127.0.0.1 | 43 | INTERNAL_ADDRESS = 127.0.0.1 |
46 | EXTERNAL_ADDRESS = 127.0.0.1 | 44 | EXTERNAL_ADDRESS = 127.0.0.1 |
45 | USE_LOCALADDR = NO | ||
47 | 46 | ||
48 | [peerinfo] | 47 | [peerinfo] |
49 | PORT = 22479 | 48 | 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/ | |||
54 | 54 | ||
55 | [nat] | 55 | [nat] |
56 | DISABLEV6 = YES | 56 | DISABLEV6 = YES |
57 | BINDTO = 127.0.0.1 | ||
58 | ENABLE_UPNP = NO | 57 | ENABLE_UPNP = NO |
59 | BEHIND_NAT = NO | 58 | BEHIND_NAT = NO |
60 | ALLOW_NAT = NO | 59 | ALLOW_NAT = NO |
61 | INTERNAL_ADDRESS = 127.0.0.1 | 60 | INTERNAL_ADDRESS = 127.0.0.1 |
62 | EXTERNAL_ADDRESS = 127.0.0.1 | 61 | EXTERNAL_ADDRESS = 127.0.0.1 |
62 | USE_LOCALADDR = NO | ||
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | 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/ | |||
99 | 99 | ||
100 | [nat] | 100 | [nat] |
101 | DISABLEV6 = YES | 101 | DISABLEV6 = YES |
102 | BINDTO = 127.0.0.1 | ||
103 | ENABLE_UPNP = NO | 102 | ENABLE_UPNP = NO |
104 | BEHIND_NAT = NO | 103 | BEHIND_NAT = NO |
105 | ALLOW_NAT = NO | 104 | ALLOW_NAT = NO |
106 | INTERNAL_ADDRESS = 127.0.0.1 | 105 | INTERNAL_ADDRESS = 127.0.0.1 |
107 | EXTERNAL_ADDRESS = 127.0.0.1 | 106 | EXTERNAL_ADDRESS = 127.0.0.1 |
107 | USE_LOCALADDR = NO | ||
108 | 108 | ||
109 | [dns] | 109 | [dns] |
110 | AUTOSTART = NO | 110 | 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/ | |||
54 | 54 | ||
55 | [nat] | 55 | [nat] |
56 | DISABLEV6 = YES | 56 | DISABLEV6 = YES |
57 | BINDTO = 127.0.0.1 | ||
58 | ENABLE_UPNP = NO | 57 | ENABLE_UPNP = NO |
59 | BEHIND_NAT = NO | 58 | BEHIND_NAT = NO |
60 | ALLOW_NAT = NO | 59 | ALLOW_NAT = NO |
61 | INTERNAL_ADDRESS = 127.0.0.1 | 60 | INTERNAL_ADDRESS = 127.0.0.1 |
62 | EXTERNAL_ADDRESS = 127.0.0.1 | 61 | EXTERNAL_ADDRESS = 127.0.0.1 |
62 | USE_LOCALADDR = NO | ||
63 | 63 | ||
64 | [dns] | 64 | [dns] |
65 | AUTOSTART = NO | 65 | 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 | |||
49 | 49 | ||
50 | [nat] | 50 | [nat] |
51 | DISABLEV6 = YES | 51 | DISABLEV6 = YES |
52 | BINDTO = 127.0.0.1 | ||
53 | ENABLE_UPNP = NO | 52 | ENABLE_UPNP = NO |
54 | BEHIND_NAT = NO | 53 | BEHIND_NAT = NO |
55 | ALLOW_NAT = NO | 54 | ALLOW_NAT = NO |
56 | INTERNAL_ADDRESS = 127.0.0.1 | 55 | INTERNAL_ADDRESS = 127.0.0.1 |
57 | EXTERNAL_ADDRESS = 127.0.0.1 | 56 | EXTERNAL_ADDRESS = 127.0.0.1 |
57 | USE_LOCALADDR = NO | ||
58 | 58 | ||
59 | [dns] | 59 | [dns] |
60 | AUTOSTART = NO | 60 | 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 | |||
57 | [fs] | 57 | [fs] |
58 | AUTOSTART = NO | 58 | AUTOSTART = NO |
59 | 59 | ||
60 | |||
61 | |||
62 | [nat] | 60 | [nat] |
63 | DISABLEV6 = YES | 61 | DISABLEV6 = YES |
64 | BINDTO = 127.0.0.1 | ||
65 | ENABLE_UPNP = NO | 62 | ENABLE_UPNP = NO |
66 | BEHIND_NAT = NO | 63 | BEHIND_NAT = NO |
67 | ALLOW_NAT = NO | 64 | ALLOW_NAT = NO |
68 | INTERNAL_ADDRESS = 127.0.0.1 | 65 | INTERNAL_ADDRESS = 127.0.0.1 |
69 | EXTERNAL_ADDRESS = 127.0.0.1 | 66 | EXTERNAL_ADDRESS = 127.0.0.1 |
67 | USE_LOCALADDR = NO | ||
70 | 68 | ||
71 | [dns] | 69 | [dns] |
72 | AUTOSTART = NO | 70 | 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 | |||
18 | 18 | ||
19 | [nat] | 19 | [nat] |
20 | DISABLEV6 = YES | 20 | DISABLEV6 = YES |
21 | BINDTO = 127.0.0.1 | ||
22 | ENABLE_UPNP = NO | 21 | ENABLE_UPNP = NO |
23 | BEHIND_NAT = NO | 22 | BEHIND_NAT = NO |
24 | ALLOW_NAT = NO | 23 | ALLOW_NAT = NO |
25 | INTERNAL_ADDRESS = 127.0.0.1 | 24 | INTERNAL_ADDRESS = 127.0.0.1 |
26 | EXTERNAL_ADDRESS = 127.0.0.1 | 25 | EXTERNAL_ADDRESS = 127.0.0.1 |
26 | USE_LOCALADDR = NO | ||
27 | 27 | ||
28 | [arm] | 28 | [arm] |
29 | PORT = 43466 | 29 | PORT = 43466 |
@@ -41,7 +41,7 @@ PORT = 43467 | |||
41 | HOSTNAME = localhost | 41 | HOSTNAME = localhost |
42 | 42 | ||
43 | [transport-tcp] | 43 | [transport-tcp] |
44 | TIMEOUT = 300000 | 44 | BINDTO = 127.0.0.1 |
45 | PORT = 43468 | 45 | PORT = 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] |
50 | QUOTA=65536 | 50 | QUOTA=65536 |
51 | |||
52 | DATABASE=sqlite | 51 | DATABASE=sqlite |
52 | |||
53 | [mesh] | 53 | [mesh] |
54 | AUTOSTART = NO | 54 | AUTOSTART = NO |
55 | 55 | ||
56 | |||
57 | |||
58 | [dns] | 56 | [dns] |
59 | AUTOSTART = NO | 57 | AUTOSTART = 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] |
72 | QUOTA=65536 | 72 | QUOTA=65536 |
73 | |||
74 | DATABASE=sqlite | 73 | DATABASE=sqlite |
74 | |||
75 | [mesh] | 75 | [mesh] |
76 | AUTOSTART = NO | 76 | AUTOSTART = NO |
77 | 77 | ||
78 | |||
79 | |||
80 | [dns] | 78 | [dns] |
81 | AUTOSTART = NO | 79 | AUTOSTART = 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] |
61 | DISABLEV6 = YES | 61 | DISABLEV6 = YES |
62 | BINDTO = 127.0.0.1 | ||
63 | ENABLE_UPNP = NO | 62 | ENABLE_UPNP = NO |
64 | BEHIND_NAT = NO | 63 | BEHIND_NAT = NO |
65 | ALLOW_NAT = NO | 64 | ALLOW_NAT = NO |
66 | INTERNAL_ADDRESS = 127.0.0.1 | 65 | INTERNAL_ADDRESS = 127.0.0.1 |
67 | EXTERNAL_ADDRESS = 127.0.0.1 | 66 | EXTERNAL_ADDRESS = 127.0.0.1 |
67 | USE_LOCALADDR = NO | ||
68 | 68 | ||
69 | [dns] | 69 | [dns] |
70 | AUTOSTART = NO | 70 | 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 | |||
57 | [mesh] | 57 | [mesh] |
58 | AUTOSTART = NO | 58 | AUTOSTART = NO |
59 | 59 | ||
60 | |||
61 | |||
62 | [nat] | 60 | [nat] |
63 | DISABLEV6 = YES | 61 | DISABLEV6 = YES |
64 | BINDTO = 127.0.0.1 | ||
65 | ENABLE_UPNP = NO | 62 | ENABLE_UPNP = NO |
66 | BEHIND_NAT = NO | 63 | BEHIND_NAT = NO |
67 | ALLOW_NAT = NO | 64 | ALLOW_NAT = NO |
68 | INTERNAL_ADDRESS = 127.0.0.1 | 65 | INTERNAL_ADDRESS = 127.0.0.1 |
69 | EXTERNAL_ADDRESS = 127.0.0.1 | 66 | EXTERNAL_ADDRESS = 127.0.0.1 |
67 | USE_LOCALADDR = NO | ||
70 | 68 | ||
71 | [dns] | 69 | [dns] |
72 | AUTOSTART = NO | 70 | 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 | |||
46 | 46 | ||
47 | [nat] | 47 | [nat] |
48 | DISABLEV6 = YES | 48 | DISABLEV6 = YES |
49 | BINDTO = 127.0.0.1 | ||
50 | ENABLE_UPNP = NO | 49 | ENABLE_UPNP = NO |
51 | BEHIND_NAT = NO | 50 | BEHIND_NAT = NO |
52 | ALLOW_NAT = NO | 51 | ALLOW_NAT = NO |
53 | INTERNAL_ADDRESS = 127.0.0.1 | 52 | INTERNAL_ADDRESS = 127.0.0.1 |
54 | EXTERNAL_ADDRESS = 127.0.0.1 | 53 | EXTERNAL_ADDRESS = 127.0.0.1 |
54 | USE_LOCALADDR = NO | ||
55 | 55 | ||
56 | [dns] | 56 | [dns] |
57 | AUTOSTART = NO | 57 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
52 | [dht] | 52 | [dht] |
53 | AUTOSTART = NO | 53 | AUTOSTART = NO |
54 | 54 | ||
55 | |||
56 | |||
57 | [nat] | 55 | [nat] |
58 | DISABLEV6 = YES | 56 | DISABLEV6 = YES |
59 | BINDTO = 127.0.0.1 | ||
60 | ENABLE_UPNP = NO | 57 | ENABLE_UPNP = NO |
61 | BEHIND_NAT = NO | 58 | BEHIND_NAT = NO |
62 | ALLOW_NAT = NO | 59 | ALLOW_NAT = NO |
63 | INTERNAL_ADDRESS = 127.0.0.1 | 60 | INTERNAL_ADDRESS = 127.0.0.1 |
64 | EXTERNAL_ADDRESS = 127.0.0.1 | 61 | EXTERNAL_ADDRESS = 127.0.0.1 |
62 | USE_LOCALADDR = NO | ||
65 | 63 | ||
66 | [dns] | 64 | [dns] |
67 | AUTOSTART = NO | 65 | 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 | |||
47 | [dht] | 47 | [dht] |
48 | AUTOSTART = NO | 48 | AUTOSTART = NO |
49 | 49 | ||
50 | |||
51 | |||
52 | [nat] | 50 | [nat] |
53 | DISABLEV6 = YES | 51 | DISABLEV6 = YES |
54 | BINDTO = 127.0.0.1 | ||
55 | ENABLE_UPNP = NO | 52 | ENABLE_UPNP = NO |
56 | BEHIND_NAT = NO | 53 | BEHIND_NAT = NO |
57 | ALLOW_NAT = NO | 54 | ALLOW_NAT = NO |
58 | INTERNAL_ADDRESS = 127.0.0.1 | 55 | INTERNAL_ADDRESS = 127.0.0.1 |
59 | EXTERNAL_ADDRESS = 127.0.0.1 | 56 | EXTERNAL_ADDRESS = 127.0.0.1 |
57 | USE_LOCALADDR = NO | ||
60 | 58 | ||
61 | [dns] | 59 | [dns] |
62 | AUTOSTART = NO | 60 | 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 | |||
54 | [dht] | 54 | [dht] |
55 | AUTOSTART = NO | 55 | AUTOSTART = NO |
56 | 56 | ||
57 | |||
58 | |||
59 | [nat] | 57 | [nat] |
60 | DISABLEV6 = YES | 58 | DISABLEV6 = YES |
61 | BINDTO = 127.0.0.1 | ||
62 | ENABLE_UPNP = NO | 59 | ENABLE_UPNP = NO |
63 | BEHIND_NAT = NO | 60 | BEHIND_NAT = NO |
64 | ALLOW_NAT = NO | 61 | ALLOW_NAT = NO |
65 | INTERNAL_ADDRESS = 127.0.0.1 | 62 | INTERNAL_ADDRESS = 127.0.0.1 |
66 | EXTERNAL_ADDRESS = 127.0.0.1 | 63 | EXTERNAL_ADDRESS = 127.0.0.1 |
64 | USE_LOCALADDR = NO | ||
67 | 65 | ||
68 | [dns] | 66 | [dns] |
69 | AUTOSTART = NO | 67 | 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 | |||
51 | [dht] | 51 | [dht] |
52 | AUTOSTART = NO | 52 | AUTOSTART = NO |
53 | 53 | ||
54 | |||
55 | |||
56 | [nat] | 54 | [nat] |
57 | DISABLEV6 = YES | 55 | DISABLEV6 = YES |
58 | BINDTO = 127.0.0.1 | ||
59 | ENABLE_UPNP = NO | 56 | ENABLE_UPNP = NO |
60 | BEHIND_NAT = NO | 57 | BEHIND_NAT = NO |
61 | ALLOW_NAT = NO | 58 | ALLOW_NAT = NO |
62 | INTERNAL_ADDRESS = 127.0.0.1 | 59 | INTERNAL_ADDRESS = 127.0.0.1 |
63 | EXTERNAL_ADDRESS = 127.0.0.1 | 60 | EXTERNAL_ADDRESS = 127.0.0.1 |
61 | USE_LOCALADDR = NO | ||
64 | 62 | ||
65 | [dns] | 63 | [dns] |
66 | AUTOSTART = NO | 64 | 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 | |||
51 | [dht] | 51 | [dht] |
52 | AUTOSTART = NO | 52 | AUTOSTART = NO |
53 | 53 | ||
54 | |||
55 | |||
56 | [nat] | 54 | [nat] |
57 | DISABLEV6 = YES | 55 | DISABLEV6 = YES |
58 | BINDTO = 127.0.0.1 | ||
59 | ENABLE_UPNP = NO | 56 | ENABLE_UPNP = NO |
60 | BEHIND_NAT = NO | 57 | BEHIND_NAT = NO |
61 | ALLOW_NAT = NO | 58 | ALLOW_NAT = NO |
62 | INTERNAL_ADDRESS = 127.0.0.1 | 59 | INTERNAL_ADDRESS = 127.0.0.1 |
63 | EXTERNAL_ADDRESS = 127.0.0.1 | 60 | EXTERNAL_ADDRESS = 127.0.0.1 |
61 | USE_LOCALADDR = NO | ||
64 | 62 | ||
65 | [dns] | 63 | [dns] |
66 | AUTOSTART = NO | 64 | 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 | |||
53 | [dht] | 53 | [dht] |
54 | AUTOSTART = NO | 54 | AUTOSTART = NO |
55 | 55 | ||
56 | |||
57 | |||
58 | [nat] | 56 | [nat] |
59 | DISABLEV6 = YES | 57 | DISABLEV6 = YES |
60 | BINDTO = 127.0.0.1 | ||
61 | ENABLE_UPNP = NO | 58 | ENABLE_UPNP = NO |
62 | BEHIND_NAT = NO | 59 | BEHIND_NAT = NO |
63 | ALLOW_NAT = NO | 60 | ALLOW_NAT = NO |
64 | INTERNAL_ADDRESS = 127.0.0.1 | 61 | INTERNAL_ADDRESS = 127.0.0.1 |
65 | EXTERNAL_ADDRESS = 127.0.0.1 | 62 | EXTERNAL_ADDRESS = 127.0.0.1 |
63 | USE_LOCALADDR = NO | ||
66 | 64 | ||
67 | [dns] | 65 | [dns] |
68 | AUTOSTART = NO | 66 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
56 | [dht] | 56 | [dht] |
57 | AUTOSTART = NO | 57 | AUTOSTART = NO |
58 | 58 | ||
59 | |||
60 | |||
61 | [nat] | 59 | [nat] |
62 | DISABLEV6 = YES | 60 | DISABLEV6 = YES |
63 | BINDTO = 127.0.0.1 | ||
64 | ENABLE_UPNP = NO | 61 | ENABLE_UPNP = NO |
65 | BEHIND_NAT = NO | 62 | BEHIND_NAT = NO |
66 | ALLOW_NAT = NO | 63 | ALLOW_NAT = NO |
67 | INTERNAL_ADDRESS = 127.0.0.1 | 64 | INTERNAL_ADDRESS = 127.0.0.1 |
68 | EXTERNAL_ADDRESS = 127.0.0.1 | 65 | EXTERNAL_ADDRESS = 127.0.0.1 |
66 | USE_LOCALADDR = NO | ||
69 | 67 | ||
70 | [dns] | 68 | [dns] |
71 | AUTOSTART = NO | 69 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
49 | [dht] | 49 | [dht] |
50 | AUTOSTART = NO | 50 | AUTOSTART = NO |
51 | 51 | ||
52 | |||
53 | |||
54 | [nat] | 52 | [nat] |
55 | DISABLEV6 = YES | 53 | DISABLEV6 = YES |
56 | BINDTO = 127.0.0.1 | ||
57 | ENABLE_UPNP = NO | 54 | ENABLE_UPNP = NO |
58 | BEHIND_NAT = NO | 55 | BEHIND_NAT = NO |
59 | ALLOW_NAT = NO | 56 | ALLOW_NAT = NO |
60 | INTERNAL_ADDRESS = 127.0.0.1 | 57 | INTERNAL_ADDRESS = 127.0.0.1 |
61 | EXTERNAL_ADDRESS = 127.0.0.1 | 58 | EXTERNAL_ADDRESS = 127.0.0.1 |
59 | USE_LOCALADDR = NO | ||
62 | 60 | ||
63 | [dns] | 61 | [dns] |
64 | AUTOSTART = NO | 62 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
39 | [dht] | 39 | [dht] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | ||
42 | |||
43 | |||
44 | [nat] | 42 | [nat] |
45 | DISABLEV6 = YES | 43 | DISABLEV6 = YES |
46 | BINDTO = 127.0.0.1 | ||
47 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
48 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
49 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
50 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
49 | USE_LOCALADDR = NO | ||
52 | 50 | ||
53 | [dns] | 51 | [dns] |
54 | AUTOSTART = NO | 52 | 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 | |||
53 | [dht] | 53 | [dht] |
54 | AUTOSTART = NO | 54 | AUTOSTART = NO |
55 | 55 | ||
56 | |||
57 | |||
58 | [nat] | 56 | [nat] |
59 | DISABLEV6 = YES | 57 | DISABLEV6 = YES |
60 | BINDTO = 127.0.0.1 | ||
61 | ENABLE_UPNP = NO | 58 | ENABLE_UPNP = NO |
62 | BEHIND_NAT = NO | 59 | BEHIND_NAT = NO |
63 | ALLOW_NAT = NO | 60 | ALLOW_NAT = NO |
64 | INTERNAL_ADDRESS = 127.0.0.1 | 61 | INTERNAL_ADDRESS = 127.0.0.1 |
65 | EXTERNAL_ADDRESS = 127.0.0.1 | 62 | EXTERNAL_ADDRESS = 127.0.0.1 |
63 | USE_LOCALADDR = NO | ||
66 | 64 | ||
67 | [dns] | 65 | [dns] |
68 | AUTOSTART = NO | 66 | 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 | |||
56 | [dht] | 56 | [dht] |
57 | AUTOSTART = NO | 57 | AUTOSTART = NO |
58 | 58 | ||
59 | |||
60 | |||
61 | [nat] | 59 | [nat] |
62 | DISABLEV6 = YES | 60 | DISABLEV6 = YES |
63 | BINDTO = 127.0.0.1 | ||
64 | ENABLE_UPNP = NO | 61 | ENABLE_UPNP = NO |
65 | BEHIND_NAT = NO | 62 | BEHIND_NAT = NO |
66 | ALLOW_NAT = NO | 63 | ALLOW_NAT = NO |
67 | INTERNAL_ADDRESS = 127.0.0.1 | 64 | INTERNAL_ADDRESS = 127.0.0.1 |
68 | EXTERNAL_ADDRESS = 127.0.0.1 | 65 | EXTERNAL_ADDRESS = 127.0.0.1 |
66 | USE_LOCALADDR = NO | ||
69 | 67 | ||
70 | [dns] | 68 | [dns] |
71 | AUTOSTART = NO | 69 | 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 | |||
24 | 24 | ||
25 | [nat] | 25 | [nat] |
26 | DISABLEV6 = YES | 26 | DISABLEV6 = YES |
27 | BINDTO = 127.0.0.1 | ||
28 | ENABLE_UPNP = NO | 27 | ENABLE_UPNP = NO |
29 | BEHIND_NAT = NO | 28 | BEHIND_NAT = NO |
30 | ALLOW_NAT = NO | 29 | ALLOW_NAT = NO |
31 | INTERNAL_ADDRESS = 127.0.0.1 | 30 | INTERNAL_ADDRESS = 127.0.0.1 |
32 | EXTERNAL_ADDRESS = 127.0.0.1 | 31 | EXTERNAL_ADDRESS = 127.0.0.1 |
32 | USE_LOCALADDR = NO | ||
33 | 33 | ||
34 | [peerinfo] | 34 | [peerinfo] |
35 | PORT = 2669 | 35 | PORT = 2669 |