diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-06-09 13:13:05 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-06-09 13:13:05 +0000 |
commit | 39de47ee0338e636c0172236e4021ef491bff4e1 (patch) | |
tree | 61fe6cf46cd17a1334a2f926733a22f38257a9fb /src/transport | |
parent | 6f984f1d1915498a7d8b9cbae13a593c976b5f6e (diff) | |
download | gnunet-39de47ee0338e636c0172236e4021ef491bff4e1.tar.gz gnunet-39de47ee0338e636c0172236e4021ef491bff4e1.zip |
moving NAT options into their own section
Diffstat (limited to 'src/transport')
-rw-r--r-- | src/transport/plugin_transport_tcp.c | 35 | ||||
-rw-r--r-- | src/transport/plugin_transport_udp.c | 26 | ||||
-rw-r--r-- | src/transport/test_quota_compliance_tcp_peer1.conf | 6 | ||||
-rw-r--r-- | src/transport/test_quota_compliance_tcp_peer2.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_multi_peer1.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_multi_peer2.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_nat_peer1.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_nat_peer2.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_peer1.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_tcp_peer2.conf | 6 | ||||
-rw-r--r-- | src/transport/test_transport_api_udp_nat_peer1.conf | 4 | ||||
-rw-r--r-- | src/transport/test_transport_api_udp_nat_peer2.conf | 4 | ||||
-rw-r--r-- | src/transport/test_transport_ats_1addr.conf | 4 | ||||
-rw-r--r-- | src/transport/test_transport_ats_2addr.conf | 3 | ||||
-rw-r--r-- | src/transport/test_transport_ats_4addr.conf | 5 |
15 files changed, 73 insertions, 56 deletions
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 | |||
34 | PORT = 4094 | 34 | PORT = 4094 |
35 | 35 | ||
36 | [transport-tcp] | 36 | [transport-tcp] |
37 | DISABLEV6 = YES | ||
38 | TIMEOUT = 300000 | 37 | TIMEOUT = 300000 |
39 | PORT = 4094 | 38 | PORT = 4094 |
39 | USE_LOCALADDR = YES | ||
40 | |||
41 | [nat] | ||
42 | DISABLEV6 = YES | ||
40 | BINDTO = 127.0.0.1 | 43 | BINDTO = 127.0.0.1 |
41 | ENABLE_UPNP = NO | 44 | ENABLE_UPNP = NO |
42 | BEHIND_NAT = NO | 45 | BEHIND_NAT = NO |
43 | ALLOW_NAT = NO | 46 | ALLOW_NAT = NO |
44 | INTERNAL_ADDRESS = 127.0.0.1 | 47 | INTERNAL_ADDRESS = 127.0.0.1 |
45 | EXTERNAL_ADDRESS = 127.0.0.1 | 48 | EXTERNAL_ADDRESS = 127.0.0.1 |
46 | USE_LOCALADDR = YES | ||
47 | 49 | ||
48 | [transport] | 50 | [transport] |
49 | plugins = tcp | 51 | plugins = 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 | |||
6 | PORT = 3094 | 6 | PORT = 3094 |
7 | 7 | ||
8 | [transport-tcp] | 8 | [transport-tcp] |
9 | DISABLEV6 = YES | ||
10 | TIMEOUT = 300000 | 9 | TIMEOUT = 300000 |
11 | PORT = 3094 | 10 | PORT = 3094 |
11 | USE_LOCALADDR = YES | ||
12 | |||
13 | [nat] | ||
14 | DISABLEV6 = YES | ||
12 | BINDTO = 127.0.0.1 | 15 | BINDTO = 127.0.0.1 |
13 | ENABLE_UPNP = NO | 16 | ENABLE_UPNP = NO |
14 | BEHIND_NAT = NO | 17 | BEHIND_NAT = NO |
15 | ALLOW_NAT = NO | 18 | ALLOW_NAT = NO |
16 | INTERNAL_ADDRESS = 127.0.0.1 | 19 | INTERNAL_ADDRESS = 127.0.0.1 |
17 | EXTERNAL_ADDRESS = 127.0.0.1 | 20 | EXTERNAL_ADDRESS = 127.0.0.1 |
18 | USE_LOCALADDR = YES | ||
19 | 21 | ||
20 | [fs] | 22 | [fs] |
21 | AUTOSTART = NO | 23 | AUTOSTART = 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] |
2 | DISABLEV6 = YES | ||
3 | PORT = 30001 | 2 | PORT = 30001 |
4 | BINDTO = 127.0.0.1 | 3 | BINDTO = 127.0.0.1 |
4 | USE_LOCALADDR = YES | ||
5 | |||
6 | [nat] | ||
7 | DISABLEV6 = YES | ||
5 | BEHIND_NAT = NO | 8 | BEHIND_NAT = NO |
6 | ALLOW_NAT = NO | 9 | ALLOW_NAT = NO |
7 | ENABLE_UPNP = NO | 10 | ENABLE_UPNP = NO |
8 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
9 | EXTERNAL_ADDRESS = 127.0.0.1 | 12 | EXTERNAL_ADDRESS = 127.0.0.1 |
10 | USE_LOCALADDR = YES | ||
11 | 13 | ||
12 | [transport-udp] | 14 | [transport-udp] |
13 | PORT = 30001 | 15 | PORT = 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] |
2 | DISABLEV6 = YES | ||
3 | PORT = 40001 | 2 | PORT = 40001 |
3 | USE_LOCALADDR = YES | ||
4 | |||
5 | [nat] | ||
4 | BINDTO = 127.0.0.1 | 6 | BINDTO = 127.0.0.1 |
7 | DISABLEV6 = YES | ||
5 | BEHIND_NAT = NO | 8 | BEHIND_NAT = NO |
6 | ALLOW_NAT = NO | 9 | ALLOW_NAT = NO |
7 | ENABLE_UPNP = NO | 10 | ENABLE_UPNP = NO |
8 | EXTERNAL_ADDRESS = 127.0.0.1 | 11 | EXTERNAL_ADDRESS = 127.0.0.1 |
9 | INTERNAL_ADDRESS = 127.0.0.1 | 12 | INTERNAL_ADDRESS = 127.0.0.1 |
10 | USE_LOCALADDR = YES | ||
11 | 13 | ||
12 | [transport-udp] | 14 | [transport-udp] |
13 | PORT = 40002 | 15 | PORT = 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] |
2 | DISABLEV6 = YES | ||
3 | PORT = 12368 | 2 | PORT = 12368 |
3 | USE_LOCALADDR = YES | ||
4 | |||
5 | [nat] | ||
6 | DISABLEV6 = YES | ||
4 | BINDTO = 127.0.0.1 | 7 | BINDTO = 127.0.0.1 |
5 | BEHIND_NAT = YES | 8 | BEHIND_NAT = YES |
6 | ENABLE_NAT_SERVER = YES | 9 | ENABLE_NAT_SERVER = YES |
7 | #NAT_PUNCHED = YES | 10 | #NAT_PUNCHED = YES |
8 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
9 | EXTERNAL_ADDRESS = 127.0.0.1 | 12 | EXTERNAL_ADDRESS = 127.0.0.1 |
10 | USE_LOCALADDR = YES | ||
11 | 13 | ||
12 | [fs] | 14 | [fs] |
13 | AUTOSTART = NO | 15 | AUTOSTART = 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] |
2 | DISABLEV6 = YES | ||
3 | PORT = 23000 | 2 | PORT = 23000 |
3 | USE_LOCALADDR = YES | ||
4 | |||
5 | [nat] | ||
4 | BINDTO = 127.0.0.1 | 6 | BINDTO = 127.0.0.1 |
7 | DISABLEV6 = YES | ||
5 | BEHIND_NAT = NO | 8 | BEHIND_NAT = NO |
6 | ENABLE_NAT_CLIENT = YES | 9 | ENABLE_NAT_CLIENT = YES |
7 | EXTERNAL_ADDRESS = 127.0.0.1 | 10 | EXTERNAL_ADDRESS = 127.0.0.1 |
8 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
9 | USE_LOCALADDR = YES | ||
10 | 12 | ||
11 | [core] | 13 | [core] |
12 | AUTOSTART = NO | 14 | AUTOSTART = 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] |
2 | DISABLEV6 = YES | 2 | USE_LOCALADDR = YES |
3 | PORT = 12368 | 3 | PORT = 12368 |
4 | |||
5 | [nat] | ||
6 | DISABLEV6 = YES | ||
4 | BINDTO = 127.0.0.1 | 7 | BINDTO = 127.0.0.1 |
5 | BEHIND_NAT = NO | 8 | BEHIND_NAT = NO |
6 | #ALLOW_NAT = NO | 9 | #ALLOW_NAT = NO |
7 | ENABLE_UPNP = NO | 10 | ENABLE_UPNP = NO |
8 | INTERNAL_ADDRESS = 127.0.0.1 | 11 | INTERNAL_ADDRESS = 127.0.0.1 |
9 | EXTERNAL_ADDRESS = 127.0.0.1 | 12 | EXTERNAL_ADDRESS = 127.0.0.1 |
10 | USE_LOCALADDR = YES | ||
11 | 13 | ||
12 | [fs] | 14 | [fs] |
13 | AUTOSTART = NO | 15 | AUTOSTART = 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] |
2 | DISABLEV6 = YES | ||
3 | PORT = 0 | 2 | PORT = 0 |
3 | USE_LOCALADDR = YES | ||
4 | |||
5 | [nat] | ||
6 | DISABLEV6 = YES | ||
4 | BINDTO = 127.0.0.1 | 7 | BINDTO = 127.0.0.1 |
5 | BEHIND_NAT = NO | 8 | BEHIND_NAT = NO |
6 | #ALLOW_NAT = NO | 9 | #ALLOW_NAT = NO |
7 | ENABLE_UPNP = NO | 10 | ENABLE_UPNP = NO |
8 | EXTERNAL_ADDRESS = 127.0.0.1 | 11 | EXTERNAL_ADDRESS = 127.0.0.1 |
9 | INTERNAL_ADDRESS = 127.0.0.1 | 12 | INTERNAL_ADDRESS = 127.0.0.1 |
10 | USE_LOCALADDR = YES | ||
11 | 13 | ||
12 | [core] | 14 | [core] |
13 | AUTOSTART = NO | 15 | AUTOSTART = 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] |
2 | PORT = 12368 | 2 | PORT = 12368 |
3 | USE_LOCALADDR = YES | ||
4 | |||
5 | [nat] | ||
3 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
4 | BINDTO = 127.0.0.1 | 7 | BINDTO = 127.0.0.1 |
5 | ALLOW_NAT = NO | 8 | ALLOW_NAT = NO |
6 | ONLY_NAT_ADDRESSES = YES | 9 | ONLY_NAT_ADDRESSES = YES |
7 | INTERNAL_ADDRESS = 127.0.0.1 | 10 | INTERNAL_ADDRESS = 127.0.0.1 |
8 | EXTERNAL_ADDRESS = 127.0.0.1 | 11 | EXTERNAL_ADDRESS = 127.0.0.1 |
9 | USE_LOCALADDR = YES | ||
10 | 12 | ||
11 | [fs] | 13 | [fs] |
12 | AUTOSTART = NO | 14 | AUTOSTART = 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] |
2 | PORT = 22368 | 2 | PORT = 22368 |
3 | USE_LOCALADDR = YES | ||
4 | |||
5 | [nat] | ||
3 | BINDTO = 127.0.0.1 | 6 | BINDTO = 127.0.0.1 |
4 | BEHIND_NAT = NO | 7 | BEHIND_NAT = NO |
5 | ALLOW_NAT = YES | 8 | ALLOW_NAT = YES |
6 | EXTERNAL_ADDRESS = 127.0.0.1 | 9 | EXTERNAL_ADDRESS = 127.0.0.1 |
7 | INTERNAL_ADDRESS = 127.0.0.1 | 10 | INTERNAL_ADDRESS = 127.0.0.1 |
8 | USE_LOCALADDR = YES | ||
9 | 11 | ||
10 | [fs] | 12 | [fs] |
11 | AUTOSTART = NO | 13 | AUTOSTART = 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] |
30 | PORT = 2567 | 30 | PORT = 2567 |
31 | 31 | ||
32 | [transport-tcp] | 32 | |
33 | #DEBUG=YES | 33 | [nat] |
34 | DISABLEV6 = YES | 34 | DISABLEV6 = YES |
35 | BINDTO = 127.0.0.1 | 35 | BINDTO = 127.0.0.1 |
36 | BEHIND_NAT = NO | 36 | BEHIND_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 | |||
30 | PORT = 2567 | 30 | PORT = 2567 |
31 | 31 | ||
32 | [transport-tcp] | 32 | [transport-tcp] |
33 | #DEBUG=YES | ||
34 | DISABLEV4 = YES | ||
35 | USE_LOCALADDR = YES | 33 | USE_LOCALADDR = YES |
36 | 34 | ||
35 | [nat] | ||
37 | BINDTO = 127.0.0.1 | 36 | BINDTO = 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 | |||
33 | PORT = 2567 | 33 | PORT = 2567 |
34 | 34 | ||
35 | [transport-tcp] | 35 | [transport-tcp] |
36 | #DEBUG=YES | 36 | USE_LOCALADDR = YES |
37 | |||
38 | [nat] | ||
37 | DISABLEV6 = YES | 39 | DISABLEV6 = YES |
38 | BINDTO = 127.0.0.1 | 40 | BINDTO = 127.0.0.1 |
39 | BEHIND_NAT = NO | 41 | BEHIND_NAT = NO |
@@ -41,7 +43,6 @@ ALLOW_NAT = NO | |||
41 | ENABLE_UPNP = NO | 43 | ENABLE_UPNP = NO |
42 | EXTERNAL_ADDRESS = 127.0.0.1 | 44 | EXTERNAL_ADDRESS = 127.0.0.1 |
43 | INTERNAL_ADDRESS = 127.0.0.1 | 45 | INTERNAL_ADDRESS = 127.0.0.1 |
44 | USE_LOCALADDR = YES | ||
45 | 46 | ||
46 | [transport-unix] | 47 | [transport-unix] |
47 | PORT = 2572 | 48 | PORT = 2572 |