summaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-11-16 09:35:59 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-11-16 09:35:59 +0000
commit9b970163bd5b51260f77e914aacea37318cb1a5a (patch)
tree794a137d22fe2331a3555aaf8d914a5241dc9aaa /src/transport
parentb60674eb5004789b7a0fb2fa88cd97b58baaf41d (diff)
clreaning up conf files
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/plugin_transport_http_client.c6
-rw-r--r--src/transport/plugin_transport_http_server.c6
-rw-r--r--src/transport/template_cfg_peer1.conf7
-rw-r--r--src/transport/template_cfg_peer2.conf7
-rw-r--r--src/transport/test_plugin_transport_data_http.conf28
-rw-r--r--src/transport/test_quota_compliance_http_asymmetric_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_http_asymmetric_peer2.conf4
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf4
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer1.conf3
-rw-r--r--src/transport/test_quota_compliance_https_asymmetric_peer2.conf3
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf3
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf3
-rw-r--r--src/transport/test_transport_api_http_nat_peer1.conf6
-rw-r--r--src/transport/test_transport_api_http_nat_peer2.conf7
-rw-r--r--src/transport/test_transport_api_http_peer1.conf8
-rw-r--r--src/transport/test_transport_api_http_peer2.conf7
-rw-r--r--src/transport/test_transport_api_https_nat_peer1.conf3
-rw-r--r--src/transport/test_transport_api_https_nat_peer2.conf2
-rw-r--r--src/transport/test_transport_api_https_peer1.conf2
-rw-r--r--src/transport/test_transport_api_https_peer2.conf2
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf4
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf4
-rw-r--r--src/transport/test_transport_api_reliability_http_nat_peer1.conf2
-rw-r--r--src/transport/test_transport_api_reliability_http_nat_peer2.conf7
-rw-r--r--src/transport/test_transport_api_reliability_http_peer1.conf3
-rw-r--r--src/transport/test_transport_api_reliability_http_peer2.conf3
-rw-r--r--src/transport/test_transport_api_reliability_https_nat_peer1.conf3
-rw-r--r--src/transport/test_transport_api_reliability_https_nat_peer2.conf2
-rw-r--r--src/transport/test_transport_api_reliability_https_peer1.conf3
-rw-r--r--src/transport/test_transport_api_reliability_https_peer2.conf3
-rw-r--r--src/transport/test_transport_api_timeout_http_peer1.conf6
-rw-r--r--src/transport/test_transport_api_timeout_http_peer2.conf5
-rw-r--r--src/transport/test_transport_api_timeout_https_peer1.conf2
-rw-r--r--src/transport/test_transport_api_timeout_https_peer2.conf2
35 files changed, 18 insertions, 150 deletions
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 62be281ab..14a58f264 100644
--- 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 fc0c9f3d4..8a7158e03 100644
--- 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 b76613513..fbb4f7c4f 100644
--- 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 0c1f89cc2..7249fc4cc 100644
--- 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
index e3982a1f5..000000000
--- 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 872a75365..f56b1578a 100644
--- 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 256dc61eb..20ef5829f 100644
--- 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 872a75365..f56b1578a 100644
--- 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 256dc61eb..20ef5829f 100644
--- 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 5bc5e3a69..ad4aab0fd 100644
--- 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 f3f69862f..94d7412af 100644
--- 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 5bc5e3a69..ad4aab0fd 100644
--- 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 f3f69862f..94d7412af 100644
--- 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 e55d54e55..447508c36 100644
--- 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 e3f05870d..2f56eabda 100644
--- 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 6d8cfc30e..26c29699b 100644
--- 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 78f3a05c5..fa7aa3b29 100644
--- 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 fb0dd82cd..e97b47317 100644
--- 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 8f8e6b9c5..a23f3a5b4 100644
--- 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 b3c147012..8a93ca1e8 100644
--- 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 f06ee8b00..0710f41ce 100644
--- 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 c890b421d..272d19c41 100644
--- 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 6de3c22fb..86f51e394 100644
--- 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 482d88b9d..7d9d62773 100644
--- 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 017dd2ab5..448667c8a 100644
--- 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 c6514aa47..9c4c73251 100644
--- 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 5192f260a..24ca6f45d 100644
--- 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 2c5c801b1..ede7e288a 100644
--- 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 0cdd02cda..369ee152a 100644
--- 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 d3333a5aa..6079b0a40 100644
--- 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 2b652d94a..4c2e9959d 100644
--- 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 3bcec359a..a28750a20 100644
--- 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 78f3a05c5..12693588a 100644
--- 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 b3c147012..8a93ca1e8 100644
--- 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 f06ee8b00..0710f41ce 100644
--- 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