From 0ea2ffb99da4645d3984fd0b207bd78d261e8356 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Mon, 1 Aug 2011 13:35:31 +0000 Subject: simplifying config --- src/transport/Makefile.am | 1 + src/transport/template_cfg_peer1.conf | 133 +++--------------- src/transport/template_cfg_peer2.conf | 134 +++--------------- src/transport/test_plugin_transport_data.conf | 34 ++--- src/transport/test_plugin_transport_data_http.conf | 58 ++------ src/transport/test_plugin_transport_data_udp.conf | 39 ------ src/transport/test_quota_compliance_data.conf | 34 ++--- .../test_quota_compliance_http_peer1.conf | 120 +--------------- .../test_quota_compliance_http_peer2.conf | 115 ++-------------- .../test_quota_compliance_https_peer1.conf | 124 +++-------------- .../test_quota_compliance_https_peer2.conf | 126 +++-------------- src/transport/test_quota_compliance_tcp_peer1.conf | 124 ++--------------- src/transport/test_quota_compliance_tcp_peer2.conf | 127 ++--------------- src/transport/test_quota_compliance_udp_peer1.conf | 118 ++-------------- src/transport/test_quota_compliance_udp_peer2.conf | 117 ++-------------- .../test_quota_compliance_unix_peer1.conf | 116 ++-------------- .../test_quota_compliance_unix_peer2.conf | 117 +++------------- src/transport/test_transport_api_data.conf | 108 +-------------- src/transport/test_transport_api_http_peer1.conf | 125 +++-------------- src/transport/test_transport_api_http_peer2.conf | 125 +++-------------- src/transport/test_transport_api_https_peer1.conf | 133 +++--------------- src/transport/test_transport_api_https_peer2.conf | 136 +++--------------- src/transport/test_transport_api_multi_peer1.conf | 149 +++----------------- src/transport/test_transport_api_multi_peer2.conf | 152 ++++----------------- .../test_transport_api_multiaddress_tcp_peer1.conf | 38 ++++-- .../test_transport_api_multiaddress_tcp_peer2.conf | 43 ++++-- .../test_transport_api_rel_http_peer1.conf | 129 +++-------------- .../test_transport_api_rel_http_peer2.conf | 127 +++-------------- .../test_transport_api_rel_https_peer1.conf | 131 +++--------------- .../test_transport_api_rel_https_peer2.conf | 133 +++--------------- .../test_transport_api_tcp_nat_peer1.conf | 131 +++--------------- .../test_transport_api_tcp_nat_peer2.conf | 131 +++--------------- src/transport/test_transport_api_tcp_peer1.conf | 133 +++--------------- src/transport/test_transport_api_tcp_peer2.conf | 134 +++--------------- .../test_transport_api_udp_nat_peer1.conf | 128 +++-------------- .../test_transport_api_udp_nat_peer2.conf | 130 +++--------------- src/transport/test_transport_api_udp_peer1.conf | 129 +++-------------- src/transport/test_transport_api_udp_peer2.conf | 125 +++-------------- src/transport/test_transport_api_unix_peer1.conf | 126 +++-------------- src/transport/test_transport_api_unix_peer2.conf | 125 +++-------------- src/transport/test_transport_api_wlan_peer1.conf | 125 +++-------------- src/transport/test_transport_api_wlan_peer2.conf | 124 +++-------------- src/transport/test_transport_ats_1addr.conf | 76 +++-------- src/transport/test_transport_ats_2addr.conf | 77 +++-------- src/transport/test_transport_ats_4addr.conf | 86 +++--------- src/transport/test_transport_defaults.conf | 46 +++++++ 46 files changed, 799 insertions(+), 4193 deletions(-) create mode 100644 src/transport/test_transport_defaults.conf diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am index 864dd8231..2ce2a48be 100644 --- a/src/transport/Makefile.am +++ b/src/transport/Makefile.am @@ -566,6 +566,7 @@ test_transport_api_multi_LDADD = \ EXTRA_DIST = \ gnunet-transport-certificate-creation \ ats_mlp_p100_m400.problem \ + test_transport_defaults.conf \ test_transport_api_data.conf \ test_transport_api_tcp_peer1.conf \ test_transport_api_tcp_peer2.conf \ diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index 36c148f98..d724a6e8b 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf @@ -1,126 +1,31 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-p1/ +DEFAULTCONFIG = template_cfg_peer1.conf + [transport-tcp] PORT = 12000 - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -BEHIND_NAT = NO -#ALLOW_NAT = NO -ENABLE_UPNP = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp -#DEBUG = YES -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -#BINARY = gnunet-service-transport -#BINARY = /home/grothoff/bin/gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +TIMEOUT = 5000 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12005 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf -SERVICEHOME = /tmp/test-transport/api-tcp-p1/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12004 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12003 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12002 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12001 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index c862a3556..2fb65b9c9 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf @@ -1,126 +1,32 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-p2/ +DEFAULTCONFIG = template_cfg_peer2.conf + [transport-tcp] PORT = 0 - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -BEHIND_NAT = NO -#ALLOW_NAT = NO -ENABLE_UPNP = NO -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -#BINARY = /home/grothoff/bin/gnunet-service-transport -#BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12010 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +TIMEOUT = 5000 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12014 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf -SERVICEHOME = /tmp/test-transport/api-tcp-p2/ - -[core] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12013 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12012 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12011 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +TRUST = $SERVICEHOME/data/credit/ -[nse] -AUTOSTART = NO +[transport] +PORT = 12010 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index 329749314..e3e619fb3 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf @@ -1,12 +1,11 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ +DEFAULTCONFIG = test_plugin_transport_data.conf -[resolver] -PORT = 2364 - -[transport] -PORT = 2365 -PLUGINS = tcp +[transport-tcp] +PORT = 2368 +TIMEOUT = 5000 [arm] PORT = 2366 @@ -14,28 +13,13 @@ PORT = 2366 [statistics] PORT = 2367 -[transport-tcp] -PORT = 2368 +[resolver] +PORT = 2364 [peerinfo] PORT = 2369 -[testing] -WEAKRANDOM = YES - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO +[transport] +PORT = 2365 diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf index 68b526cc8..e3982a1f5 100644 --- a/src/transport/test_plugin_transport_data_http.conf +++ b/src/transport/test_plugin_transport_data_http.conf @@ -1,68 +1,28 @@ +@INLINE@ test_transport_defaults.conf [PATHS] -DEFAULTCONFIG = test_plugin_transport_data_http.conf SERVICEHOME = /tmp/test-transport/plugin_http/ +DEFAULTCONFIG = test_plugin_transport_data_http.conf -[TESTING] -WEAKRANDOM = YES +[transport-tcp] +TIMEOUT = 5000 [transport-http] PORT = 12320 DEBUG = YES -#USE_IPv4 = NO -#USE_IPv6 = NO USE_IPv6 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -#USE_LOCALADDR = YES - [transport-https] PORT = 12321 -DEBUG = YES -#USE_IPv4 = NO -#USE_IPv6 = NO -USE_IPv6 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL KEY_FILE = https_key.key CERT_FILE = https_cert.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE -#USE_LOCALADDR = YES - -[transport] -PREFIX = valgrind --leak-check=full -#DEBUG = YES - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12322 +DEBUG = YES +USE_IPv6 = YES [arm] -DEFAULTSERVICES = topology hostlist -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12323 -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO -[nse] -AUTOSTART = NO +[statistics] +PORT = 12322 diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf index 173addc7f..8b1378917 100644 --- a/src/transport/test_plugin_transport_data_udp.conf +++ b/src/transport/test_plugin_transport_data_udp.conf @@ -1,40 +1 @@ -[PATHS] -SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ - -[resolver] -PORT = 2364 - -[transport] -PORT = 2365 -PLUGINS = udp - -[arm] -PORT = 2366 - -[statistics] -PORT = 2367 - -[transport-udp] -PORT = 2368 - -[peerinfo] -PORT = 2369 - -[testing] -WEAKRANDOM = YES - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf index 885138076..7f93a15ba 100644 --- a/src/transport/test_quota_compliance_data.conf +++ b/src/transport/test_quota_compliance_data.conf @@ -1,12 +1,11 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ +DEFAULTCONFIG = test_quota_compliance_data.conf -[resolver] -PORT = 2364 - -[transport] -PORT = 2365 -PLUGINS = tcp +[transport-tcp] +PORT = 2368 +TIMEOUT = 5000 [arm] PORT = 2366 @@ -14,28 +13,13 @@ PORT = 2366 [statistics] PORT = 2367 -[transport-tcp] -PORT = 2368 -USE_LOCALADDR = YES +[resolver] +PORT = 2364 [peerinfo] PORT = 2369 -[testing] -WEAKRANDOM = YES - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO +[transport] +PORT = 2365 diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 8d8229857..0411accaa 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf @@ -1,120 +1,14 @@ -[PATHS] -SERVICEHOME = /tmp/test-transport/quota-http-p1/ -DEFAULTCONFIG = test_quota_compliance_http_peer1.conf - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport-http] -PORT = 4010 -DEBUG = NO -USE_IPv4 = YES -USE_IPv6 = NO -BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES - -[transport] -PORT = 4011 -UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock -plugins = http -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[peerinfo] -PORT = 4012 -UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - [resolver] PORT = 4013 UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[statistics] -PORT = 4014 -UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer1.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[arm] -PORT = 4015 -UNIXPATH = /tmp/test_quota_compliance_http_arm_peer1.sock -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - +[peerinfo] +PORT = 4012 +UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 4011 +PLUGINS = http +UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 9b3dc9694..747c92114 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf @@ -1,3 +1,4 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_http_peer2.conf @@ -8,114 +9,26 @@ DEBUG = NO USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -PORT = 3011 -UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock -plugins = http -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[peerinfo] -PORT = 3012 -UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[resolver] -PORT = 3013 -UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[statistics] -PORT = 3014 -UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost [arm] PORT = 3015 UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 3014 +UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock +[resolver] +PORT = 3013 +UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock +[peerinfo] +PORT = 3012 +UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 3011 +PLUGINS = http +UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 1e6844462..692077c55 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf @@ -1,126 +1,36 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1/ DEFAULTCONFIG = test_quota_compliance_https_peer1.conf -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - [transport-https] PORT = 4001 -#DEBUG = YES +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +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 -#BINDTO6 = ::1 -KEY_FILE = https_key_quota_p1.key -CERT_FILE = https_cert_quota_p1.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE -USE_LOCALADDR = YES - -[transport] -PORT = 4002 -UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock -plugins = https -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - - -[peerinfo] -PORT = 4003 -UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - - -[resolver] -PORT = 4004 -UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[statistics] -PORT = 4005 -UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost [arm] PORT = 4006 UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 4005 +UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock +[resolver] +PORT = 4004 +UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock +[peerinfo] +PORT = 4003 +UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 4002 +PLUGINS = https +UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index a27e8ccf9..0d22f9c78 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf @@ -1,128 +1,36 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_https_peer2.conf [transport-https] PORT = 3001 -#DEBUG = YES +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +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 -#BINDTO6 = ::1 -KEY_FILE = https_key_quota_p2.key -CERT_FILE = https_cert_qutoa_p2.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE -USE_LOCALADDR = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -PORT = 3002 -UNIXPATH = /tmp/https_transport_peer2.sock -plugins = https -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - - -[peerinfo] -PORT = 3003 -UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[resolver] -PORT = 3004 -UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[statistics] -PORT = 3005 -UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - [arm] PORT = 3006 UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost - -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 3005 +UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock +[resolver] +PORT = 3004 +UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock +[peerinfo] +PORT = 3003 +UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 3002 +PLUGINS = https +UNIXPATH = /tmp/https_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index a8ea8a11c..99b8311ee 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf @@ -1,126 +1,32 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport-udp] -PORT = 4094 - [transport-tcp] -TIMEOUT = 300000 PORT = 4094 -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -ENABLE_UPNP = NO -BEHIND_NAT = NO -ALLOW_NAT = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 - -[transport] -plugins = tcp -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4091 -UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock +[transport-udp] +PORT = 4094 [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 4087 UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO -[dns] -AUTOSTART = NO +[statistics] +PORT = 4088 +UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock +[resolver] +PORT = 4089 +UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock +[peerinfo] +PORT = 4090 +UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 4091 +UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index b79ed1f30..11457d0ac 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf @@ -1,129 +1,32 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf -[transport-udp] -PORT = 3094 - [transport-tcp] -TIMEOUT = 300000 PORT = 3094 -USE_LOCALADDR = YES - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -ENABLE_UPNP = NO -BEHIND_NAT = NO -ALLOW_NAT = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -plugins = tcp -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3091 -UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3090 -UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3089 -UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3088 -UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock +[transport-udp] +PORT = 3094 [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 3087 UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer2.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 3088 +UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock +[resolver] +PORT = 3089 +UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock +[peerinfo] +PORT = 3090 +UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 3091 +UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index f62cceb2f..c524966d2 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf @@ -1,120 +1,30 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1/ DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - [transport-udp] PORT = 4368 MAX_BPS = 50000000 -[transport] -plugins = udp -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4091 -UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 4087 UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer1.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[nat] -# Are we behind NAT? -BEHIND_NAT = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - +[statistics] +PORT = 4088 +UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock +[resolver] +PORT = 4089 +UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock -[nse] -AUTOSTART = NO +[peerinfo] +PORT = 4090 +UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock +[transport] +PORT = 4091 +PLUGINS = udp +UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index b06ac66f0..ca590cfc6 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf @@ -1,3 +1,4 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf @@ -6,115 +7,25 @@ DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf PORT = 3368 MAX_BPS = 50000000 -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -plugins = udp -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3091 -UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3090 -UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3089 -UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3088 -UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 3087 UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer2.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[nat] -# Are we behind NAT? -BEHIND_NAT = NO - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 3088 +UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock +[resolver] +PORT = 3089 +UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock +[peerinfo] +PORT = 3090 +UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 3091 +PLUGINS = udp +UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index a85c2643b..0952b739f 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf @@ -1,116 +1,28 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer1/ DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport-unix] -PORT = 4368 - - -[transport] -plugins = unix -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4091 -UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 4087 UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - +[statistics] +PORT = 4088 +UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock -[dns] -AUTOSTART = NO +[resolver] +PORT = 4089 +UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock +[peerinfo] +PORT = 4090 +UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock +[transport] +PORT = 4091 +PLUGINS = unix +UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock -[nse] -AUTOSTART = NO diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index 7f84b9087..86c6701ba 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf @@ -1,114 +1,29 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test_quota_compliance_peer2 DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf -[transport-unix] -PORT = 3368 -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -plugins = unix -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3091 -UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3090 -UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3089 -UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 3088 -UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 3087 UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 3088 +UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock +[resolver] +PORT = 3089 +UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock +[peerinfo] +PORT = 3090 +UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 3091 +PLUGINS = unix +UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock +[transport-unix] +PORT = 3368 diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index a4c253e28..39552462a 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf @@ -1,114 +1,12 @@ +@INLINE@ test_transport_defaults.conf [PATHS] -SERVICEHOME = /tmp/test-transport-api/ DEFAULTCONFIG = test_transport_api_data.conf -[transport-udp] -PORT = 2094 - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -#plugins = udp -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2091 - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2090 - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2089 - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2088 - -[arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 2087 - [transport-tcp] -TIMEOUT = 300000 PORT = 2094 -[TESTING] -WEAKRANDOM = NO - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - +[transport-udp] +PORT = 2094 -[nse] -AUTOSTART = NO diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index 9366b4ef4..09a45e5e9 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -1,122 +1,33 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-http-p1/ +DEFAULTCONFIG = test_transport_api_http_peer1.conf + [transport-http] PORT = 12080 DEBUG = NO USE_IPv6 = YES USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = http -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12081 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12082 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12083 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12084 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12085 UNIXPATH = /tmp/gnunet-p1-service-arm.sock +[statistics] +PORT = 12084 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-http-p1/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - +[resolver] +PORT = 12083 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12082 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12081 +PLUGINS = http +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index b3d21578a..3c3b269bb 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -1,122 +1,33 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-http-p2/ +DEFAULTCONFIG = test_transport_api_http_peer2.conf + [transport-http] PORT = 12090 -DEBUG = NO USE_IPv6 = YES USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 USE_LOCALADDR = YES -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = http -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12091 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport1 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12092 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12093 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12094 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock - - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12095 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-http-p2/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12094 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12093 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12092 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12091 +PLUGINS = http +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index 719d9dd20..7a3a225f0 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf @@ -1,126 +1,35 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-https-p1/ +DEFAULTCONFIG = test_transport_api_https_peer1.conf + [transport-https] PORT = 12100 -DEBUG = NO -USE_IPv6 = YES -USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL KEY_FILE = $SERVICEHOME/https_key_p1.key CERT_FILE = $SERVICEHOME/https_cert_p1.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE -USE_LOCALADDR = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = https -DEBUG = NO -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12101 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12102 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +USE_IPv6 = YES +USE_IPv4 = YES -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12103 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[arm] +PORT = 12105 [statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12104 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock -[arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12105 - -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-https-p1/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - +[resolver] +PORT = 12103 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12102 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12101 +PLUGINS = https +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +DEBUG = NO diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index 82206003a..2c45b27f7 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf @@ -1,128 +1,36 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-https-p2/ +DEFAULTCONFIG = test_transport_api_https_peer2.conf + [transport-https] PORT = 12110 -DEBUG = NO -USE_IPv6 = YES -USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL KEY_FILE = $SERVICEHOME/https_key_p2.key CERT_FILE = $SERVICEHOME/https_cert_p2.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE -USE_LOCALADDR = YES - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = https -#PLUGINS = tcp http -DEBUG = NO -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12111 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport1 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12112 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12113 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12114 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock - +USE_IPv6 = YES +USE_IPv4 = YES [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12115 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-https-p2/ - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12114 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12113 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12112 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12111 +PLUGINS = https +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +DEBUG = NO diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index a3e315001..f3ee31bb1 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf @@ -1,152 +1,47 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-multi-p1/ +DEFAULTCONFIG = test_transport_api_multi_peer1.conf + [transport-tcp] PORT = 12140 -#BINDTO = 127.0.0.1 -USE_LOCALADDR = YES - -[nat] -DISABLEV6 = YES -BEHIND_NAT = NO -#ALLOW_NAT = NO -ENABLE_UPNP = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 +TIMEOUT = 5000 [transport-udp] PORT = 12141 -USE_LOCALADDR = YES [transport-http] PORT = 12142 -DEBUG = NO USE_IPv6 = YES USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES [transport-https] PORT = 12143 -DEBUG = NO USE_IPv6 = YES USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES - -[transport-unix] -PORT = 12144 - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp udp unix -#DEBUG = YES -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12145 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12146 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12147 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12148 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12149 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_multi_peer1.conf -SERVICEHOME = /tmp/test-transport/api-multi-p1/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12148 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12147 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12146 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12145 +PLUGINS = tcp udp unix +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +[transport-unix] +PORT = 12144 diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 222f165f0..889145fc3 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf @@ -1,154 +1,50 @@ -[transport-tcp] -PORT = 12150 -USE_LOCALADDR = YES +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-multi-p2/ +DEFAULTCONFIG = test_transport_api_multi_peer2.conf [nat] -BINDTO = 127.0.0.1 -DISABLEV6 = YES -BEHIND_NAT = NO ALLOW_NAT = NO -ENABLE_UPNP = NO -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 + +[transport-tcp] +PORT = 12150 +TIMEOUT = 5000 [transport-udp] PORT = 12151 -USE_LOCALADDR = YES [transport-http] PORT = 12152 -DEBUG = NO USE_IPv6 = YES USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES [transport-https] PORT = 12153 -DEBUG = NO USE_IPv6 = YES USE_IPv4 = YES -#BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES - -[transport-unix] -PORT = 12154 - -[core] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp udp unix -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12155 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = valgrind --tool=callgrind -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12156 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12157 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12158 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12159 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_multi_peer2.conf -SERVICEHOME = /tmp/test-transport/api-multi-p2/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12158 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12157 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12156 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12155 +PLUGINS = tcp udp unix +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +[transport-unix] +PORT = 12154 diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf b/src/transport/test_transport_api_multiaddress_tcp_peer1.conf index 2172a5e01..974481fde 100644 --- a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf +++ b/src/transport/test_transport_api_multiaddress_tcp_peer1.conf @@ -1,23 +1,33 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-p1/ +DEFAULTCONFIG = template_cfg_peer1.conf + [transport-tcp] PORT = 12000 +TIMEOUT = 5000 BINDTO = 127.0.0.1 -[nat] -DISABLEV6 = YES -BEHIND_NAT = NO -#ALLOW_NAT = NO -ENABLE_UPNP = NO -#INTERNAL_ADDRESS = 127.0.0.1 -#EXTERNAL_ADDRESS = 127.0.0.1 -USE_LOCALADDR = YES +[arm] +PORT = 12005 +DEFAULTSERVICES = transport +UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[transport] -DEBUG = NO -#PREFIX = valgrind --leak-check=full +[statistics] +PORT = 12004 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock -@INLINE@ template_cfg_peer1.conf +[resolver] +PORT = 12003 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock -[nse] -AUTOSTART = NO +[peerinfo] +PORT = 12002 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock + +[transport] +PORT = 12001 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +DEBUG = NO diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf b/src/transport/test_transport_api_multiaddress_tcp_peer2.conf index f166790a8..0d4869f77 100644 --- a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf +++ b/src/transport/test_transport_api_multiaddress_tcp_peer2.conf @@ -1,23 +1,36 @@ -[transport-tcp] -PORT = 12200 -BINDTO = 127.0.0.1 +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-p2/ +DEFAULTCONFIG = template_cfg_peer2.conf [nat] -DISABLEV6 = YES -BEHIND_NAT = NO ALLOW_NAT = NO -ENABLE_UPNP = NO -#EXTERNAL_ADDRESS = 127.0.0.1 -#INTERNAL_ADDRESS = 127.0.0.1 -USE_LOCALADDR = YES -[transport] -DEBUG = NO -#PREFIX = valgrind --leak-check=full +[transport-tcp] +PORT = 0 +TIMEOUT = 5000 +BINDTO = 127.0.0.1 -@INLINE@ template_cfg_peer2.conf +[arm] +PORT = 12014 +DEFAULTSERVICES = transport +UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[nse] -AUTOSTART = NO +[statistics] +PORT = 12013 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock + +[resolver] +PORT = 12012 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock + +[peerinfo] +PORT = 12011 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock + +[transport] +PORT = 12010 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +DEBUG = NO diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf index b497f585d..bea885f6b 100644 --- a/src/transport/test_transport_api_rel_http_peer1.conf +++ b/src/transport/test_transport_api_rel_http_peer1.conf @@ -1,123 +1,36 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-http-p1/ +DEFAULTCONFIG = test_transport_api_rel_http_peer1.conf + +[transport-tcp] +TIMEOUT = 5000 + [transport-http] PORT = 12180 -DEBUG = NO USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = http -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12181 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=callgrind --callgrind-out-file=http_rel_peer1.out -#PREFIX = strace -c -o strace_peer1.txt - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12182 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12183 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12184 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12185 UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-http-p1/ - - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12184 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12183 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12182 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12181 +PLUGINS = http +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf index 192d9d8ae..cb8ce89b5 100644 --- a/src/transport/test_transport_api_rel_http_peer2.conf +++ b/src/transport/test_transport_api_rel_http_peer2.conf @@ -1,124 +1,33 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-http-p2/ +DEFAULTCONFIG = test_transport_api_rel_http_peer2.conf + [transport-http] PORT = 12190 -DEBUG = NO USE_IPv4 = YES USE_IPv6 = NO BINDTO4 = 127.0.0.1 -#BINDTO6 = ::1 -USE_LOCALADDR = YES -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = http -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12191 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport1 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif -#PREFIX = valgrind --tool=callgrind --callgrind-out-file=http_rel_peer2.out -#PREFIX = strace -c -o strace_peer2.txt - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12192 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12193 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12194 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12195 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-http-p2/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12194 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12193 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12192 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12191 +PLUGINS = http +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf index c54c3a784..c872b8549 100644 --- a/src/transport/test_transport_api_rel_https_peer1.conf +++ b/src/transport/test_transport_api_rel_https_peer1.conf @@ -1,124 +1,35 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-https-p1/ +DEFAULTCONFIG = test_transport_api_rel_https_peer1.conf + [transport-https] PORT = 12300 +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +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 -#BINDTO6 = ::1 -USE_LOCALADDR = YES -KEY_FILE = $SERVICEHOME/https_key_p1.key -CERT_FILE = $SERVICEHOME/https_cert_p1.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = https -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12301 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12302 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12303 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12304 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12305 UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-https-p1/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - +[statistics] +PORT = 12304 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12303 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock -[nse] -AUTOSTART = NO +[peerinfo] +PORT = 12302 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +[transport] +PORT = 12301 +PLUGINS = https +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf index 8ab1cfcf4..fac1590bb 100644 --- a/src/transport/test_transport_api_rel_https_peer2.conf +++ b/src/transport/test_transport_api_rel_https_peer2.conf @@ -1,127 +1,36 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-https-p2/ +DEFAULTCONFIG = test_transport_api_rel_https_peer2.conf + [transport-https] PORT = 12310 -DEBUG = NO +CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL +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 -#BINDTO6 = ::1 -KEY_FILE = $SERVICEHOME/https_key_p2.key -CERT_FILE = $SERVICEHOME/https_cert_p2.crt -CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL -#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL -#CRYPTO_INIT = PERFORMANCE -USE_LOCALADDR = YES - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = https -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12311 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport1 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full -#PREFIX = valgrind --tool=massif - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12312 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12313 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12314 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12315 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-https-p2/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12314 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12313 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12312 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12311 +PLUGINS = https +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 935d96780..77cf34f6c 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf @@ -1,125 +1,36 @@ -[transport-tcp] -PORT = 12020 -USE_LOCALADDR = YES +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ +DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf [nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 BEHIND_NAT = YES ENABLE_NAT_SERVER = YES -#NAT_PUNCHED = YES -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp -#DEBUG = YES -#PREFIX = xterm -T transport2 --args -#PREFIX = valgrind --leak-check=full -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 29542 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12021 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12022 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +DISABLEV6 = YES -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12023 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[transport-tcp] +PORT = 12020 +TIMEOUT = 5000 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 1204 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -DISABLEV6 = YES -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf -SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - - -[dht] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12023 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12022 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12021 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 29542 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index 3040a0f8f..1b5586c4f 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf @@ -1,126 +1,35 @@ -[transport-tcp] -PORT = 12030 -USE_LOCALADDR = YES +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ +DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf [nat] -BINDTO = 127.0.0.1 DISABLEV6 = YES -BEHIND_NAT = NO ENABLE_NAT_CLIENT = YES -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 -[transport] -PLUGINS = tcp -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 45923 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport2 -e gdb --args -#PREFIX = valgrind --leak-check=full - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12031 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12032 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12033 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[transport-tcp] +PORT = 12030 +TIMEOUT = 5000 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12034 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -DISABLEV6 = YES -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf -SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/ - -[core] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12033 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12032 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12031 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 45923 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 36c148f98..1c770dd4f 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -1,126 +1,31 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-p1/ +DEFAULTCONFIG = test_transport_api_tcp_peer1.conf + [transport-tcp] PORT = 12000 - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -BEHIND_NAT = NO -#ALLOW_NAT = NO -ENABLE_UPNP = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp -#DEBUG = YES -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -#BINARY = gnunet-service-transport -#BINARY = /home/grothoff/bin/gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +TIMEOUT = 5000 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12005 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf -SERVICEHOME = /tmp/test-transport/api-tcp-p1/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12004 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12003 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12002 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12001 +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index c862a3556..f849dcaaa 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -1,126 +1,30 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-tcp-p2/ +DEFAULTCONFIG = test_transport_api_tcp_peer2.conf + [transport-tcp] PORT = 0 - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -BEHIND_NAT = NO -#ALLOW_NAT = NO -ENABLE_UPNP = NO -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = tcp -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -#BINARY = /home/grothoff/bin/gnunet-service-transport -#BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12010 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg -#PREFIX = xterm -T transport2 -e gdb --command=cmd --args -#PREFIX = valgrind --leak-check=full - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +TIMEOUT = 5000 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12014 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf -SERVICEHOME = /tmp/test-transport/api-tcp-p2/ - -[core] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - +[statistics] +PORT = 12013 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12012 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock -[nse] -AUTOSTART = NO +[peerinfo] +PORT = 12011 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +[transport] +PORT = 12010 +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 36a6056e9..562e9bb1d 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf @@ -1,123 +1,37 @@ -[transport-udp] -PORT = 12060 -USE_LOCALADDR = YES +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ +DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf [nat] BEHIND_NAT = YES -BINDTO = 127.0.0.1 ALLOW_NAT = NO ONLY_NAT_ADDRESSES = YES -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 -[transport] -PLUGINS = udp -DEBUG = NO -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12061 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log -#PREFIX = xterm -e xterm -T transport -e gdb --args - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12062 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12063 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12064 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[transport-udp] +PORT = 12060 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12065 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf -SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/ - -[mesh] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[datastore-sqlite] -FILENAME = $SERVICEHOME/datastore/sqlite.db - -[datastore] -AUTOSTART = NO - -[dns] -AUTOSTART = NO - -[core] -AUTOSTART = NO +[statistics] +PORT = 12064 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12063 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12062 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12061 +PLUGINS = udp +UNIXPATH = /tmp/gnunet-p1-service-transport.sock +DEBUG = NO diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index a5ef89ae5..2eb82f4bf 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf @@ -1,123 +1,35 @@ -[transport-udp] -PORT = 12070 -USE_LOCALADDR = YES +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ +DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf [nat] -BINDTO = 127.0.0.1 -BEHIND_NAT = NO ALLOW_NAT = YES -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -PLUGINS = udp -DEBUG = NO -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12071 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -e xterm -T transport -e gdb --args -#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12072 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12073 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12074 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[transport-udp] +PORT = 12070 [arm] -DEFAULTSERVICES = transport -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12075 +DEFAULTSERVICES = transport UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf -SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/ - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12074 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12073 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12072 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12071 +PLUGINS = udp +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +DEBUG = NO diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index d6dc381b5..b57bdee53 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -1,124 +1,31 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-udp-p1/ +DEFAULTCONFIG = test_transport_api_udp_peer1.conf + [transport-udp] PORT = 12040 MAX_BPS = 50000000 -[fs] -AUTOSTART = NO - -[nat] -# Are we behind NAT? -BEHIND_NAT = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -PLUGINS = udp -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12041 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock -#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log -#PREFIX = xterm -e xterm -T transport -e gdb --args - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12042 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12043 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12044 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12045 UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_udp_peer1.conf -SERVICEHOME = /tmp/test-transport/api-udp-p1/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12044 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12043 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12042 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12041 +PLUGINS = udp +UNIXPATH = /tmp/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 c4dfde28c..cf54000e6 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -1,120 +1,31 @@ +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-udp-p2/ +DEFAULTCONFIG = test_transport_api_udp_peer2.conf + [transport-udp] PORT = 12050 MAX_BPS = 50000000 -[nat] -# Are we behind NAT? -BEHIND_NAT = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = udp -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12051 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12052 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12053 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12054 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock - [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12055 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_udp_peer2.conf -SERVICEHOME = /tmp/test-transport/api-udp-p2/ - - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12054 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12053 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12052 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12051 +PLUGINS = udp +UNIXPATH = /tmp/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 f98e3b290..c6b2d2a68 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf @@ -1,117 +1,29 @@ -[transport-unix] -PORT = 12120 - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[core] -AUTOSTART = NO - -[transport] -PLUGINS = unix -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12121 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock - - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12122 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12123 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12124 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-unix-p1/ +DEFAULTCONFIG = test_transport_api_unix_peer1.conf [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12125 UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_unix_peer1.conf -SERVICEHOME = /tmp/test-transport/api-unix-p1/ - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12124 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12123 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12122 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12121 +PLUGINS = unix +UNIXPATH = /tmp/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 3714981b9..bed415b65 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf @@ -1,116 +1,29 @@ -[transport-unix] -PORT = 12130 - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = unix -#DEBUG = YES -PREFIX = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12131 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12132 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12133 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12134 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-unix-p2/ +DEFAULTCONFIG = test_transport_api_unix_peer2.conf [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12135 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = test_transport_api_unix_peer2.conf -SERVICEHOME = /tmp/test-transport/api-unix-p2/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12134 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12133 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +[peerinfo] +PORT = 12132 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12131 +PLUGINS = unix +UNIXPATH = /tmp/gnunet-p2-service-transport.sock +[transport-unix] +PORT = 12131 diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index 2bcaa6cd8..704fd55b1 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf @@ -1,121 +1,30 @@ -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-wlan-p1/ +DEFAULTCONFIG = test_transport_api_wlan_peer1.conf [transport-wlan] -INTERFACE = mon0 TESTMODE = 1 -#PREFIX = gdbserver :2345 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = wlan -#DEBUG=YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12160 -UNIXPATH = /tmp/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 - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -#CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12164 UNIXPATH = /tmp/gnunet-p1-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-wlan-p1/ - - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO +[statistics] +PORT = 12163 +UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +[resolver] +PORT = 12162 +UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +[peerinfo] +PORT = 12161 +UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock -[nse] -AUTOSTART = NO +[transport] +PORT = 12160 +PLUGINS = wlan +UNIXPATH = /tmp/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 3230f898c..2ab9811ea 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf @@ -1,120 +1,30 @@ -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[core] -AUTOSTART = NO +@INLINE@ test_transport_defaults.conf +[PATHS] +SERVICEHOME = /tmp/test-transport/api-wlan-p2/ +DEFAULTCONFIG = test_transport_api_wlan_peer2.conf [transport-wlan] INTERFACE = mon1 TESTMODE = 2 -#PREFIX = gdbserver :2346 - -[hostlist] -HTTP-PROXY = -SERVERS = http://gnunet.org:8080/ -OPTIONS = -b -BINARY = gnunet-daemon-hostlist -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -HTTPPORT = 8080 - -[topology] -BINARY = gnunet-daemon-topology -CONFIG = $DEFAULTCONFIG -FRIENDS = $SERVICEHOME/friends -TARGET-CONNECTION-COUNT = 16 -AUTOCONNECT = YES -FRIENDS-ONLY = NO -MINIMUM-FRIENDS = 0 - -[transport] -PLUGINS = wlan -#DEBUG = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -BINARY = gnunet-service-transport -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12170 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock -#PREFIX = xterm -T transport1 -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 :2346 - -[peerinfo] -TRUST = $SERVICEHOME/data/credit/ -HOSTS = $SERVICEHOME/data/hosts/ -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-peerinfo -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock - -[resolver] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-resolver -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock - -[statistics] -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-statistics -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost -PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock [arm] -DEFAULTSERVICES = -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -BINARY = gnunet-service-arm -CONFIG = $DEFAULTCONFIG -HOME = $SERVICEHOME -HOSTNAME = localhost PORT = 12174 UNIXPATH = /tmp/gnunet-p2-service-arm.sock -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-transport/api-wlan-p2/ - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - +[statistics] +PORT = 12173 +UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +[resolver] +PORT = 12172 +UNIXPATH = /tmp/gnunet-p2-service-resolver.sock -[nse] -AUTOSTART = NO +[peerinfo] +PORT = 12171 +UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +[transport] +PORT = 12170 +PLUGINS = wlan +UNIXPATH = /tmp/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf index 480ccf0f3..ab6e9cb5a 100644 --- a/src/transport/test_transport_ats_1addr.conf +++ b/src/transport/test_transport_ats_1addr.conf @@ -1,26 +1,13 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data.conf -[resolver] -PORT = 2564 +[TESTING] +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -[transport] -PORT = 2565 -PLUGINS = unix -#DEBUG = YES -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#WAN_BW_LIMIT_DOWN = 100 -#WAN_BW_LIMIT_UP = 1000000 -#LAN_BW_LIMIT_DOWN = 100 -#LAN_BW_LIMIT_UP = 100000000 -#WLAN_ENERGY_DOWN_LIMIT = 0 -#WLAN_ENERGY_UP_LIMIT = 30 -#DUMP_MLP = YES -#DUMP_SOLUTION = YES -ATS_MIN_INTERVAL = 100 -ATS_EXEC_INTERVAL = 250 +[nat] +ALLOW_NAT = NO [arm] PORT = 2566 @@ -29,53 +16,22 @@ DEFAULTSERVICES = core [statistics] PORT = 2567 - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -BEHIND_NAT = NO -ALLOW_NAT = NO -ENABLE_UPNP = NO -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 - -[transport-unix] -PORT = 2572 - - -[transport-udp] -PORT = 2571 -USE_LOCALADDR = YES +[resolver] +PORT = 2564 [peerinfo] PORT = 2569 +[transport] +PORT = 2565 +PLUGINS = unix +ATS_MIN_INTERVAL = 100 +ATS_EXEC_INTERVAL = 250 + [core] +AUTOSTART = YES PORT = 2570 -[testing] -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +[transport-unix] +PORT = 2572 diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf index 264a6b566..3b5a6a87a 100644 --- a/src/transport/test_transport_ats_2addr.conf +++ b/src/transport/test_transport_ats_2addr.conf @@ -1,26 +1,13 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data.conf -[resolver] -PORT = 2564 +[TESTING] +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -[transport] -PORT = 2565 -PLUGINS = udp unix -#DEBUG = YES -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=logs%p -#WAN_BW_LIMIT_DOWN = 100 -#WAN_BW_LIMIT_UP = 1000000 -#LAN_BW_LIMIT_DOWN = 100 -#LAN_BW_LIMIT_UP = 100000000 -#WLAN_ENERGY_DOWN_LIMIT = 0 -#WLAN_ENERGY_UP_LIMIT = 30 -#DUMP_MLP = YES -#DUMP_SOLUTION = YES -ATS_MIN_INTERVAL = 100 -ATS_EXEC_INTERVAL = 250 +[transport-udp] +PORT = 2571 [arm] PORT = 2566 @@ -29,54 +16,22 @@ DEFAULTSERVICES = core [statistics] PORT = 2567 -[transport-tcp] -USE_LOCALADDR = YES - -[nat] -BINDTO = 127.0.0.1 -#BEHIND_NAT = NO -#ALLOW_NAT = NO -#ENABLE_UPNP = NO -#EXTERNAL_ADDRESS = 127.0.0.1 -#INTERNAL_ADDRESS = 127.0.0.1 - -[transport-unix] -PORT = 2572 - - -[transport-udp] -PORT = 2571 -USE_LOCALADDR = YES +[resolver] +PORT = 2564 [peerinfo] PORT = 2569 +[transport] +PORT = 2565 +PLUGINS = udp unix +ATS_MIN_INTERVAL = 100 +ATS_EXEC_INTERVAL = 250 + [core] +AUTOSTART = YES PORT = 2570 -[testing] -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +[transport-unix] +PORT = 2572 diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf index d71ad2b14..2fb476ced 100644 --- a/src/transport/test_transport_ats_4addr.conf +++ b/src/transport/test_transport_ats_4addr.conf @@ -1,29 +1,19 @@ +@INLINE@ test_transport_defaults.conf [PATHS] SERVICEHOME = /tmp/test-gnunet-testing/ DEFAULTCONFIG = test_testing_data.conf -[resolver] -PORT = 2564 +[TESTING] +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -[transport] -PORT = 2565 -PLUGINS = tcp -#DEBUG = YES -#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args -#PREFIX = valgrind --tool=memcheck --log-file=multiple_peers/logs%p -#WAN_BW_LIMIT_DOWN = 100 -#WAN_BW_LIMIT_UP = 1000000 -#LAN_BW_LIMIT_DOWN = 100 -#LAN_BW_LIMIT_UP = 100000000 -#WLAN_ENERGY_DOWN_LIMIT = 0 -#WLAN_ENERGY_UP_LIMIT = 30 -#DUMP_MLP = YES -#DUMP_OVERWRITE = YES -#DUMP_MIN_PEERS = 500 -#DUMP_MIN_ADDRS = 2000 -#DUMP_SOLUTION = YES -ATS_MIN_INTERVAL = 100 -ATS_EXEC_INTERVAL = 250 +[nat] +ALLOW_NAT = NO + +[transport-tcp] +TIMEOUT = 5000 + +[transport-udp] +PORT = 2571 [arm] PORT = 2566 @@ -32,55 +22,21 @@ DEFAULTSERVICES = core [statistics] PORT = 2567 -[transport-tcp] -USE_LOCALADDR = YES - -[nat] -DISABLEV6 = YES -BINDTO = 127.0.0.1 -BEHIND_NAT = NO -ALLOW_NAT = NO -ENABLE_UPNP = NO -EXTERNAL_ADDRESS = 127.0.0.1 -INTERNAL_ADDRESS = 127.0.0.1 - -[transport-unix] -PORT = 2572 - - -[transport-udp] -PORT = 2571 -USE_LOCALADDR = YES +[resolver] +PORT = 2564 [peerinfo] PORT = 2569 +[transport] +PORT = 2565 +ATS_MIN_INTERVAL = 100 +ATS_EXEC_INTERVAL = 250 + [core] +AUTOSTART = YES PORT = 2570 -[testing] -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[fs] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[dht] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - - -[dns] -AUTOSTART = NO - - - -[nse] -AUTOSTART = NO - +[transport-unix] +PORT = 2572 diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf new file mode 100644 index 000000000..6daf49857 --- /dev/null +++ b/src/transport/test_transport_defaults.conf @@ -0,0 +1,46 @@ +[PATHS] +SERVICEHOME = /tmp/test-transport-api/ +DEFAULTCONFIG = test_transport_defaults.conf + +[transport-tcp] +TIMEOUT = 300000 + +[arm] +DEFAULTSERVICES = topology hostlist + +[transport] +PREFIX = + +[core] +AUTOSTART = NO + +[hostlist] +SERVERS = http://localhost:8080/ +HOSTNAME = localhost + +[datastore] +AUTOSTART = NO + +[fs] +AUTOSTART = NO + +[dht] +AUTOSTART = NO + +[mesh] +AUTOSTART = NO + +[nse] +AUTOSTART = NO + +[dns] +AUTOSTART = NO + +[nat] +DISABLEV6 = YES +BINDTO = 127.0.0.1 +INTERNAL_ADDRESS = 127.0.0.1 +EXTERNAL_ADDRESS = 127.0.0.1 + +[TESTING] +WEAKRANDOM = YES -- cgit v1.2.3