simplifying config

author Christian Grothoff <christian@grothoff.org>

Mon, 1 Aug 2011 13:35:31 +0000 (13:35 +0000)

committer Christian Grothoff <christian@grothoff.org>

Mon, 1 Aug 2011 13:35:31 +0000 (13:35 +0000)
author Christian Grothoff <christian@grothoff.org>
Mon, 1 Aug 2011 13:35:31 +0000 (13:35 +0000)
committer Christian Grothoff <christian@grothoff.org>
Mon, 1 Aug 2011 13:35:31 +0000 (13:35 +0000)
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am

index 864dd823100f906b96c76e1fd274a3c0bd852874..2ce2a48be15f5055c84904005ec925954c046f99 100644 (file)
--- 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 36c148f986c7d99d39ee748546d9118c81ba3c9f..d724a6e8bbc8e593f1d124a796bd0b03ce722efd 100644 (file)
--- 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 c862a3556cac59a1a3c24fb36b760afd7fb03109..2fb65b9c9bfd2ff75757f5ba3b5a4b412e348da8 100644 (file)
--- 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 3297493141d0fedd9dbd7b0001b646a07d383e89..e3e619fb3fd499265570255b7f7dc68ead4e66e8 100644 (file)
--- 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 68b526cc83c7670693616428c0f3cf99e4938f3d..e3982a1f54f5535f054765b2b7e69f8bf0d393e9 100644 (file)
--- 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 173addc7fcfd55aeb94dcbcdd44504079087630e..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- 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 8851380762447b6d9ba8f1abed4c4116bb03cb1c..7f93a15ba4a396755d7aab0dc2827856ddf812c4 100644 (file)
--- 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 8d8229857c3d89b8a4edc5c503443aa5efd6caee..0411accaa00424daa69141bda94cfad61bb12eb4 100644 (file)
--- 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 9b3dc96945c04905cd37d818ac140d63afe6b47e..747c921141589a7b67e8c9b62ef0a35794941179 100644 (file)
--- 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 1e6844462c96f8e1f7e92a6f1c367d18bad27b3c..692077c55fdd6ed373eaea00723da47ba954a79e 100644 (file)
--- 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 a27e8ccf9a5c960f8279cf11d439ce43fd8c6767..0d22f9c780001cf6520bd56e907c44c59a331d53 100644 (file)
--- 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 a8ea8a11c687afd8b777202c6142846d53d9d204..99b8311ee2e64654d98678f672c2560e162fc833 100644 (file)
--- 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 b79ed1f30ea7ca608623e923d23c89c76079983a..11457d0ace65ba1f12c7d729a4a7d38851fce628 100644 (file)
--- 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 f62cceb2fa49a578a28061edaed76a5a7377898a..c524966d2e51c451dac32b2acae3e0938cbcab0f 100644 (file)
--- 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 b06ac66f0d4d8b97d5eeb33a891942a5c9755435..ca590cfc63df37ee2d529d33f80cfb41a3929c9c 100644 (file)
--- 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 a85c2643b4fe62f04e323ba72b9107a2b48bb0d2..0952b739f3127d5ae1457361937fa9bfc464c7cf 100644 (file)
--- 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 7f84b9087f1d630f118175652a9f25a50be385e1..86c6701badfd4cb5ac965ecaabfca8dcdb652f0e 100644 (file)
--- 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 a4c253e282f718bac3ce5c844ba8304a1540c906..39552462a95e26f2a5c9a66ac3a4d9cfaec17f49 100644 (file)
--- 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 9366b4ef445f2adad2da61d71d77565b9fb7e292..09a45e5e9668c5b6cbddca5bcdf5bdae5b271900 100644 (file)
--- 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 b3d21578aad988b6c83607d583f8828b8720fbcf..3c3b269bbb1cc54d94da464e2ddbbac22fdb63cf 100644 (file)
--- 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 719d9dd203fc130655e3a1402b079f410a91721f..7a3a225f07e77341752db19548e8b82361ec03dd 100644 (file)
--- 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 82206003ab708d3235df751c7e248e29660cc2d3..2c45b27f71adabf018787c408f39a419eb2cebe4 100644 (file)
--- 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 a3e315001d103b11d958c7cc982cec930855b9a6..f3ee31bb10e6b8543c8ee0848cc9181a5bc46657 100644 (file)
--- 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 222f165f006a749e6ee0bdc9d5862c83869d8307..889145fc3ceee1825e6d61065ea1f32a65732692 100644 (file)
--- 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 2172a5e0175d0b6a152d23e316b084ff0d2d8718..974481fde5166e87e94295659b459ed42c522eca 100644 (file)
--- 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 f166790a8045fc05a9cb453db313aed61c55d985..0d4869f77aa4ceeb5a89b9d2fbe20afda4483e77 100644 (file)
--- 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 b497f585df7bf91632198b4e0ac5ad659e19d00c..bea885f6b9c76be83668f116c1ff5f04985fbea4 100644 (file)
--- 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 192d9d8aec5101cab12a064498db0654eebd9bf1..cb8ce89b5e06d54d8ab78551ab6889c609b95549 100644 (file)
--- 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 c54c3a784c286e6d54e43e314007618f35f1f790..c872b85499a051ca82b9afb1bde4c04f1a22ca5d 100644 (file)
--- 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 8ab1cfcf459d20f97da8471840c4c8534625c48c..fac1590bbe47018aa459c67fdf843d59ed85e3ad 100644 (file)
--- 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 935d967809e767a49d34971d803461356ebf493a..77cf34f6cb3e00029a680a54405f5c29b096a6ee 100644 (file)
--- 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 3040a0f8fc8412dc54de5986ed8b49ddeff92646..1b5586c4fafffcab48f82eca200a4b52c2a19c8f 100644 (file)
--- 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 36c148f986c7d99d39ee748546d9118c81ba3c9f..1c770dd4fc23da0fbd128f76d8eb1ee4c48b2c68 100644 (file)
--- 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 c862a3556cac59a1a3c24fb36b760afd7fb03109..f849dcaaa9aeaec6ea0ea7a17cafbe7bf0003ae6 100644 (file)
--- 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 36a6056e92ce0e6497b38867f204fa1f190eb298..562e9bb1d17f4532ae2191e7da8e45c74fd6166b 100644 (file)
--- 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 a5ef89ae51280e80bc01bfc59d9bcf9392ac6308..2eb82f4bf7589e68ba9684f277314100089364db 100644 (file)
--- 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 d6dc381b52d446ccf37bcd76bba86e4545923b05..b57bdee53781c07b5764da27d6ed139a76680997 100644 (file)
--- 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 c4dfde28c153333ca6511ec2893293d99d1e2470..cf54000e6e5301e73b5d4aea4729b55efc4d92d5 100644 (file)
--- 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 f98e3b290512417ab962f2ec3cc36e374648d876..c6b2d2a68dcb10f35a052281526fde4151734cd9 100644 (file)
--- 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 3714981b99cbcf45a6137e5530dc2f127501de71..bed415b65ce842510f14d26d21f0009e23831df7 100644 (file)
--- 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 2bcaa6cd8e2e08d1c2b3545d563d999024a8c5cf..704fd55b1c2104e5f2cba3b23762987b6f077938 100644 (file)
--- 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 3230f898cdaa3d217a81e93991e58f877adbc9a1..2ab9811ea642126ac879e150970461f144d16528 100644 (file)
--- 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 480ccf0f3f7e60c924e775d27ca111072d33527f..ab6e9cb5ae41e97153c16e367277afafc07fbe04 100644 (file)
--- 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 264a6b566910dce13fe1f669c843d142bdcf3395..3b5a6a87a83b45d68f09722403a34c3b961ba8ac 100644 (file)
--- 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 d71ad2b1471dc6c1ec8183eff4598c3c62bbe3f1..2fb476ced3154e7b08efa4d26b573a5b414ea171 100644 (file)
--- 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 (file)

