diff options
25 files changed, 14 insertions, 495 deletions
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index fbac192c1..45441ea9e 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf @@ -12,6 +12,16 @@ BROADCAST = NO [transport-unix] PORT = 12017 +[transport-http_server] +PORT = 12018 +USE_IPv6 = YES + +[transport-https_server] +PORT = 12019 +KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key +CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt +USE_IPv6 = YES + [arm] PORT = 12014 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf index 8f50bf113..b707ee971 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf @@ -6,25 +6,7 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ INTERFACE = hci0 TESTMODE = 1 -[arm] -PORT = 12164 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12163 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12162 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12161 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12160 PLUGINS = bluetooth -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf index 1816ec99e..ba79f4ab2 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf @@ -6,24 +6,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ INTERFACE = hci1 TESTMODE = 2 -[arm] -PORT = 12174 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12173 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12172 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12171 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12170 PLUGINS = bluetooth -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_address_switch_http_peer1.conf b/src/transport/test_transport_address_switch_http_peer1.conf index 623d1c114..e361719ec 100644 --- a/src/transport/test_transport_address_switch_http_peer1.conf +++ b/src/transport/test_transport_address_switch_http_peer1.conf @@ -21,28 +21,6 @@ WLAN_QUOTA_OUT = 8 KiB BLUETOOTH_QUOTA_IN = 8 KiB BLUETOOTH_QUOTA_OUT = 8 KiB -[transport-tcp] -PORT = 12000 -TIMEOUT = 5 s - -[arm] -PORT = 12005 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12004 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12003 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12002 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12001 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = http_server http_client diff --git a/src/transport/test_transport_address_switch_http_peer2.conf b/src/transport/test_transport_address_switch_http_peer2.conf index b783b0710..3c6f4a2a8 100644 --- a/src/transport/test_transport_address_switch_http_peer2.conf +++ b/src/transport/test_transport_address_switch_http_peer2.conf @@ -21,28 +21,6 @@ WLAN_QUOTA_OUT = 8 KiB BLUETOOTH_QUOTA_IN = 8 KiB BLUETOOTH_QUOTA_OUT = 8 KiB -[transport-tcp] -PORT = 12015 -TIMEOUT = 5 s - -[arm] -PORT = 12014 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12013 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12012 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12011 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12010 PLUGINS = http_client http_server -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf index d63bca939..12d2ee881 100644 --- a/src/transport/test_transport_api_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_bluetooth_peer1.conf @@ -6,30 +6,5 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p1/ INTERFACE = hci0 TESTMODE = 1 -[arm] -PORT = 12164 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12163 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12162 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12161 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12160 PLUGINS = bluetooth -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 -#PREFIX = valgrind --leak-check=full --show-reachable=yes -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif -#PREFIX = gdbserver :2345 - diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf index 4a19cddf5..b44f7cc53 100644 --- a/src/transport/test_transport_api_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_bluetooth_peer2.conf @@ -6,29 +6,5 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-bluetooth-p2/ INTERFACE = hci1 TESTMODE = 2 -[arm] -PORT = 12174 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12173 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12172 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12171 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12170 PLUGINS = bluetooth -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 -#PREFIX = valgrind --leak-check=full --show-reachable=yes -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif -#PREFIX = gdbserver :2345 diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index 297382fcf..72b8006b1 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf @@ -2,28 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ -[transport-tcp] -PORT = 12000 -TIMEOUT = 5 s - -[arm] -PORT = 12005 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12004 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12003 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12002 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12001 PLUGINS = tcp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index 326943504..ba7e5ff24 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf @@ -2,28 +2,7 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ -[transport-tcp] -PORT = 12015 -TIMEOUT = 5 s - -[arm] -PORT = 12014 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12013 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12012 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12011 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12010 PLUGINS = tcp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock + diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index f7bc22fd2..de0ff8506 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -2,29 +2,5 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ -[transport-http_client] - -[arm] -PORT = 12085 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12084 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12083 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12082 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12081 PLUGINS = http_client -#BINARY = .libs/gnunet-service-transport -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock -#PREFIX = valgrind --leak-check=full -#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args - diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 4e443d890..1559c78fd 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -2,29 +2,5 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ -[transport-http_server] -PORT = 12090 -USE_IPv6 = YES -#BINDTO = 127.0.0.1 - -[arm] -PORT = 12095 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12094 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12093 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12092 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12091 PLUGINS = http_server -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock -#PREFIX = valgrind --leak-check=full diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index 9b203a819..ae29d8a29 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf @@ -2,37 +2,10 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ - -[transport-http_client] - -[arm] -PORT = 12095 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12094 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12093 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12092 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12091 PLUGINS = http_client -#BINARY = .libs/gnunet-service-transport -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock -PREFIX = valgrind --leak-check=full -#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args - [ats] WAN_QUOTA_IN = unlimited WAN_QUOTA_OUT = unlimited -PORT = 12006 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-http_reserver_p1-service-ats.sock diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index e5a2fa73d..7117895ef 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf @@ -2,38 +2,12 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-http-p2/ - -[transport-http_client] - [transport-http_server] PORT = 8080 EXTERNAL_HOSTNAME = fulcrum.net.in.tum.de/gnunet EXTERNAL_HOSTNAME_ONLY = YES -#USE_IPV4 = YES -#USE_IPV6 = YES -#BINDTO = 127.0.0.1 -#BINDTO6 = ::1 - -[arm] -PORT = 12085 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12084 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12083 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12082 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] -PORT = 12081 PLUGINS = http_server -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock -PREFIX = valgrind --leak-check=full -#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args + diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index e682b9b76..8fc2edf2e 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf @@ -2,11 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ -[transport-https_client] -PORT = 12100 -KEY_FILE = $GNUNET_TEST_HOME/https_key_p1.key -CERT_FILE = $GNUNET_TEST_HOME/https_cert_p1.crt - [arm] PORT = 12105 diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index b6c699057..d2bf20011 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf @@ -6,13 +6,6 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-https-p2/ EXTERNAL_HOSTNAME = localhost EXTERNAL_HOSTNAME_ONLY = yes EXTERNAL_HOSTNAME_USE_PORT = YES -#VERIFY_EXTERNAL_HOSTNAME = YES -#PORT = 10000 -# Does the external hostname use the same port? -USE_IPv6 = YES -#BINDTO = 127.0.0.1 -KEY_FILE = $GNUNET_TEST_HOME/https_key_p2.key -CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt [arm] PORT = 12115 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 4cdfdcdee..e9b61028c 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf @@ -2,29 +2,8 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ -[transport-tcp] -PORT = 12000 -TIMEOUT = 5 s - -[arm] -PORT = 12005 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12004 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12003 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12002 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12001 PLUGINS = tcp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock + 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 da6e70185..afb412cd0 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf @@ -2,28 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ -[transport-tcp] -PORT = 0 -TIMEOUT = 5 s - -[arm] -PORT = 12014 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12013 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12012 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12011 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12010 PLUGINS = tcp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf index 49ddc3236..e611b1ae9 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf @@ -2,29 +2,7 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ -[transport-tcp] -PORT = 12000 -TIMEOUT = 5 s - -[arm] -PORT = 12005 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12004 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12003 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12002 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12001 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp MANIPULATE_DELAY_IN = 100 ms MANIPULATE_DELAY_OUT = 100 ms diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf index fa3f25e04..2c0251fa3 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf @@ -2,29 +2,7 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ -[transport-tcp] -PORT = 12015 -TIMEOUT = 5 s - -[arm] -PORT = 12014 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12013 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12012 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12011 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12010 PLUGINS = tcp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #MANIPULATE_DELAY_IN = 0 ms #MANIPULATE_DELAY_OUT = 0 ms diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index d75e23e06..72b8006b1 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -2,28 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ -[transport-tcp] -PORT = 12000 -TIMEOUT = 5 s - -[arm] -PORT = 12005 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12004 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12003 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12002 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12001 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 326943504..afb412cd0 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -2,28 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ -[transport-tcp] -PORT = 12015 -TIMEOUT = 5 s - -[arm] -PORT = 12014 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12013 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12012 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12011 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12010 PLUGINS = tcp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index 70af52994..7c1f0d9f9 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -5,31 +5,13 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-udp-p1/ [transport-udp] PORT = 0 BROADCAST = NO -BROADCAST_INTERVAL = 30000 MAX_BPS = 50000000 BINDTO = 127.0.0.1 BINDTO6 = ::1 -[arm] -PORT = 12045 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12044 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12043 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12042 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -#PREFIX = valgrind --leak-check=full PORT = 12041 PLUGINS = udp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock + diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 6400ef554..ab9b2148f 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -9,25 +9,7 @@ MAX_BPS = 50000000 BINDTO = 127.0.0.1 BINDTO6 = ::1 -[arm] -PORT = 12055 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12054 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12053 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12052 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12051 PLUGINS = udp -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index d43ef4a33..292756806 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf @@ -2,26 +2,8 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ -[arm] -PORT = 12125 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock - -[statistics] -PORT = 12124 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock - -[resolver] -PORT = 12123 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock - -[peerinfo] -PORT = 12122 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock - [transport] -PORT = 12121 PLUGINS = unix -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [transport-unix] PORT = 12120 diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index 9feed6592..6da2a2b7c 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf @@ -2,27 +2,6 @@ [PATHS] GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ -[arm] -PORT = 12135 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock - -[statistics] -PORT = 12134 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock - -[resolver] -PORT = 12133 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock - -[peerinfo] -PORT = 12132 -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock - [transport] -PORT = 12131 PLUGINS = unix -UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock - -[transport-unix] -PORT = 12136 |