clreaning up conf files

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 62be281abb93710a5d427d52ee4f2dbbcbda8064..14a58f264047aa1bfbdfbc368a81fa87082f4889 100644 (file)
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -492,10 +492,11 @@ client_connect (struct Session *s)
   CURLMcode mret;
 
 #if VERBOSE_CLIENT
+#endif
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                    "Initiating outbound session peer `%s'\n",
                    GNUNET_i2s (&s->target));
-#endif
+
 
   s->inbound = GNUNET_NO;
 
@@ -506,8 +507,9 @@ client_connect (struct Session *s)
                    GNUNET_h2s_full (&plugin->env->my_identity->hashPubKey),
                    plugin->last_tag);
 #if 0
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, "URL `%s'\n", url);
 #endif
+  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, "URL `%s'\n", url);
+  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name, "ADDRESS `%s'\n", http_plugin_address_to_string (plugin, s->addr, s->addrlen));
   /* create get connection */
   s->client_get = curl_easy_init ();
 #if VERBOSE_CURL

diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index fc0c9f3d43a6ec6f63ef1aef4dc8513d27b8fc0d..8a7158e03807db4223027f699093ef24c4da230d 100644 (file)
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -642,6 +642,12 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
   /* Check if both directions are connected */
   if ((sc->session->server_recv == NULL) || (sc->session->server_send == NULL))
   {
+#if VERBOSE_SERVER
+      GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                       "Server: Delayed read from `%s' `%s' since not both semi-connections are connected\n",
+                       GNUNET_i2s (&s->target),
+                       http_plugin_address_to_string (NULL, s->addr, s->addrlen));
+#endif
     return MHD_YES;
   }
 

diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index b76613513ac44cb599f698db2188d5f9a9ae6705..fbb4f7c4f10b5175081d81937265f27fb447b575 100644 (file)
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test-transport/api-tcp-p1/
 DEFAULTCONFIG = template_cfg_peer1.conf
 
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+DISABLEV6 = NO
+
 [transport-tcp]
 PORT = 12000
 TIMEOUT = 5000
@@ -32,6 +36,3 @@ UNIXPATH = /tmp/gnunet-p1-service-transport.sock
 #DEBUG = YES
 PORT = 12006
 UNIXPATH = /tmp/gnunet-p1-service-ats.sock
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
\ No newline at end of file

diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index 0c1f89cc272f3f3c18f958e7684de7b3eb1a9ee7..7249fc4cceaac06739e4b880710b2867ddf23e92 100644 (file)
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -3,6 +3,10 @@
 SERVICEHOME = /tmp/test-transport/api-tcp-p2/
 DEFAULTCONFIG = template_cfg_peer2.conf
 
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+DISABLEV6 = NO
+
 [transport-tcp]
 PORT = 12100
 TIMEOUT = 5000
@@ -33,6 +37,3 @@ UNIXPATH = /tmp/gnunet-p2-service-transport.sock
 #DEBUG = YES
 PORT = 12016
 UNIXPATH = /tmp/gnunet-p2-service-ats.sock
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
\ No newline at end of file

diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
deleted file mode 100644 (file)
index e3982a1..0000000
--- a/src/transport/test_plugin_transport_data_http.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-@INLINE@ test_transport_defaults.conf
-[PATHS]
-SERVICEHOME = /tmp/test-transport/plugin_http/
-DEFAULTCONFIG = test_plugin_transport_data_http.conf
-
-[transport-tcp]
-TIMEOUT = 5000
-
-[transport-http]
-PORT = 12320
-DEBUG = YES
-USE_IPv6 = YES
-
-[transport-https]
-PORT = 12321
-CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
-KEY_FILE = https_key.key
-CERT_FILE = https_cert.crt
-DEBUG = YES
-USE_IPv6 = YES
-
-[arm]
-PORT = 12323
-
-[statistics]
-PORT = 12322
-
-

diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
index 872a7536517a23837c0537f797a97687a71af94a..f56b1578a9b09c7ad1711622291a01a53eab2ef6 100644 (file)
--- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
@@ -5,10 +5,6 @@ DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
 
 [transport-http]
 PORT = 4010
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 4015

diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
index 256dc61eb5ba4c9b681e8bc9f3586983ccbfb045..20ef5829f2a110e4b3691187f898efeb006ec6d1 100644 (file)
--- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
@@ -5,10 +5,6 @@ DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
 [transport-http]
 PORT = 3010
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 3015

diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 872a7536517a23837c0537f797a97687a71af94a..f56b1578a9b09c7ad1711622291a01a53eab2ef6 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -5,10 +5,6 @@ DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
 
 [transport-http]
 PORT = 4010
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 4015

diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 256dc61eb5ba4c9b681e8bc9f3586983ccbfb045..20ef5829f2a110e4b3691187f898efeb006ec6d1 100644 (file)
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -5,10 +5,6 @@ DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
 
 [transport-http]
 PORT = 3010
-DEBUG = NO
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 3015

diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
index 5bc5e3a69cc4452860a82b1dcaf268a42faf270f..ad4aab0fd7731a6e3d8704481e12b1144470566b 100644 (file)
--- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
@@ -7,9 +7,6 @@ DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
 PORT = 4001
 KEY_FILE = https_key_quota_p1.key
 CERT_FILE = https_cert_quota_p1.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 4006

diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
index f3f69862fd4f73b5e0ba7541f1ebcc2b0ac63668..94d7412afebb14440f53b303806f4ef3b3ab89b1 100644 (file)
--- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
@@ -7,9 +7,6 @@ DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 PORT = 3001
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 3006

diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 5bc5e3a69cc4452860a82b1dcaf268a42faf270f..ad4aab0fd7731a6e3d8704481e12b1144470566b 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -7,9 +7,6 @@ DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
 PORT = 4001
 KEY_FILE = https_key_quota_p1.key
 CERT_FILE = https_cert_quota_p1.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 4006

diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index f3f69862fd4f73b5e0ba7541f1ebcc2b0ac63668..94d7412afebb14440f53b303806f4ef3b3ab89b1 100644 (file)
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -7,9 +7,6 @@ DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
 PORT = 3001
 KEY_FILE = https_key_quota_p2.key
 CERT_FILE = https_cert_qutoa_p2.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 3006

diff --git a/src/transport/test_transport_api_http_nat_peer1.conf b/src/transport/test_transport_api_http_nat_peer1.conf
index e55d54e55c2a8cec1f4b897d1df55cb55328702b..447508c3685555726f66356ee0b015faf54c1158 100644 (file)
--- a/src/transport/test_transport_api_http_nat_peer1.conf
+++ b/src/transport/test_transport_api_http_nat_peer1.conf
@@ -6,15 +6,9 @@ DEFAULTCONFIG = test_transport_api_http_nat_peer1.conf
 [nat]
 BEHIND_NAT = YES
 ENABLE_NAT_SERVER = YES
-DISABLEV6 = YES
 
 [transport-http]
 PORT = 0
-USE_IPv6 = YES
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
-#BINDTO6 = ::1
 
 [arm]
 PORT = 12085

diff --git a/src/transport/test_transport_api_http_nat_peer2.conf b/src/transport/test_transport_api_http_nat_peer2.conf
index e3f05870da963b097b83ec10044490adaaf2da8d..2f56eabdac292be85472fa2edc3bfa9ee8af0add 100644 (file)
--- a/src/transport/test_transport_api_http_nat_peer2.conf
+++ b/src/transport/test_transport_api_http_nat_peer2.conf
@@ -3,15 +3,8 @@
 SERVICEHOME = /tmp/test-transport/api-http-p2/
 DEFAULTCONFIG = test_transport_api_http_nat_peer2.conf
 
-[nat]
-DISABLEV6 = NO
-
 [transport-http]
 PORT = 12090
-USE_IPv6 = YES
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12095

diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 6d8cfc30e34f1485bb95c4b24ada2e77ffa714d0..26c29699b71962f61b9ca48b265a5baf9738bda8 100644 (file)
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -3,16 +3,8 @@
 SERVICEHOME = /tmp/test-transport/api-http-p1/
 DEFAULTCONFIG = test_transport_api_http_peer1.conf
 
-[nat]
-DISABLEV6 = NO
-
 [transport-http]
 PORT = 12080
-#USE_IPv6 = NO
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
-#BINDTO6 = ::1
 
 [arm]
 PORT = 12085

diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index 78f3a05c5490c24629877b6b8909665285983790..fa7aa3b297d9bb9c0dfdc08ace28a4c8a3b396cb 100644 (file)
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -3,15 +3,8 @@
 SERVICEHOME = /tmp/test-transport/api-http-p2/
 DEFAULTCONFIG = test_transport_api_http_peer2.conf
 
-[nat]
-DISABLEV6 = NO
-
 [transport-http]
 PORT = 12090
-USE_IPv6 = YES
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12095

diff --git a/src/transport/test_transport_api_https_nat_peer1.conf b/src/transport/test_transport_api_https_nat_peer1.conf
index fb0dd82cd773a78e8ec38bc9d3f526226f9ba6f7..e97b473172b1e3424a5d7fad44aade99fc5ab262 100644 (file)
--- a/src/transport/test_transport_api_https_nat_peer1.conf
+++ b/src/transport/test_transport_api_https_nat_peer1.conf
@@ -6,14 +6,11 @@ DEFAULTCONFIG = test_transport_api_https_nat_peer1.conf
 [nat]
 BEHIND_NAT = YES
 ENABLE_NAT_SERVER = YES
