diff options
Diffstat (limited to 'src/transport')
84 files changed, 2 insertions, 86 deletions
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index ab0c5b391..05309d53c 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = template_cfg_peer1.conf | ||
5 | 4 | ||
6 | [gnunetd] | 5 | [gnunetd] |
7 | HOSTKEY = $SERVICEHOME/.hostkey | 6 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index a10dfc488..210ee51c5 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = template_cfg_peer2.conf | ||
5 | 4 | ||
6 | [gnunetd] | 5 | [gnunetd] |
7 | HOSTKEY = $SERVICEHOME/.hostkey | 6 | HOSTKEY = $SERVICEHOME/.hostkey |
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index fdf9fb3b4..189238c08 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ | 3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ |
4 | DEFAULTCONFIG = test_plugin_transport_data.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 2400 | 6 | PORT = 2400 |
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf index 93f75dd0b..b0fb0e059 100644 --- a/src/transport/test_quota_compliance_data.conf +++ b/src/transport/test_quota_compliance_data.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ | 3 | SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ |
4 | DEFAULTCONFIG = test_quota_compliance_data.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 2368 | 6 | PORT = 2368 |
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf index 472e3f74b..885bcba3d 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 |
4 | DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf index 48c1a6e83..33f8be543 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 3010 | 6 | PORT = 3010 |
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 9f3fa97ad..885bcba3d 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 5dd356d96..33f8be543 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_http_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 3010 | 6 | PORT = 3010 |
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf index 092762781..271bbe056 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf index 6646a582c..8e07ff337 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 3001 | 6 | PORT = 3001 |
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index a23b2ad01..271bbe056 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index 490b97983..8e07ff337 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 3001 | 6 | PORT = 3001 |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf index 8a1dad5ac..b7eb28757 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 4094 | 6 | PORT = 4094 |
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf index bbfa8ec28..cc949df30 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p2/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index 29e56fe9b..b7eb28757 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 4094 | 6 | PORT = 4094 |
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 5da60d03b..67f171ec9 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index fceee7bcd..0d49d4ef8 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 4368 | 6 | PORT = 4368 |
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index 4b58c934f..3c57fe5d6 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 3368 | 6 | PORT = 3368 |
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf index 649cf1c63..1e4afcebc 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 4087 | 6 | PORT = 4087 |
diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf index a2d1bdd18..f732e98ae 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 3087 | 6 | PORT = 3087 |
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index 60e656bad..bde78468c 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer1/ |
4 | DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf | ||
5 | 4 | ||
6 | [transport-unix] | 5 | [transport-unix] |
7 | PORT = 12120 | 6 | PORT = 12120 |
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index b4f0b648a..0b803ccbc 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 | 3 | SERVICEHOME = /tmp/test_quota_compliance_peer2 |
4 | DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf | ||
5 | 4 | ||
6 | [transport-unix] | 5 | [transport-unix] |
7 | PORT = 12136 | 6 | PORT = 12136 |
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_quota_compliance_wlan_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_quota_compliance_wlan_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf index 49fc66243..614d89d21 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12000 | 6 | PORT = 12000 |
@@ -43,4 +42,4 @@ TIMEOUT = 5 s | |||
43 | 42 | ||
44 | [transport-https] | 43 | [transport-https] |
45 | PORT = 12009 | 44 | PORT = 12009 |
46 | TIMEOUT = 5 s \ No newline at end of file | 45 | TIMEOUT = 5 s |
diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf index 2d64351d1..4aeee7c7d 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12010 | 6 | PORT = 12010 |
@@ -42,4 +41,4 @@ TIMEOUT = 5 s | |||
42 | 41 | ||
43 | [transport-https] | 42 | [transport-https] |
44 | PORT = 12019 | 43 | PORT = 12019 |
45 | TIMEOUT = 5 s \ No newline at end of file | 44 | TIMEOUT = 5 s |
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index 39552462a..164a38f69 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_transport_api_data.conf | ||
4 | 3 | ||
5 | [transport-tcp] | 4 | [transport-tcp] |
6 | PORT = 2094 | 5 | PORT = 2094 |
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index ebb4fd469..6879d0534 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index fe6d19b5c..67f171ec9 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 4af712a43..e0b60e37f 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_http_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 62126b07d..4e4c22e30 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_http_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 12090 | 6 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index bef99cdac..c38c36a18 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | INLINE@ template_cfg_peer1.conf | 1 | INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf | ||
5 | 4 | ||
6 | 5 | ||
7 | [transport-http_client] | 6 | [transport-http_client] |
diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index c7e9d4fe1..b73921f94 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | INLINE@ template_cfg_peer2.conf | 1 | INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_http_reverse_peer2.conf | ||
5 | 4 | ||
6 | 5 | ||
7 | [transport-http_client] | 6 | [transport-http_client] |
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index b387e5a10..78d3ca0a4 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | PORT = 12100 | 6 | PORT = 12100 |
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index f825c5889..a347887bb 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 12110 | 6 | PORT = 12110 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf index d29b9465a..dceeccb9f 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf index 3c0e49674..caaddded2 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 0 | 6 | PORT = 0 |
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 9fb57ab37..61b0f5644 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-multi-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-multi-p1/ |
4 | DEFAULTCONFIG = test_transport_api_multi_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12140 | 6 | PORT = 12140 |
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 18e2a5be6..c660c3c41 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-multi-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-multi-p2/ |
4 | DEFAULTCONFIG = test_transport_api_multi_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index f178b855a..9e39e3e41 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf | ||
5 | 4 | ||
6 | [transport-http_client] | 5 | [transport-http_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index b2d1b338c..3174e3d00 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf | ||
5 | 4 | ||
6 | [transport-http_server] | 5 | [transport-http_server] |
7 | PORT = 12090 | 6 | PORT = 12090 |
diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf index 4a2c0b5a6..d5e88261a 100644 --- a/src/transport/test_transport_api_reliability_https_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf index 5a21188da..5cc0d245a 100644 --- a/src/transport/test_transport_api_reliability_https_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 12310 | 6 | PORT = 12310 |
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf index ffd3d2f7b..9490d405c 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf index c6020ff09..b59916b7f 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 3be982dd9..5f1d693a8 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index 62575a971..3cb42c0b6 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 73f36f3c2..4ebf5b3be 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index 0bf50fd4b..1ef51c9c9 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | DISABLEV6 = YES | 6 | DISABLEV6 = YES |
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 9532b730a..54abfa5ba 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index fe6d19b5c..67f171ec9 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_tcp_peer2.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12015 | 6 | PORT = 12015 |
diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf index cdfbdd9af..2eb23662a 100644 --- a/src/transport/test_transport_api_timeout_http_peer1.conf +++ b/src/transport/test_transport_api_timeout_http_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p1/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf index 6edc9e24a..0aa77a9b9 100644 --- a/src/transport/test_transport_api_timeout_http_peer2.conf +++ b/src/transport/test_transport_api_timeout_http_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-http-p2/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf index c8a26d2af..ff1ef47bd 100644 --- a/src/transport/test_transport_api_timeout_https_peer1.conf +++ b/src/transport/test_transport_api_timeout_https_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p1/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf | ||
5 | 4 | ||
6 | [transport-https_client] | 5 | [transport-https_client] |
7 | 6 | ||
diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf index 3daf94bb1..35fba0a83 100644 --- a/src/transport/test_transport_api_timeout_https_peer2.conf +++ b/src/transport/test_transport_api_timeout_https_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-https-p2/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf | ||
5 | 4 | ||
6 | [transport-https_server] | 5 | [transport-https_server] |
7 | PORT = 12110 | 6 | PORT = 12110 |
diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf index ecb599f2a..dceeccb9f 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer1.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_tcp_peer1.conf | ||
5 | 4 | ||
6 | [transport-tcp] | 5 | [transport-tcp] |
7 | PORT = 12000 | 6 | PORT = 12000 |
diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf index ba2e27e57..f89c3a3f7 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer2.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-tcp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_timeout_tcp_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | ALLOW_NAT = NO | 6 | ALLOW_NAT = NO |
diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf index a1216e4aa..7c3e33ad0 100644 --- a/src/transport/test_transport_api_timeout_udp_peer1.conf +++ b/src/transport/test_transport_api_timeout_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf index 3e487a6bf..9b79c3b54 100644 --- a/src/transport/test_transport_api_timeout_udp_peer2.conf +++ b/src/transport/test_transport_api_timeout_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf index b1ace7d4c..5d0235f73 100644 --- a/src/transport/test_transport_api_timeout_unix_peer1.conf +++ b/src/transport/test_transport_api_timeout_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf index a15358844..255c7e246 100644 --- a/src/transport/test_transport_api_timeout_unix_peer2.conf +++ b/src/transport/test_transport_api_timeout_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 16a4e6279..6e643d5af 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ |
4 | DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | BEHIND_NAT = YES | 6 | BEHIND_NAT = YES |
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 0852b25d9..1c1258ad1 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ |
4 | DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf | ||
5 | 4 | ||
6 | [nat] | 5 | [nat] |
7 | ALLOW_NAT = YES | 6 | ALLOW_NAT = YES |
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index a1216e4aa..7c3e33ad0 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 3e487a6bf..9b79c3b54 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index b1ace7d4c..5d0235f73 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index a15358844..255c7e246 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unix_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf index d872f02e7..a4fd104ed 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf index 50ee65acb..755e65dce 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index 8a5a4052e..b9669bf65 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12040 | 6 | PORT = 12040 |
diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index d240c42ce..46ad0177d 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-udp-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf | ||
5 | 4 | ||
6 | [transport-udp] | 5 | [transport-udp] |
7 | PORT = 12050 | 6 | PORT = 12050 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index 8689e415e..5d0235f73 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p1/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12125 | 6 | PORT = 12125 |
diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index 7c3cc1953..c9dab48d7 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-unix-p2/ |
4 | DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf | ||
5 | 4 | ||
6 | [arm] | 5 | [arm] |
7 | PORT = 12135 | 6 | PORT = 12135 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index 9dd9d1bd6..e81a3f9f1 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | TESTMODE = 1 | 6 | TESTMODE = 1 |
diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index bc868d7d7..bd5387667 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index e379cf08c..ff37415a4 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer1.conf | 1 | @INLINE@ template_cfg_peer1.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p1/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer1.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon0 | 6 | INTERFACE = mon0 |
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 3e0ce27d6..87a6036fb 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf | |||
@@ -1,7 +1,6 @@ | |||
1 | @INLINE@ template_cfg_peer2.conf | 1 | @INLINE@ template_cfg_peer2.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ | 3 | SERVICEHOME = /tmp/test-transport/api-wlan-p2/ |
4 | DEFAULTCONFIG = test_transport_api_wlan_peer2.conf | ||
5 | 4 | ||
6 | [transport-wlan] | 5 | [transport-wlan] |
7 | INTERFACE = mon1 | 6 | INTERFACE = mon1 |
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf index 0939a7976..4551bb138 100644 --- a/src/transport/test_transport_defaults.conf +++ b/src/transport/test_transport_defaults.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/test-transport-api/ | 2 | SERVICEHOME = /tmp/test-transport-api/ |
3 | DEFAULTCONFIG = test_transport_defaults.conf | ||
4 | 3 | ||
5 | [transport-tcp] | 4 | [transport-tcp] |
6 | TIMEOUT = 300 s | 5 | TIMEOUT = 300 s |
diff --git a/src/transport/test_transport_startonly.conf b/src/transport/test_transport_startonly.conf index 255df4c44..8e161382b 100644 --- a/src/transport/test_transport_startonly.conf +++ b/src/transport/test_transport_startonly.conf | |||
@@ -1,6 +1,5 @@ | |||
1 | @INLINE@ test_transport_defaults.conf | 1 | @INLINE@ test_transport_defaults.conf |
2 | [PATHS] | 2 | [PATHS] |
3 | DEFAULTCONFIG = test_transport_api_data.conf | ||
4 | 3 | ||
5 | [arm] | 4 | [arm] |
6 | DEFAULTSERVICES = transport | 5 | DEFAULTSERVICES = transport |
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index c6c752d8a..46cb9bf17 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in | |||
@@ -3,7 +3,6 @@ AUTOSTART = YES | |||
3 | @UNIXONLY@ PORT = 2091 | 3 | @UNIXONLY@ PORT = 2091 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | HOME = $SERVICEHOME | 5 | HOME = $SERVICEHOME |
6 | CONFIG = $DEFAULTCONFIG | ||
7 | BINARY = gnunet-service-transport | 6 | BINARY = gnunet-service-transport |
8 | #PREFIX = valgrind | 7 | #PREFIX = valgrind |
9 | NEIGHBOUR_LIMIT = 50 | 8 | NEIGHBOUR_LIMIT = 50 |