index 0000000..6daf498
--- /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
author	Christian Grothoff <christian@grothoff.org>
	Mon, 1 Aug 2011 13:35:31 +0000 (13:35 +0000)
committer	Christian Grothoff <christian@grothoff.org>
	Mon, 1 Aug 2011 13:35:31 +0000 (13:35 +0000)
src/transport/Makefile.am		patch \| blob \| history
src/transport/template_cfg_peer1.conf		patch \| blob \| history
src/transport/template_cfg_peer2.conf		patch \| blob \| history
src/transport/test_plugin_transport_data.conf		patch \| blob \| history
src/transport/test_plugin_transport_data_http.conf		patch \| blob \| history
src/transport/test_plugin_transport_data_udp.conf		patch \| blob \| history
src/transport/test_quota_compliance_data.conf		patch \| blob \| history
src/transport/test_quota_compliance_http_peer1.conf		patch \| blob \| history
src/transport/test_quota_compliance_http_peer2.conf		patch \| blob \| history
src/transport/test_quota_compliance_https_peer1.conf		patch \| blob \| history
src/transport/test_quota_compliance_https_peer2.conf		patch \| blob \| history
src/transport/test_quota_compliance_tcp_peer1.conf		patch \| blob \| history
src/transport/test_quota_compliance_tcp_peer2.conf		patch \| blob \| history
src/transport/test_quota_compliance_udp_peer1.conf		patch \| blob \| history
src/transport/test_quota_compliance_udp_peer2.conf		patch \| blob \| history
src/transport/test_quota_compliance_unix_peer1.conf		patch \| blob \| history
src/transport/test_quota_compliance_unix_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_data.conf		patch \| blob \| history
src/transport/test_transport_api_http_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_http_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_https_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_https_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_multi_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_multi_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_multiaddress_tcp_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_multiaddress_tcp_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_rel_http_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_rel_http_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_rel_https_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_rel_https_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_tcp_nat_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_tcp_nat_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_tcp_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_tcp_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_udp_nat_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_udp_nat_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_udp_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_udp_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_unix_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_unix_peer2.conf		patch \| blob \| history
src/transport/test_transport_api_wlan_peer1.conf		patch \| blob \| history
src/transport/test_transport_api_wlan_peer2.conf		patch \| blob \| history
src/transport/test_transport_ats_1addr.conf		patch \| blob \| history
src/transport/test_transport_ats_2addr.conf		patch \| blob \| history
src/transport/test_transport_ats_4addr.conf		patch \| blob \| history
src/transport/test_transport_defaults.conf	[new file with mode: 0644]	patch \| blob