-DISABLEV6 = YES
 
 [transport-https]
 PORT = 0
 KEY_FILE = $SERVICEHOME/https_key_p1.key
 CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12105

diff --git a/src/transport/test_transport_api_https_nat_peer2.conf b/src/transport/test_transport_api_https_nat_peer2.conf
index 8f8e6b9c5fec86f9f5d090a8c2a5aea8aff5b2c8..a23f3a5b43b4b9925d80496842fb6b66225d555f 100644 (file)
--- a/src/transport/test_transport_api_https_nat_peer2.conf
+++ b/src/transport/test_transport_api_https_nat_peer2.conf
@@ -7,8 +7,6 @@ DEFAULTCONFIG = test_transport_api_https_nat_peer2.conf
 PORT = 12110
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12115

diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index b3c147012b7c155c6d2dc8be47c506ff7f8b999d..8a93ca1e8d42959a663e36af3f19cd1818355e27 100644 (file)
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -7,8 +7,6 @@ DEFAULTCONFIG = test_transport_api_https_peer1.conf
 PORT = 12100
 KEY_FILE = $SERVICEHOME/https_key_p1.key
 CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12105

diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index f06ee8b0065f100e41598b047ea8903361cd4617..0710f41ce808e0b49a41f745bf5082647e1288b8 100644 (file)
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -7,8 +7,6 @@ DEFAULTCONFIG = test_transport_api_https_peer2.conf
 PORT = 12110
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12115

diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index c890b421d80ad78012a5158f7388590dbc616f1a..272d19c416db95b54ef4aa142b4b954cb5e87de2 100644 (file)
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -12,13 +12,9 @@ PORT = 12141
 
 [transport-http]
 PORT = 12142
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [transport-https]
 PORT = 12143
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12149

diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 6de3c22fb7bfc5695587b07d054c5ae03ea89b52..86f51e3944175a2c14baf56151fb69da704540fe 100644 (file)
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -15,13 +15,9 @@ PORT = 12151
 
 [transport-http]
 PORT = 12152
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [transport-https]
 PORT = 12153
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12159

diff --git a/src/transport/test_transport_api_reliability_http_nat_peer1.conf b/src/transport/test_transport_api_reliability_http_nat_peer1.conf
index 482d88b9d4a4bad2fe155f4cf29d32a7ae0f1c4d..7d9d62773bf362b5c059b0699322cddced0542f2 100644 (file)
--- a/src/transport/test_transport_api_reliability_http_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_nat_peer1.conf
@@ -13,8 +13,6 @@ ENABLE_NAT_SERVER = YES
 
 [transport-http]
 PORT = 0
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12085

diff --git a/src/transport/test_transport_api_reliability_http_nat_peer2.conf b/src/transport/test_transport_api_reliability_http_nat_peer2.conf
index 017dd2ab56115e65a29bc31ba4f2d4deaf9bd316..448667c8ae41830b419c18634ba3fa0cf688b597 100644 (file)
--- a/src/transport/test_transport_api_reliability_http_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_nat_peer2.conf
@@ -7,15 +7,8 @@ DEFAULTCONFIG = test_transport_api_reliability_http_nat_peer2.conf
 TOTAL_QUOTA_OUT = 1073741824 
 TOTAL_QUOTA_IN  = 1073741824
 
-[nat]
-DISABLEV6 = NO
-
 [transport-http]
 PORT = 12090
-USE_IPv6 = YES
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12095

diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf
index c6514aa4794d6b61367447e5f70f3399f58023aa..9c4c73251479a17377f65e6af800cb8ec25c8f03 100644 (file)
--- a/src/transport/test_transport_api_reliability_http_peer1.conf
+++ b/src/transport/test_transport_api_reliability_http_peer1.conf
@@ -12,9 +12,6 @@ TIMEOUT = 5000
 
 [transport-http]
 PORT = 12180
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 12185

diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf
index 5192f260a12edea108968b5afcb873c93e85f4c9..24ca6f45d005fe2bff59559baaf6643cb0601fcf 100644 (file)
--- a/src/transport/test_transport_api_reliability_http_peer2.conf
+++ b/src/transport/test_transport_api_reliability_http_peer2.conf
@@ -9,9 +9,6 @@ TOTAL_QUOTA_IN  = 1073741824
 
 [transport-http]
 PORT = 12190
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 12195

diff --git a/src/transport/test_transport_api_reliability_https_nat_peer1.conf b/src/transport/test_transport_api_reliability_https_nat_peer1.conf
index 2c5c801b1c2a0a538969b98f9b96ad9eff14a95b..ede7e288aeee4bcc67874f66debd3c1ab151b4fe 100644 (file)
--- a/src/transport/test_transport_api_reliability_https_nat_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_nat_peer1.conf
@@ -10,14 +10,11 @@ TOTAL_QUOTA_IN  = 1073741824
 [nat]
 BEHIND_NAT = YES
 ENABLE_NAT_SERVER = YES
