From e14d7c71e389cb3e86a5df73d1481ba2cff05d62 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Wed, 18 May 2011 15:14:50 +0000 Subject: changed confs --- src/transport/test_plugin_transport_data_http.conf | 3 +++ src/transport/test_quota_compliance_data.conf | 1 + src/transport/test_quota_compliance_http_peer1.conf | 1 + src/transport/test_quota_compliance_http_peer2.conf | 1 + src/transport/test_quota_compliance_https_peer1.conf | 2 +- src/transport/test_quota_compliance_https_peer2.conf | 1 + src/transport/test_quota_compliance_tcp_peer1.conf | 1 + src/transport/test_quota_compliance_tcp_peer2.conf | 1 + src/transport/test_quota_compliance_udp_peer1.conf | 2 +- src/transport/test_quota_compliance_udp_peer2.conf | 1 + src/transport/test_transport_api_http_peer1.conf | 1 + src/transport/test_transport_api_http_peer2.conf | 1 + src/transport/test_transport_api_https_peer1.conf | 1 + src/transport/test_transport_api_https_peer2.conf | 1 + src/transport/test_transport_api_multi_peer1.conf | 4 ++++ src/transport/test_transport_api_multi_peer2.conf | 4 ++++ src/transport/test_transport_api_rel_http_peer1.conf | 1 + src/transport/test_transport_api_rel_http_peer2.conf | 1 + src/transport/test_transport_api_rel_https_peer1.conf | 2 ++ src/transport/test_transport_api_rel_https_peer2.conf | 2 ++ src/transport/test_transport_api_tcp_nat_peer1.conf | 1 + src/transport/test_transport_api_tcp_nat_peer2.conf | 1 + src/transport/test_transport_api_tcp_peer1.conf | 1 + src/transport/test_transport_api_tcp_peer2.conf | 1 + src/transport/test_transport_api_udp_nat_peer1.conf | 1 + src/transport/test_transport_api_udp_nat_peer2.conf | 1 + src/transport/test_transport_api_udp_peer1.conf | 1 + src/transport/test_transport_api_udp_peer2.conf | 1 + src/transport/test_transport_ats_1addr.conf | 1 + src/transport/test_transport_ats_2addr.conf | 2 ++ src/transport/test_transport_ats_4addr.conf | 2 ++ 31 files changed, 43 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf index c3261f60c..bd5f71b29 100644 --- a/src/transport/test_plugin_transport_data_http.conf +++ b/src/transport/test_plugin_transport_data_http.conf @@ -13,6 +13,8 @@ DEBUG = YES USE_IPv6 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +#USE_LOCALADDR = YES + [transport-https] PORT = 12389 @@ -27,6 +29,7 @@ CERT_FILE = https_cert.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE +#USE_LOCALADDR = YES [transport] PREFIX = valgrind --leak-check=full diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf index cc9316534..d3538e45a 100644 --- a/src/transport/test_quota_compliance_data.conf +++ b/src/transport/test_quota_compliance_data.conf @@ -16,6 +16,7 @@ PORT = 2367 [transport-tcp] PORT = 2368 +USE_LOCALADDR = YES [peerinfo] PORT = 2369 diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index c645d3916..b05fdab1a 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf @@ -37,6 +37,7 @@ USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport] PORT = 4011 diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 0dd81dd92..2f9637ecc 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf @@ -9,6 +9,7 @@ USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 1eb9c0df1..a34629e99 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf @@ -42,7 +42,7 @@ CERT_FILE = https_cert_quota_p1.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE - +USE_LOCALADDR = YES [transport] PORT = 4002 diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index 692004b0f..095f828f9 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf @@ -14,6 +14,7 @@ CERT_FILE = https_cert_qutoa_p2.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index 767423483..0e11af0cb 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf @@ -43,6 +43,7 @@ BEHIND_NAT = NO ALLOW_NAT = NO INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [transport] plugins = tcp diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 19b531f51..d881d29f4 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf @@ -15,6 +15,7 @@ BEHIND_NAT = NO ALLOW_NAT = NO INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index 8d8bfce0e..8bc8110c5 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf @@ -32,7 +32,7 @@ AUTOSTART = NO [transport-udp] PORT = 4368 - +USE_LOCALADDR = YES [transport] plugins = udp diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index 1a2fb3844..de71791cd 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf @@ -4,6 +4,7 @@ DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf [transport-udp] PORT = 3368 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 4f66c1138..b888ebdc2 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -5,6 +5,7 @@ USE_IPv6 = YES USE_IPv4 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 42389 diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 39096dfa6..f2d1cafc2 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -5,6 +5,7 @@ USE_IPv6 = YES USE_IPv4 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 42388 diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index f2bb24374..a5872390a 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf @@ -18,6 +18,7 @@ CERT_FILE = https_cert_p1.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index 442746c4b..e790a8d84 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf @@ -18,6 +18,7 @@ CERT_FILE = https_cert_p2.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 595284fa6..0f5ee4ba7 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf @@ -7,9 +7,11 @@ ALLOW_NAT = NO ENABLE_UPNP = NO INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [transport-udp] PORT = 30001 +USE_LOCALADDR = YES [transport-http] PORT = 30002 @@ -18,6 +20,7 @@ USE_IPv6 = YES USE_IPv4 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 30003 @@ -26,6 +29,7 @@ USE_IPv6 = YES USE_IPv4 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-unix] PORT = 30004 diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 99ab5f8d5..17e73194c 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf @@ -7,9 +7,11 @@ ALLOW_NAT = NO ENABLE_UPNP = NO EXTERNAL_ADDRESS = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [transport-udp] PORT = 40002 +USE_LOCALADDR = YES [transport-http] PORT = 40003 @@ -18,6 +20,7 @@ USE_IPv6 = YES USE_IPv4 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 40004 @@ -26,6 +29,7 @@ USE_IPv6 = YES USE_IPv4 = YES #BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-unix] PORT = 40005 diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf index f7a6e8e5f..bb258fe0b 100644 --- a/src/transport/test_transport_api_rel_http_peer1.conf +++ b/src/transport/test_transport_api_rel_http_peer1.conf @@ -5,6 +5,7 @@ USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 42389 diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf index b8a6871ac..2e13f657b 100644 --- a/src/transport/test_transport_api_rel_http_peer2.conf +++ b/src/transport/test_transport_api_rel_http_peer2.conf @@ -5,6 +5,7 @@ USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 42389 diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf index 970bdd994..9da64e114 100644 --- a/src/transport/test_transport_api_rel_https_peer1.conf +++ b/src/transport/test_transport_api_rel_https_peer1.conf @@ -5,6 +5,7 @@ USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 15001 @@ -18,6 +19,7 @@ CERT_FILE = https_cert_p1.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf index 9df2d0b53..16b51951e 100644 --- a/src/transport/test_transport_api_rel_https_peer2.conf +++ b/src/transport/test_transport_api_rel_https_peer2.conf @@ -5,6 +5,7 @@ USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 #BINDTO6 = ::1 +USE_LOCALADDR = YES [transport-https] PORT = 16001 @@ -18,6 +19,7 @@ CERT_FILE = https_cert_p2.crt CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL #CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL #CRYPTO_INIT = PERFORMANCE +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 4988ea34f..168a8b115 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf @@ -7,6 +7,7 @@ ENABLE_NAT_SERVER = YES #NAT_PUNCHED = YES INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [fs] 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 b503d2873..2f3ccbe4c 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf @@ -6,6 +6,7 @@ BEHIND_NAT = NO ENABLE_NAT_CLIENT = YES EXTERNAL_ADDRESS = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [core] AUTOSTART = NO diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 496de1af0..6f6945fec 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -7,6 +7,7 @@ BEHIND_NAT = NO ENABLE_UPNP = NO INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 8fdf53c2a..7636af666 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -7,6 +7,7 @@ BEHIND_NAT = NO ENABLE_UPNP = NO EXTERNAL_ADDRESS = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [core] 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 0188b970f..d65f9ca6d 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf @@ -6,6 +6,7 @@ ALLOW_NAT = NO ONLY_NAT_ADDRESSES = YES INTERNAL_ADDRESS = 127.0.0.1 EXTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [fs] 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 65e8b1d67..26510b510 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf @@ -5,6 +5,7 @@ BEHIND_NAT = NO ALLOW_NAT = YES EXTERNAL_ADDRESS = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index 2742525b5..1df66ebd1 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -1,5 +1,6 @@ [transport-udp] PORT = 12368 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index dfdec745e..493354963 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -1,5 +1,6 @@ [transport-udp] PORT = 22368 +USE_LOCALADDR = YES [fs] AUTOSTART = NO diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf index 076e36947..be57dcda9 100644 --- a/src/transport/test_transport_ats_1addr.conf +++ b/src/transport/test_transport_ats_1addr.conf @@ -45,6 +45,7 @@ PORT = 2572 [transport-udp] PORT = 2571 +USE_LOCALADDR = YES [peerinfo] PORT = 2569 diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf index 440e57447..36575e31b 100644 --- a/src/transport/test_transport_ats_2addr.conf +++ b/src/transport/test_transport_ats_2addr.conf @@ -32,6 +32,7 @@ PORT = 2567 [transport-tcp] #DEBUG=YES DISABLEV4 = YES +USE_LOCALADDR = YES BINDTO = 127.0.0.1 #BEHIND_NAT = NO @@ -46,6 +47,7 @@ PORT = 2572 [transport-udp] PORT = 2571 +USE_LOCALADDR = YES [peerinfo] PORT = 2569 diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf index aaa23a515..e96ac3c7c 100644 --- a/src/transport/test_transport_ats_4addr.conf +++ b/src/transport/test_transport_ats_4addr.conf @@ -41,6 +41,7 @@ ALLOW_NAT = NO ENABLE_UPNP = NO EXTERNAL_ADDRESS = 127.0.0.1 INTERNAL_ADDRESS = 127.0.0.1 +USE_LOCALADDR = YES [transport-unix] PORT = 2572 @@ -48,6 +49,7 @@ PORT = 2572 [transport-udp] PORT = 2571 +USE_LOCALADDR = YES [peerinfo] PORT = 2569 -- cgit v1.2.3