aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/defaults.conf37
-rw-r--r--src/transport/plugin_transport_tcp.c35
-rw-r--r--src/transport/plugin_transport_udp.c26
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf6
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf6
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf6
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf6
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf6
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf6
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf6
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf6
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf4
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf4
-rw-r--r--src/transport/test_transport_ats_1addr.conf4
-rw-r--r--src/transport/test_transport_ats_2addr.conf3
-rw-r--r--src/transport/test_transport_ats_4addr.conf5
16 files changed, 97 insertions, 69 deletions
diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 0d1bffab9..6c467f895 100644
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -21,11 +21,7 @@ MAX_OUTSTANDING_CONNECTIONS = 50
21[client] 21[client]
22HOME = $SERVICEHOME 22HOME = $SERVICEHOME
23 23
24[transport-tcp] 24[nat]
25# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
26PORT = 2086
27ADVERTISED_PORT = 2086
28
29# Are we behind NAT? 25# Are we behind NAT?
30BEHIND_NAT = YES 26BEHIND_NAT = YES
31 27
@@ -54,29 +50,44 @@ ENABLE_ICMP_SERVER = YES
54# (but use different: this one restricts our bind!) 50# (but use different: this one restricts our bind!)
55# BINDTO = 51# BINDTO =
56 52
53# Disable IPv6 support
54DISABLEV6 = NO
55
56
57[transport-tcp]
58# Use 0 to ONLY advertise as a peer behind NAT (no port binding)
59PORT = 2086
60ADVERTISED_PORT = 2086
61
57TIMEOUT = 300000 62TIMEOUT = 300000
58 63
59# Disable IPv6 support 64# Allow use of loopback address
60# DISABLEV6 = 65USE_LOCALADDR = NO
66
61# ACCEPT_FROM = 67# ACCEPT_FROM =
62# ACCEPT_FROM6 = 68# ACCEPT_FROM6 =
63# REJECT_FROM = 69# REJECT_FROM =
64# REJECT_FROM6 = 70# REJECT_FROM6 =
65 71
72
66[transport-udp] 73[transport-udp]
67PORT = 2086 74PORT = 2086
68# BEHIND_NAT = 75
69# BINDTO = 76# Allow use of loopback address
70# ALLOW_NAT = 77USE_LOCALADDR = NO
71# ONLY_NAT_ADDRESSES = 78
72# INTERNAL_ADDRESS =
73# EXTERNAL_ADDRESS =
74 79
75[transport-http] 80[transport-http]
76PORT = 1080 81PORT = 1080
82# Allow use of loopback address
83USE_LOCALADDR = NO
84
77 85
78[transport-https] 86[transport-https]
79PORT = 4433 87PORT = 4433
88# Allow use of loopback address
89USE_LOCALADDR = NO
90
80 91
81[transport-wlan] 92[transport-wlan]
82# Name of the interface in monitor mode (typically monX) 93# Name of the interface in monitor mode (typically monX)
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 1c22ce806..2be02d643 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2278,7 +2278,7 @@ process_interfaces (void *cls,
2278 case AF_INET6: 2278 case AF_INET6:
2279 if ( (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) || 2279 if ( (IN6_IS_ADDR_LINKLOCAL (&((struct sockaddr_in6 *) addr)->sin6_addr)) ||
2280 (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg, 2280 (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno(plugin->env->cfg,
2281 "transport-tcp", 2281 "nat",
2282 "DISABLEV6")) ) 2282 "DISABLEV6")) )
2283 { 2283 {
2284 /* skip link local addresses */ 2284 /* skip link local addresses */
@@ -2829,19 +2829,19 @@ libgnunet_plugin_transport_tcp_init (void *cls)
2829 struct GNUNET_TIME_Relative idle_timeout; 2829 struct GNUNET_TIME_Relative idle_timeout;
2830 2830
2831 behind_nat = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2831 behind_nat = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2832 "transport-tcp", 2832 "nat",
2833 "BEHIND_NAT"); 2833 "BEHIND_NAT");
2834 nat_punched = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2834 nat_punched = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2835 "transport-tcp", 2835 "nat",
2836 "NAT_PUNCHED"); 2836 "NAT_PUNCHED");
2837 enable_nat_client = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2837 enable_nat_client = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2838 "transport-tcp", 2838 "nat",
2839 "ENABLE_NAT_CLIENT"); 2839 "ENABLE_NAT_CLIENT");
2840 enable_nat_server = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2840 enable_nat_server = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2841 "transport-tcp", 2841 "nat",
2842 "ENABLE_NAT_SERVER"); 2842 "ENABLE_NAT_SERVER");
2843 enable_upnp = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2843 enable_upnp = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2844 "transport-tcp", 2844 "nat",
2845 "ENABLE_UPNP"); 2845 "ENABLE_UPNP");
2846 2846
2847 if ( (GNUNET_YES == enable_nat_server) && 2847 if ( (GNUNET_YES == enable_nat_server) &&
@@ -2865,11 +2865,11 @@ libgnunet_plugin_transport_tcp_init (void *cls)
2865 external_address = NULL; 2865 external_address = NULL;
2866 if (GNUNET_OK == 2866 if (GNUNET_OK ==
2867 GNUNET_CONFIGURATION_have_value (env->cfg, 2867 GNUNET_CONFIGURATION_have_value (env->cfg,
2868 "transport-tcp", 2868 "nat",
2869 "EXTERNAL_ADDRESS")) 2869 "EXTERNAL_ADDRESS"))
2870 { 2870 {
2871 (void) GNUNET_CONFIGURATION_get_value_string (env->cfg, 2871 (void) GNUNET_CONFIGURATION_get_value_string (env->cfg,
2872 "transport-tcp", 2872 "nat",
2873 "EXTERNAL_ADDRESS", 2873 "EXTERNAL_ADDRESS",
2874 &external_address); 2874 &external_address);
2875 } 2875 }
@@ -2902,7 +2902,7 @@ libgnunet_plugin_transport_tcp_init (void *cls)
2902 2902
2903 bind_address = NULL; 2903 bind_address = NULL;
2904 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (env->cfg, 2904 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (env->cfg,
2905 "transport-tcp", 2905 "nat",
2906 "BINDTO", 2906 "BINDTO",
2907 &bind_address)) 2907 &bind_address))
2908 { 2908 {
@@ -2915,11 +2915,11 @@ libgnunet_plugin_transport_tcp_init (void *cls)
2915 internal_address = NULL; 2915 internal_address = NULL;
2916 if (GNUNET_OK == 2916 if (GNUNET_OK ==
2917 GNUNET_CONFIGURATION_have_value (env->cfg, 2917 GNUNET_CONFIGURATION_have_value (env->cfg,
2918 "transport-tcp", 2918 "nat",
2919 "INTERNAL_ADDRESS")) 2919 "INTERNAL_ADDRESS"))
2920 { 2920 {
2921 (void) GNUNET_CONFIGURATION_get_value_string (env->cfg, 2921 (void) GNUNET_CONFIGURATION_get_value_string (env->cfg,
2922 "transport-tcp", 2922 "nat",
2923 "INTERNAL_ADDRESS", 2923 "INTERNAL_ADDRESS",
2924 &internal_address); 2924 &internal_address);
2925 } 2925 }
@@ -2975,14 +2975,11 @@ libgnunet_plugin_transport_tcp_init (void *cls)
2975 return NULL; 2975 return NULL;
2976 } 2976 }
2977 2977
2978 use_localaddresses = GNUNET_NO; 2978 use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2979 if (GNUNET_CONFIGURATION_have_value (env->cfg, 2979 "transport-tcp",
2980 "transport-tcp", "USE_LOCALADDR")) 2980 "USE_LOCALADDR");
2981 { 2981 if (use_localaddresses == GNUNET_SYSERR)
2982 use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2982 use_localaddresses = GNUNET_NO;
2983 "transport-tcp",
2984 "USE_LOCALADDR");
2985 }
2986 2983
2987 if (aport == 0) 2984 if (aport == 0)
2988 aport = bport; 2985 aport = bport;
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index bb814a996..58135803a 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -1731,7 +1731,7 @@ udp_transport_server_start (void *cls)
1731 } 1731 }
1732 1732
1733 if ( (GNUNET_YES != 1733 if ( (GNUNET_YES !=
1734 GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "transport-udp", 1734 GNUNET_CONFIGURATION_get_value_yesno (plugin->env->cfg, "nat",
1735 "DISABLEV6"))) 1735 "DISABLEV6")))
1736 { 1736 {
1737 plugin->udp_sockv6.desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_DGRAM, 0); 1737 plugin->udp_sockv6.desc = GNUNET_NETWORK_socket_create (PF_INET6, SOCK_DGRAM, 0);
@@ -2221,8 +2221,8 @@ libgnunet_plugin_transport_udp_init (void *cls)
2221 struct IPv4UdpAddress v4_address; 2221 struct IPv4UdpAddress v4_address;
2222 2222
2223 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2223 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2224 "transport-udp", 2224 "nat",
2225 "BEHIND_NAT")) 2225 "BEHIND_NAT"))
2226 { 2226 {
2227 /* We are behind nat (according to the user) */ 2227 /* We are behind nat (according to the user) */
2228 if (check_gnunet_nat_binary("gnunet-nat-server") == GNUNET_YES) 2228 if (check_gnunet_nat_binary("gnunet-nat-server") == GNUNET_YES)
@@ -2237,8 +2237,8 @@ libgnunet_plugin_transport_udp_init (void *cls)
2237 behind_nat = GNUNET_NO; /* We are not behind nat! */ 2237 behind_nat = GNUNET_NO; /* We are not behind nat! */
2238 2238
2239 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2239 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2240 "transport-udp", 2240 "nat",
2241 "ALLOW_NAT")) 2241 "ALLOW_NAT"))
2242 { 2242 {
2243 if (check_gnunet_nat_binary("gnunet-nat-client") == GNUNET_YES) 2243 if (check_gnunet_nat_binary("gnunet-nat-client") == GNUNET_YES)
2244 allow_nat = GNUNET_YES; /* We will try to connect to NAT'd peers */ 2244 allow_nat = GNUNET_YES; /* We will try to connect to NAT'd peers */
@@ -2253,8 +2253,8 @@ libgnunet_plugin_transport_udp_init (void *cls)
2253 allow_nat = GNUNET_NO; /* We don't want to try to help NAT'd peers */ 2253 allow_nat = GNUNET_NO; /* We don't want to try to help NAT'd peers */
2254 2254
2255 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2255 if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2256 "transport-udp", 2256 "nat",
2257 "ONLY_NAT_ADDRESSES")) 2257 "ONLY_NAT_ADDRESSES"))
2258 only_nat_addresses = GNUNET_YES; /* We will only report our addresses as NAT'd */ 2258 only_nat_addresses = GNUNET_YES; /* We will only report our addresses as NAT'd */
2259 else 2259 else
2260 only_nat_addresses = GNUNET_NO; /* We will report our addresses as NAT'd and non-NAT'd */ 2260 only_nat_addresses = GNUNET_NO; /* We will report our addresses as NAT'd and non-NAT'd */
@@ -2262,7 +2262,7 @@ libgnunet_plugin_transport_udp_init (void *cls)
2262 external_address = NULL; 2262 external_address = NULL;
2263 if (((GNUNET_YES == behind_nat) || (GNUNET_YES == allow_nat)) && (GNUNET_OK != 2263 if (((GNUNET_YES == behind_nat) || (GNUNET_YES == allow_nat)) && (GNUNET_OK !=
2264 GNUNET_CONFIGURATION_get_value_string (env->cfg, 2264 GNUNET_CONFIGURATION_get_value_string (env->cfg,
2265 "transport-udp", 2265 "nat",
2266 "EXTERNAL_ADDRESS", 2266 "EXTERNAL_ADDRESS",
2267 &external_address))) 2267 &external_address)))
2268 { 2268 {
@@ -2280,13 +2280,13 @@ libgnunet_plugin_transport_udp_init (void *cls)
2280 internal_address = NULL; 2280 internal_address = NULL;
2281 if ((GNUNET_YES == behind_nat) && (GNUNET_OK != 2281 if ((GNUNET_YES == behind_nat) && (GNUNET_OK !=
2282 GNUNET_CONFIGURATION_get_value_string (env->cfg, 2282 GNUNET_CONFIGURATION_get_value_string (env->cfg,
2283 "transport-udp", 2283 "nat",
2284 "INTERNAL_ADDRESS", 2284 "INTERNAL_ADDRESS",
2285 &internal_address))) 2285 &internal_address)))
2286 { 2286 {
2287 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 2287 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
2288 _("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"), 2288 _("Require INTERNAL_ADDRESS for service `%s' in configuration!\n"),
2289 "transport-udp"); 2289 "transport-udp");
2290 GNUNET_free_non_null(external_address); 2290 GNUNET_free_non_null(external_address);
2291 return NULL; 2291 return NULL;
2292 } 2292 }
@@ -2325,8 +2325,8 @@ libgnunet_plugin_transport_udp_init (void *cls)
2325 "transport-udp", "USE_LOCALADDR")) 2325 "transport-udp", "USE_LOCALADDR"))
2326 { 2326 {
2327 use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg, 2327 use_localaddresses = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
2328 "transport-udp", 2328 "transport-udp",
2329 "USE_LOCALADDR"); 2329 "USE_LOCALADDR");
2330 } 2330 }
2331 2331
2332 plugin = GNUNET_malloc (sizeof (struct Plugin)); 2332 plugin = GNUNET_malloc (sizeof (struct Plugin));
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index 0e11af0cb..56c2ebfb8 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -34,16 +34,18 @@ AUTOSTART = NO
34PORT = 4094 34PORT = 4094
35 35
36[transport-tcp] 36[transport-tcp]
37DISABLEV6 = YES
38TIMEOUT = 300000 37TIMEOUT = 300000
39PORT = 4094 38PORT = 4094
39USE_LOCALADDR = YES
40
41[nat]
42DISABLEV6 = YES
40BINDTO = 127.0.0.1 43BINDTO = 127.0.0.1
41ENABLE_UPNP = NO 44ENABLE_UPNP = NO
42BEHIND_NAT = NO 45BEHIND_NAT = NO
43ALLOW_NAT = NO 46ALLOW_NAT = NO
44INTERNAL_ADDRESS = 127.0.0.1 47INTERNAL_ADDRESS = 127.0.0.1
45EXTERNAL_ADDRESS = 127.0.0.1 48EXTERNAL_ADDRESS = 127.0.0.1
46USE_LOCALADDR = YES
47 49
48[transport] 50[transport]
49plugins = tcp 51plugins = tcp
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index d881d29f4..8a68be79c 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -6,16 +6,18 @@ DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
6PORT = 3094 6PORT = 3094
7 7
8[transport-tcp] 8[transport-tcp]
9DISABLEV6 = YES
10TIMEOUT = 300000 9TIMEOUT = 300000
11PORT = 3094 10PORT = 3094
11USE_LOCALADDR = YES
12
13[nat]
14DISABLEV6 = YES
12BINDTO = 127.0.0.1 15BINDTO = 127.0.0.1
13ENABLE_UPNP = NO 16ENABLE_UPNP = NO
14BEHIND_NAT = NO 17BEHIND_NAT = NO
15ALLOW_NAT = NO 18ALLOW_NAT = NO
16INTERNAL_ADDRESS = 127.0.0.1 19INTERNAL_ADDRESS = 127.0.0.1
17EXTERNAL_ADDRESS = 127.0.0.1 20EXTERNAL_ADDRESS = 127.0.0.1
18USE_LOCALADDR = YES
19 21
20[fs] 22[fs]
21AUTOSTART = NO 23AUTOSTART = NO
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index cbfd67587..106ffc4cd 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,13 +1,15 @@
1[transport-tcp] 1[transport-tcp]
2DISABLEV6 = YES
3PORT = 30001 2PORT = 30001
4BINDTO = 127.0.0.1 3BINDTO = 127.0.0.1
4USE_LOCALADDR = YES
5
6[nat]
7DISABLEV6 = YES
5BEHIND_NAT = NO 8BEHIND_NAT = NO
6ALLOW_NAT = NO 9ALLOW_NAT = NO
7ENABLE_UPNP = NO 10ENABLE_UPNP = NO
8INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
9EXTERNAL_ADDRESS = 127.0.0.1 12EXTERNAL_ADDRESS = 127.0.0.1
10USE_LOCALADDR = YES
11 13
12[transport-udp] 14[transport-udp]
13PORT = 30001 15PORT = 30001
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index df7a06b24..0453b4929 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,13 +1,15 @@
1[transport-tcp] 1[transport-tcp]
2DISABLEV6 = YES
3PORT = 40001 2PORT = 40001
3USE_LOCALADDR = YES
4
5[nat]
4BINDTO = 127.0.0.1 6BINDTO = 127.0.0.1
7DISABLEV6 = YES
5BEHIND_NAT = NO 8BEHIND_NAT = NO
6ALLOW_NAT = NO 9ALLOW_NAT = NO
7ENABLE_UPNP = NO 10ENABLE_UPNP = NO
8EXTERNAL_ADDRESS = 127.0.0.1 11EXTERNAL_ADDRESS = 127.0.0.1
9INTERNAL_ADDRESS = 127.0.0.1 12INTERNAL_ADDRESS = 127.0.0.1
10USE_LOCALADDR = YES
11 13
12[transport-udp] 14[transport-udp]
13PORT = 40002 15PORT = 40002
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 168a8b115..8856ec1da 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,13 +1,15 @@
1[transport-tcp] 1[transport-tcp]
2DISABLEV6 = YES
3PORT = 12368 2PORT = 12368
3USE_LOCALADDR = YES
4
5[nat]
6DISABLEV6 = YES
4BINDTO = 127.0.0.1 7BINDTO = 127.0.0.1
5BEHIND_NAT = YES 8BEHIND_NAT = YES
6ENABLE_NAT_SERVER = YES 9ENABLE_NAT_SERVER = YES
7#NAT_PUNCHED = YES 10#NAT_PUNCHED = YES
8INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
9EXTERNAL_ADDRESS = 127.0.0.1 12EXTERNAL_ADDRESS = 127.0.0.1
10USE_LOCALADDR = YES
11 13
12[fs] 14[fs]
13AUTOSTART = NO 15AUTOSTART = NO
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index 2f3ccbe4c..cd5aae000 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,12 +1,14 @@
1[transport-tcp] 1[transport-tcp]
2DISABLEV6 = YES
3PORT = 23000 2PORT = 23000
3USE_LOCALADDR = YES
4
5[nat]
4BINDTO = 127.0.0.1 6BINDTO = 127.0.0.1
7DISABLEV6 = YES
5BEHIND_NAT = NO 8BEHIND_NAT = NO
6ENABLE_NAT_CLIENT = YES 9ENABLE_NAT_CLIENT = YES
7EXTERNAL_ADDRESS = 127.0.0.1 10EXTERNAL_ADDRESS = 127.0.0.1
8INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
9USE_LOCALADDR = YES
10 12
11[core] 13[core]
12AUTOSTART = NO 14AUTOSTART = NO
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 6f6945fec..a808df104 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,13 +1,15 @@
1[transport-tcp] 1[transport-tcp]
2DISABLEV6 = YES 2USE_LOCALADDR = YES
3PORT = 12368 3PORT = 12368
4
5[nat]
6DISABLEV6 = YES
4BINDTO = 127.0.0.1 7BINDTO = 127.0.0.1
5BEHIND_NAT = NO 8BEHIND_NAT = NO
6#ALLOW_NAT = NO 9#ALLOW_NAT = NO
7ENABLE_UPNP = NO 10ENABLE_UPNP = NO
8INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
9EXTERNAL_ADDRESS = 127.0.0.1 12EXTERNAL_ADDRESS = 127.0.0.1
10USE_LOCALADDR = YES
11 13
12[fs] 14[fs]
13AUTOSTART = NO 15AUTOSTART = NO
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 7636af666..b663bb0f2 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -1,13 +1,15 @@
1[transport-tcp] 1[transport-tcp]
2DISABLEV6 = YES
3PORT = 0 2PORT = 0
3USE_LOCALADDR = YES
4
5[nat]
6DISABLEV6 = YES
4BINDTO = 127.0.0.1 7BINDTO = 127.0.0.1
5BEHIND_NAT = NO 8BEHIND_NAT = NO
6#ALLOW_NAT = NO 9#ALLOW_NAT = NO
7ENABLE_UPNP = NO 10ENABLE_UPNP = NO
8EXTERNAL_ADDRESS = 127.0.0.1 11EXTERNAL_ADDRESS = 127.0.0.1
9INTERNAL_ADDRESS = 127.0.0.1 12INTERNAL_ADDRESS = 127.0.0.1
10USE_LOCALADDR = YES
11 13
12[core] 14[core]
13AUTOSTART = NO 15AUTOSTART = NO
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index d65f9ca6d..ca2ee63ad 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,12 +1,14 @@
1[transport-udp] 1[transport-udp]
2PORT = 12368 2PORT = 12368
3USE_LOCALADDR = YES
4
5[nat]
3BEHIND_NAT = YES 6BEHIND_NAT = YES
4BINDTO = 127.0.0.1 7BINDTO = 127.0.0.1
5ALLOW_NAT = NO 8ALLOW_NAT = NO
6ONLY_NAT_ADDRESSES = YES 9ONLY_NAT_ADDRESSES = YES
7INTERNAL_ADDRESS = 127.0.0.1 10INTERNAL_ADDRESS = 127.0.0.1
8EXTERNAL_ADDRESS = 127.0.0.1 11EXTERNAL_ADDRESS = 127.0.0.1
9USE_LOCALADDR = YES
10 12
11[fs] 13[fs]
12AUTOSTART = NO 14AUTOSTART = NO
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index 26510b510..d702dc46d 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,11 +1,13 @@
1[transport-udp] 1[transport-udp]
2PORT = 22368 2PORT = 22368
3USE_LOCALADDR = YES
4
5[nat]
3BINDTO = 127.0.0.1 6BINDTO = 127.0.0.1
4BEHIND_NAT = NO 7BEHIND_NAT = NO
5ALLOW_NAT = YES 8ALLOW_NAT = YES
6EXTERNAL_ADDRESS = 127.0.0.1 9EXTERNAL_ADDRESS = 127.0.0.1
7INTERNAL_ADDRESS = 127.0.0.1 10INTERNAL_ADDRESS = 127.0.0.1
8USE_LOCALADDR = YES
9 11
10[fs] 12[fs]
11AUTOSTART = NO 13AUTOSTART = NO
diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf
index be57dcda9..b85b09173 100644
--- a/src/transport/test_transport_ats_1addr.conf
+++ b/src/transport/test_transport_ats_1addr.conf
@@ -29,8 +29,8 @@ DEFAULTSERVICES = core
29[statistics] 29[statistics]
30PORT = 2567 30PORT = 2567
31 31
32[transport-tcp] 32
33#DEBUG=YES 33[nat]
34DISABLEV6 = YES 34DISABLEV6 = YES
35BINDTO = 127.0.0.1 35BINDTO = 127.0.0.1
36BEHIND_NAT = NO 36BEHIND_NAT = NO
diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
index 36575e31b..9ec447c8a 100644
--- a/src/transport/test_transport_ats_2addr.conf
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -30,10 +30,9 @@ DEFAULTSERVICES = core
30PORT = 2567 30PORT = 2567
31 31
32[transport-tcp] 32[transport-tcp]
33#DEBUG=YES
34DISABLEV4 = YES
35USE_LOCALADDR = YES 33USE_LOCALADDR = YES
36 34
35[nat]
37BINDTO = 127.0.0.1 36BINDTO = 127.0.0.1
38#BEHIND_NAT = NO 37#BEHIND_NAT = NO
39#ALLOW_NAT = NO 38#ALLOW_NAT = NO
diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf
index e96ac3c7c..31456a029 100644
--- a/src/transport/test_transport_ats_4addr.conf
+++ b/src/transport/test_transport_ats_4addr.conf
@@ -33,7 +33,9 @@ DEFAULTSERVICES = core
33PORT = 2567 33PORT = 2567
34 34
35[transport-tcp] 35[transport-tcp]
36#DEBUG=YES 36USE_LOCALADDR = YES
37
38[nat]
37DISABLEV6 = YES 39DISABLEV6 = YES
38BINDTO = 127.0.0.1 40BINDTO = 127.0.0.1
39BEHIND_NAT = NO 41BEHIND_NAT = NO
@@ -41,7 +43,6 @@ ALLOW_NAT = NO
41ENABLE_UPNP = NO 43ENABLE_UPNP = NO
42EXTERNAL_ADDRESS = 127.0.0.1 44EXTERNAL_ADDRESS = 127.0.0.1
43INTERNAL_ADDRESS = 127.0.0.1 45INTERNAL_ADDRESS = 127.0.0.1
44USE_LOCALADDR = YES
45 46
46[transport-unix] 47[transport-unix]
47PORT = 2572 48PORT = 2572