-DISABLEV6 = YES
 
 [transport-https]
 PORT = 0
 KEY_FILE = $SERVICEHOME/https_key_p1.key
 CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12105

diff --git a/src/transport/test_transport_api_reliability_https_nat_peer2.conf b/src/transport/test_transport_api_reliability_https_nat_peer2.conf
index 0cdd02cda1cdf35ef6e12fa7b200650753fea90f..369ee152a588c5c3aeb92d5443f9d8950e9e6552 100644 (file)
--- a/src/transport/test_transport_api_reliability_https_nat_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_nat_peer2.conf
@@ -11,8 +11,6 @@ TOTAL_QUOTA_IN  = 1073741824
 PORT = 12110
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12115

diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf
index d3333a5aa3986fd0a85a9b7223a81c14ff8089e7..6079b0a4059745a3ebf4256bd9195a529213f216 100644 (file)
--- a/src/transport/test_transport_api_reliability_https_peer1.conf
+++ b/src/transport/test_transport_api_reliability_https_peer1.conf
@@ -11,9 +11,6 @@ TOTAL_QUOTA_IN  = 1073741824
 PORT = 12300
 KEY_FILE = $SERVICEHOME/https_key_p1.key
 CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 12305

diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf
index 2b652d94aabfcb1d86fecadca87a9b7f2e5bac0e..4c2e9959d43f909776f9baa8be032ff29a6ed291 100644 (file)
--- a/src/transport/test_transport_api_reliability_https_peer2.conf
+++ b/src/transport/test_transport_api_reliability_https_peer2.conf
@@ -11,9 +11,6 @@ TOTAL_QUOTA_IN  = 1073741824
 PORT = 12310
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-USE_IPv4 = YES
-USE_IPv6 = NO
-BINDTO4 = 127.0.0.1
 
 [arm]
 PORT = 12315

diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf
index 3bcec359ad1e68f4b1bf570287f6614d21e5b653..a28750a20b0130e1c1223fc75c2e253cf920bf62 100644 (file)
--- a/src/transport/test_transport_api_timeout_http_peer1.conf
+++ b/src/transport/test_transport_api_timeout_http_peer1.conf
@@ -4,15 +4,9 @@ SERVICEHOME = /tmp/test-transport/api-http-p1/
 DEFAULTCONFIG = test_transport_api_http_peer1.conf
 
 [nat]
-DISABLEV6 = NO
 
 [transport-http]
 PORT = 12080
-USE_IPv6 = YES
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
-#BINDTO6 = ::1
 
 [arm]
 PORT = 12085

diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf
index 78f3a05c5490c24629877b6b8909665285983790..12693588ac08eea956c490546839f473c3ed8630 100644 (file)
--- a/src/transport/test_transport_api_timeout_http_peer2.conf
+++ b/src/transport/test_transport_api_timeout_http_peer2.conf
@@ -4,14 +4,9 @@ SERVICEHOME = /tmp/test-transport/api-http-p2/
 DEFAULTCONFIG = test_transport_api_http_peer2.conf
 
 [nat]
-DISABLEV6 = NO
 
 [transport-http]
 PORT = 12090
-USE_IPv6 = YES
-USE_IPv4 = YES
-DISABLEV6 = NO
-#BINDTO = 127.0.0.1
 
 [arm]
 PORT = 12095

diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf
index b3c147012b7c155c6d2dc8be47c506ff7f8b999d..8a93ca1e8d42959a663e36af3f19cd1818355e27 100644 (file)
--- a/src/transport/test_transport_api_timeout_https_peer1.conf
+++ b/src/transport/test_transport_api_timeout_https_peer1.conf
@@ -7,8 +7,6 @@ DEFAULTCONFIG = test_transport_api_https_peer1.conf
 PORT = 12100
 KEY_FILE = $SERVICEHOME/https_key_p1.key
 CERT_FILE = $SERVICEHOME/https_cert_p1.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12105

diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf
index f06ee8b0065f100e41598b047ea8903361cd4617..0710f41ce808e0b49a41f745bf5082647e1288b8 100644 (file)
--- a/src/transport/test_transport_api_timeout_https_peer2.conf
+++ b/src/transport/test_transport_api_timeout_https_peer2.conf
@@ -7,8 +7,6 @@ DEFAULTCONFIG = test_transport_api_https_peer2.conf
 PORT = 12110
 KEY_FILE = $SERVICEHOME/https_key_p2.key
 CERT_FILE = $SERVICEHOME/https_cert_p2.crt
-USE_IPv6 = YES
-USE_IPv4 = YES
 
 [arm]
 PORT = 12115