[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28923 - in gnunet/src/integration-tests: . confs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r28923 - in gnunet/src/integration-tests: . confs |
|
Date: |
Fri, 30 Aug 2013 17:48:50 +0200 |
Author: wachs
Date: 2013-08-30 17:48:50 +0200 (Fri, 30 Aug 2013)
New Revision: 28923
Added:
gnunet/src/integration-tests/confs/test_defaults.conf
Removed:
gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
Modified:
gnunet/src/integration-tests/Makefile.am
gnunet/src/integration-tests/confs/c_bootstrap_server.conf
gnunet/src/integration-tests/confs/c_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
Log:
integration configuration cleanup
Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am 2013-08-30 14:59:20 UTC (rev
28922)
+++ gnunet/src/integration-tests/Makefile.am 2013-08-30 15:48:50 UTC (rev
28923)
@@ -126,8 +126,8 @@
test_integration_restart.py.in \
test_integration_clique.py.in \
test_integration_clique_nat.py.in \
+ confs/test_defaults.conf \
confs/c_bootstrap_server.conf \
- confs/c_bootstrap_server_w_massif.conf \
confs/c_nat_client.conf \
confs/c_no_nat_client_2.conf \
confs/c_no_nat_client.conf \
Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2013-08-30
14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2013-08-30
15:48:50 UTC (rev 28923)
@@ -1,359 +1,84 @@
address@hidden@ confs/test_defaults.conf
+
+
[PATHS]
SERVICEHOME = /tmp/c_bootstrap_server/
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-#HOSTKEY = hostkeys/0000-hostkey
-
[PEER]
PRIVATE_KEY = hostkeys/c_bootstrap_server
-[vpn]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-15
+[arm]
+UNIXPATH = /tmp/test-service-arm-4
+PORT = 20004
-[resolver]
-AUTOSTART = YES
-PORT = 20017
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-14
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[dns]
+UNIXPATH = /tmp/test-service-dns-5
+[core]
+UNIXPATH = /tmp/test-service-core-3
+PORT = 20003
+
+[ats]
+UNIXPATH = /tmp/test-service-ats-9
+PORT = 20012
+
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-13
PORT = 20016
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-13
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20015
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-12
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-11
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20014
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-14
+PORT = 20017
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-1
+PORT = 20000
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nat]
+BEHIND_NAT = NO
-[peerinfo]
-# Do not load HELLOs shipped with GNUnet
-USE_INCLUDED_HELLOS = NO
-AUTOSTART = YES
-PORT = 20013
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-10
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[fs]
+UNIXPATH = /tmp/test-service-fs-6
+PORT = 20005
-[client]
-HOME = $SERVICEHOME
-
-[TESTING]
-WEAKRANDOM = YES
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20012
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-9
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-transport-8
PORT = 20011
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/test-service-transport-8
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
[transport-tcp]
-USE_LOCALADDR = YES
PORT = 20010
ADVERTISED_PORT = 20010
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
[transport-udp]
-USE_LOCALADDR = YES
PORT = 20009
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-[transport-http]
-PORT = 20008
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 20007
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20006
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-7
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20005
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-6
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-5
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20004
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-4
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
OPTIONS = -p
-#SERVERS = http://v9.gnunet.org:58080/
-HTTP-PROXY =
+SERVERs =
-[core]
-AUTOSTART = YES
-PORT = 20003
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-3
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn-15
-[nat]
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-10
+PORT = 20013
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20002
-
[statistics]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-statistics-2
PORT = 20001
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-2
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-[dht]
-AUTOSTART = YES
-PORT = 20000
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[nse]
+UNIXPATH = /tmp/test-service-nse-12
+PORT = 20015
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_server-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[transport-http]
+PORT = 20008
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_server-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[transport-https]
+PORT = 20007
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-[consensus]
-AUTOSTART = NO
-
-
Deleted: gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,348 +0,0 @@
-[PATHS]
-SERVICEHOME = /tmp/c_bootstrap_server/
-
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-HOSTKEY = hostkeys/0000-hostkey
-
-[vpn]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-15
-
-[resolver]
-AUTOSTART = YES
-PORT = 20017
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-14
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-
-[mesh]
-AUTOSTART = YES
-PORT = 20016
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-13
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nse]
-AUTOSTART = YES
-PORT = 20015
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-12
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
-[datastore]
-AUTOSTART = YES
-UNIXPATH = /tmp/test-service-datastore-11
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PORT = 20014
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
-
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[peerinfo]
-AUTOSTART = YES
-PORT = 20013
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-10
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
-
-[client]
-HOME = $SERVICEHOME
-
-[TESTING]
-WEAKRANDOM = YES
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20012
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-9
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
-[transport]
-#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_
--alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_
--alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif
-AUTOSTART = YES
-PORT = 20011
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/test-service-transport-8
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[transport-tcp]
-USE_LOCALADDR = YES
-PORT = 20010
-ADVERTISED_PORT = 20010
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-
-[transport-udp]
-USE_LOCALADDR = YES
-PORT = 20009
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-
-[transport-http]
-PORT = 20008
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 20007
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20006
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-7
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20005
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-6
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-5
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20004
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs dht gns
-UNIXPATH = /tmp/test-service-arm-4
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -p
-#SERVERS = http://v9.gnunet.org:58080/
-HTTP-PROXY =
-
-[core]
-AUTOSTART = YES
-PORT = 20003
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-3
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nat]
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20002
-
-[statistics]
-AUTOSTART = YES
-PORT = 20001
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-2
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[dht]
-AUTOSTART = YES
-PORT = 20000
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[lockmanager]
-AUTOSTART = NO
-[consensus]
-AUTOSTART = NO
-
-
Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf 2013-08-30
14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf 2013-08-30
15:48:50 UTC (rev 28923)
@@ -1,358 +1,66 @@
-[PATHS]
-SERVICEHOME = /tmp/c_nat_client
address@hidden@ test_defaults.conf
-[gnunetd]
-#HOSTKEY = hostkeys/0002-hostkey
+[arm]
+UNIXPATH = /tmp/test-service-arm-46
+PORT = 20058
-[PEER]
-PRIVATE_KEY = hostkeys/c_nat_client
+[core]
+UNIXPATH = /tmp/test-service-core-45
+PORT = 20057
-[client]
-HOME = $SERVICEHOME
+[ats]
+UNIXPATH = /tmp/test-service-ats-51
+PORT = 20066
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-57
-
-
-[resolver]
-AUTOSTART = YES
-PORT = 20071
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-56
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-
-[mesh]
-AUTOSTART = YES
-PORT = 20070
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-55
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nse]
-AUTOSTART = YES
-PORT = 20069
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-54
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-53
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20068
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-56
+PORT = 20071
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-43
+PORT = 20054
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[fs]
+UNIXPATH = /tmp/test-service-fs-48
+PORT = 20059
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
-AUTOSTART = YES
-PORT = 20067
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-52
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
-
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20066
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-51
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-transport-50
PORT = 20065
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/test-service-transport-50
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
[transport-tcp]
PORT = 0
ADVERTISED_PORT = 20064
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 0
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
-[transport-http]
-PORT = 0
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 0
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20060
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-49
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20059
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-48
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-47
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20058
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-46
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
SERVERS = http://localhost:8080/
-HTTP-PROXY =
-[core]
-AUTOSTART = YES
-PORT = 20057
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-45
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_nat_c-1
-[nat]
-BEHIND_NAT = YES
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-52
+PORT = 20067
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20056
+[PATHS]
+SERVICEHOME = /tmp/c_nat_client
-[statistics]
-AUTOSTART = YES
-PORT = 20055
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-44
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
+[PEER]
+PRIVATE_KEY = hostkeys/c_nat_client
-[dht]
-AUTOSTART = YES
-PORT = 20054
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-43
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[nse]
+UNIXPATH = /tmp/test-service-nse-54
+PORT = 20069
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
+[transport-http]
+PORT = 0
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_nat_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_nat_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[lockmanager]
-AUTOSTART = NO
-[consensus]
-AUTOSTART = NO
-
-
+[transport-https]
+PORT = 0
Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf 2013-08-30
14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf 2013-08-30
15:48:50 UTC (rev 28923)
@@ -1,360 +1,118 @@
address@hidden@ confs/test_defaults.conf
+
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-#HOSTKEY = hostkeys/0001-hostkey
-
[PEER]
PRIVATE_KEY = hostkeys/c_no_nat_client
-[gns]
-AUTOSTART = NO
+[arm]
+DEFAULTSERVICES = topology hostlist dht nse mesh fs
+UNIXPATH = /tmp/test-service-arm-18
+PORT = 20022
[namestore]
-AUTOSTART = NO
+AUTOSTART = YES
-[vpn]
+[dns]
+UNIXPATH = /tmp/test-service-dns-19
+
+[consensus]
AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-29
-[resolver]
+[lockmanager]
AUTOSTART = YES
-PORT = 20035
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-28
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[core]
+UNIXPATH = /tmp/test-service-core-17
+PORT = 20021
+
+[ats]
+UNIXPATH = /tmp/test-service-ats-23
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+PORT = 20030
+
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-27
PORT = 20034
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-27
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20033
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-26
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-25
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20032
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-28
+PORT = 20035
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-15
+PORT = 20018
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[dhtcache]
+DATABASE = heap
+QUOTA = 50 MB
-[peerinfo]
-# Do not load HELLOs shipped with GNUnet
-USE_INCLUDED_HELLOS = NO
-AUTOSTART = YES
-PORT = 20031
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-24
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
-[client]
-HOME = $SERVICEHOME
+[gnunet-nat-server]
+PORT = 20020
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
+[fs]
+UNIXPATH = /tmp/test-service-fs-20
+PORT = 20023
-[ats]
-AUTOSTART = YES
-PORT = 20030
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-23
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_
--alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_
--alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif
-AUTOSTART = YES
+PLUGINS = tcp udp
+UNIXPATH = /tmp/test-service-transport-22
+UNIX_MATCH_UID = NO
PORT = 20029
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/test-service-transport-22
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
[transport-tcp]
-USE_LOCALADDR = YES
PORT = 20028
ADVERTISED_PORT = 20028
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
[transport-udp]
-USE_LOCALADDR = YES
PORT = 20027
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
+BROADCAST_INTERVAL = 30 s
-[transport-http]
-PORT = 20026
-MAX_CONNECTIONS = 128
+[hostlist]
+SERVERS = http://localhost:8080/
-[transport-https]
-PORT = 20025
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
+[vpn]
+BINARY = gnunet-service-vpn
+UNIXPATH = /tmp/gnunet-service-vpn-29
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-24
+USE_INCLUDED_HELLOS = YES
+PORT = 20031
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[statistics]
+UNIXPATH = /tmp/test-service-statistics-16
+PORT = 20019
[template]
-AUTOSTART = NO
PORT = 20024
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/test-service-template-21
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20023
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-20
+[nse]
+UNIXPATH = /tmp/test-service-nse-26
UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
+WORKBITS = 22
+PORT = 20033
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
+[gns]
AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-19
-PROVIDE_EXIT = NO
-[arm]
-PORT = 20022
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-18
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[transport-http]
+PORT = 20026
-[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
-SERVERS = http://localhost:8080/
-HTTP-PROXY =
+[transport-https]
+PORT = 20025
-[core]
-AUTOSTART = YES
-PORT = 20021
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-17
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nat]
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20020
-
-[statistics]
-AUTOSTART = YES
-PORT = 20019
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-16
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[dht]
-AUTOSTART = YES
-PORT = 20018
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-15
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_no_nat_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[lockmanager]
-AUTOSTART = NO
-[consensus]
-AUTOSTART = NO
-
-
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2013-08-30
14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2013-08-30
15:48:50 UTC (rev 28923)
@@ -1,348 +1,95 @@
-[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
address@hidden@ test_defaults.conf
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-# HOSTKEY = hostkeys/0002-hostkey
+[arm]
+UNIXPATH = /tmp/test-service-arm-32
+PORT = 20040
-[PEER]
-PRIVATE_KEY = hostkeys/c_no_nat_client_2
-
+[dns]
+UNIXPATH = /tmp/test-service-dns-33
-[resolver]
+[lockmanager]
AUTOSTART = YES
-PORT = 20053
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-42
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[core]
+UNIXPATH = /tmp/test-service-core-31
+PORT = 20039
+
+[ats]
+UNIXPATH = /tmp/test-service-ats-37
+PORT = 20048
+
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-41
PORT = 20052
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-41
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20051
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-40
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-39
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20050
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-42
+PORT = 20053
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-29
+PORT = 20036
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nat]
+BEHIND_NAT = NO
-[peerinfo]
-USE_INCLUDED_HELLOS = NO
-AUTOSTART = YES
-PORT = 20049
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-38
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[gnunet-nat-server]
+PORT = 20038
-[client]
-HOME = $SERVICEHOME
+[fs]
+UNIXPATH = /tmp/test-service-fs-34
+PORT = 20041
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20048
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-37
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-transport-36
PORT = 20047
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/test-service-transport-36
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
[transport-tcp]
PORT = 20046
ADVERTISED_PORT = 20046
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 20045
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
-[transport-http]
-PORT = 20044
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 20043
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20042
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-35
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20041
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-34
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-33
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20040
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-32
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
SERVERS = http://localhost:8080/
-HTTP-PROXY =
-[core]
-AUTOSTART = YES
-PORT = 20039
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-31
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn.sock
-[nat]
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20038
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-38
+PORT = 20049
[statistics]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-statistics-30
PORT = 20037
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-30
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-[dht]
-AUTOSTART = YES
-PORT = 20036
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-29
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[PATHS]
+SERVICEHOME = /tmp/c_no_nat_client_2/
+DEFAULTCONFIG = c_no_nat_client_2.conf
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
+[PEER]
+PRIVATE_KEY = hostkeys/c_no_nat_client_2
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_no_nat_c-2
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[template]
+PORT = 20042
+UNIXPATH = /tmp/test-service-template-35
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[nse]
+UNIXPATH = /tmp/test-service-nse-40
+PORT = 20051
-[gns]
-AUTOSTART = NO
+[transport-http]
+PORT = 20044
-[namestore]
-AUTOSTART = NO
+[transport-https]
+PORT = 20043
-
-[consensus]
-AUTOSTART = NO
-
-
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,356 +1,94 @@
-[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
+[arm]
+DEFAULTSERVICES = topology hostlist fs core
+UNIXPATH = /tmp/test-service-arm-18
+PORT = 20022
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-HOSTKEY = hostkeys/0001-hostkey
+[dns]
+UNIXPATH = /tmp/test-service-dns-19
-[gns]
-AUTOSTART = NO
+[lockmanager]
+AUTOSTART = YES
-[namestore]
-AUTOSTART = NO
+[core]
+UNIXPATH = /tmp/test-service-core-17
+PORT = 20021
-[vpn]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-29
+[ats]
+UNIXPATH = /tmp/test-service-ats-23
+PORT = 20030
-[resolver]
-AUTOSTART = YES
-PORT = 20035
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-28
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-27
PORT = 20034
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-27
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20033
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-26
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-25
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20032
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-28
+PORT = 20035
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-15
+PORT = 20018
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nat]
+BEHIND_NAT = NO
-[peerinfo]
-AUTOSTART = YES
-PORT = 20031
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-24
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[gnunet-nat-server]
+PORT = 20020
-[client]
-HOME = $SERVICEHOME
+[fs]
+UNIXPATH = /tmp/test-service-fs-20
+PORT = 20023
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20030
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-23
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-PREFIX = valgrind --leak-check=full
-AUTOSTART = YES
-PORT = 20029
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
PLUGINS = http
UNIXPATH = /tmp/test-service-transport-22
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+PORT = 20029
[transport-tcp]
-USE_LOCALADDR = YES
PORT = 20028
ADVERTISED_PORT = 20028
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
[transport-udp]
-USE_LOCALADDR = YES
PORT = 20027
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-[transport-http]
-PORT = 20026
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 20025
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20024
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-21
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20023
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-20
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-19
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20022
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-18
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
SERVERS = http://localhost:8080/
-HTTP-PROXY =
-[core]
-AUTOSTART = YES
-PORT = 20021
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-17
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn-29
-[nat]
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20020
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-24
+USE_INCLUDED_HELLOS = YES
+PORT = 20031
[statistics]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-statistics-16
PORT = 20019
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-16
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-[dht]
-AUTOSTART = YES
-PORT = 20018
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-15
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[PATHS]
+SERVICEHOME = /tmp/c_no_nat_client/
+DEFAULTCONFIG = c_no_nat_client_http.conf
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[template]
+PORT = 20024
+UNIXPATH = /tmp/test-service-template-21
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[nse]
+UNIXPATH = /tmp/test-service-nse-26
+PORT = 20033
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
+[transport-http]
+PORT = 20026
-[consensus]
-AUTOSTART = NO
+[transport-https]
+PORT = 20025
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,347 +1,94 @@
-[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
address@hidden@ test_defaults.conf
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-HOSTKEY = hostkeys/0002-hostkey
+[arm]
+DEFAULTSERVICES = topology hostlist fs core
+UNIXPATH = /tmp/test-service-arm-32
+PORT = 20040
-[gns]
-AUTOSTART = NO
+[dns]
+UNIXPATH = /tmp/test-service-dns-33
-[namestore]
-AUTOSTART = NO
-
-[resolver]
+[lockmanager]
AUTOSTART = YES
-PORT = 20053
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-42
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[core]
+UNIXPATH = /tmp/test-service-core-31
+PORT = 20039
+
+[ats]
+UNIXPATH = /tmp/test-service-ats-37
+PORT = 20048
+
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-41
PORT = 20052
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-41
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20051
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-40
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-39
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20050
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-42
+PORT = 20053
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-29
+PORT = 20036
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nat]
+BEHIND_NAT = NO
-[peerinfo]
-AUTOSTART = YES
-PORT = 20049
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-38
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[gnunet-nat-server]
+PORT = 20038
-[client]
-HOME = $SERVICEHOME
+[fs]
+UNIXPATH = /tmp/test-service-fs-34
+PORT = 20041
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20048
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-37
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-PREFIX = valgrind --leak-check=full
-#PREFIX = gdb --args
-AUTOSTART = YES
-PORT = 20047
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
PLUGINS = http
UNIXPATH = /tmp/test-service-transport-36
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+PORT = 20047
[transport-tcp]
PORT = 20046
ADVERTISED_PORT = 20046
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 20045
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
-[transport-http]
-PORT = 20044
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 20043
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20042
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-35
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20041
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-34
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-33
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20040
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-32
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
SERVERS = http://localhost:8080/
-HTTP-PROXY =
-[core]
-AUTOSTART = YES
-PORT = 20039
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-31
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn.sock
-[nat]
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20038
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-38
+USE_INCLUDED_HELLOS = YES
+PORT = 20049
[statistics]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-statistics-30
PORT = 20037
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-30
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-[dht]
-AUTOSTART = YES
-PORT = 20036
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-29
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[PATHS]
+SERVICEHOME = /tmp/c_no_nat_client_2/
+DEFAULTCONFIG = c_no_nat_client_http_2.conf
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
+[template]
+PORT = 20042
+UNIXPATH = /tmp/test-service-template-35
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-2
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[nse]
+UNIXPATH = /tmp/test-service-nse-40
+PORT = 20051
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[transport-http]
+PORT = 20044
-[consensus]
-AUTOSTART = NO
-
-
+[transport-https]
+PORT = 20043
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,359 +1,104 @@
-[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client/
address@hidden@ test_defaults.conf
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-HOSTKEY = hostkeys/0001-hostkey
+[arm]
+DEFAULTSERVICES = topology hostlist fs core
+UNIXPATH = /tmp/test-service-arm-18
+PORT = 20022
-[gns]
-AUTOSTART = NO
+[dns]
+UNIXPATH = /tmp/test-service-dns-19
-[namestore]
-AUTOSTART = NO
-
-[vpn]
+[lockmanager]
AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-29
-[resolver]
-AUTOSTART = YES
-PORT = 20035
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-28
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[core]
+UNIXPATH = /tmp/test-service-core-17
+PORT = 20021
+[ats]
+UNIXPATH = /tmp/test-service-ats-23
+PORT = 20030
+
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-27
PORT = 20034
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-27
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20033
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-26
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-25
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20032
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-28
+PORT = 20035
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-15
+PORT = 20018
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nat]
+BEHIND_NAT = NO
-[peerinfo]
-AUTOSTART = YES
-PORT = 20031
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-24
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[gnunet-nat-server]
+PORT = 20020
-[client]
-HOME = $SERVICEHOME
+[fs]
+UNIXPATH = /tmp/test-service-fs-20
+PORT = 20023
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20030
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-23
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-PREFIX = valgrind --leak-check=full
-AUTOSTART = YES
-PORT = 20029
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
PLUGINS = unix tcp udp http
UNIXPATH = /tmp/test-service-transport-22
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+PORT = 20029
[transport-unix]
PORT = 22087
[transport-tcp]
-USE_LOCALADDR = YES
PORT = 20028
ADVERTISED_PORT = 20028
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
[transport-udp]
-USE_LOCALADDR = YES
PORT = 20027
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-[transport-http]
-PORT = 0
-MAX_CONNECTIONS = 128
+[hostlist]
+SERVERS = http://localhost:8080/
-[transport-https]
-PORT = 20025
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn-29
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-24
+USE_INCLUDED_HELLOS = YES
+PORT = 20031
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[statistics]
+UNIXPATH = /tmp/test-service-statistics-16
+PORT = 20019
+[PATHS]
+SERVICEHOME = /tmp/c_no_nat_client/
+DEFAULTCONFIG = c_no_nat_client_unix.conf
+
[template]
-AUTOSTART = NO
PORT = 20024
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
UNIXPATH = /tmp/test-service-template-21
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20023
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-20
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
+[nse]
+UNIXPATH = /tmp/test-service-nse-26
+PORT = 20033
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
+[gnunetd]
+HOSTKEY = hostkeys/0001-hostkey
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
+[transport-http]
PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-19
-PROVIDE_EXIT = NO
-[arm]
-PORT = 20022
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-18
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[transport-https]
+PORT = 20025
-[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
-SERVERS = http://localhost:8080/
-HTTP-PROXY =
-
-[core]
-AUTOSTART = YES
-PORT = 20021
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-17
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nat]
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20020
-
-[statistics]
-AUTOSTART = YES
-PORT = 20019
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-16
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[dht]
-AUTOSTART = YES
-PORT = 20018
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-15
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[chat]
UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-
-[consensus]
-AUTOSTART = NO
-
-
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,350 +1,95 @@
-[PATHS]
-SERVICEHOME = /tmp/c_no_nat_client_2/
address@hidden@ test_defaults.conf
-[gnunetd]
-#HOSTKEY = $SERVICEHOME/.hostkey
-HOSTKEY = hostkeys/0002-hostkey
+[arm]
+DEFAULTSERVICES = topology hostlist fs core
+UNIXPATH = /tmp/test-service-arm-32
+PORT = 20040
-[gns]
-AUTOSTART = NO
+[dns]
+UNIXPATH = /tmp/test-service-dns-33
-[namestore]
-AUTOSTART = NO
-
-[resolver]
+[lockmanager]
AUTOSTART = YES
-PORT = 20053
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-42
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[core]
+UNIXPATH = /tmp/test-service-core-31
+PORT = 20039
+
+[ats]
+UNIXPATH = /tmp/test-service-ats-37
+PORT = 20048
+
[mesh]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-mesh-41
PORT = 20052
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-41
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-[nse]
-AUTOSTART = YES
-PORT = 20051
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-40
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-39
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20050
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-42
+PORT = 20053
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-29
+PORT = 20036
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nat]
+BEHIND_NAT = NO
-[peerinfo]
-AUTOSTART = YES
-PORT = 20049
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-38
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
+[gnunet-nat-server]
+PORT = 20038
-[client]
-HOME = $SERVICEHOME
+[fs]
+UNIXPATH = /tmp/test-service-fs-34
+PORT = 20041
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20048
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-37
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-PREFIX = valgrind --leak-check=full
-#PREFIX = gdb --args
-AUTOSTART = YES
-PORT = 20047
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
PLUGINS = unix tcp udp http
UNIXPATH = /tmp/test-service-transport-36
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+PORT = 20047
-[transport-unix]
-PORT = 22086
-
[transport-tcp]
PORT = 20046
ADVERTISED_PORT = 20046
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 20045
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
-[transport-http]
-PORT = 20044
-MAX_CONNECTIONS = 128
-
-[transport-https]
-PORT = 20043
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20042
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-35
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20041
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-34
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-33
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20040
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs core
-UNIXPATH = /tmp/test-service-arm-32
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
SERVERS = http://localhost:8080/
-HTTP-PROXY =
-[core]
-AUTOSTART = YES
-PORT = 20039
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-31
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn.sock
-[nat]
-BEHIND_NAT = NO
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20038
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-38
+USE_INCLUDED_HELLOS = YES
+PORT = 20049
[statistics]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-statistics-30
PORT = 20037
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-30
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-[dht]
-AUTOSTART = YES
-PORT = 20036
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-29
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[PATHS]
+SERVICEHOME = /tmp/c_no_nat_client_2/
+DEFAULTCONFIG = c_no_nat_client_unix_2.conf
-[chat]
-UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-2
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[template]
+PORT = 20042
+UNIXPATH = /tmp/test-service-template-35
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+[nse]
+UNIXPATH = /tmp/test-service-nse-40
+PORT = 20051
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
+[transport-http]
+PORT = 20044
-[consensus]
-AUTOSTART = NO
+[transport-https]
+PORT = 20043
-
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-08-30
14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-08-30
15:48:50 UTC (rev 28923)
@@ -1,354 +1,62 @@
-[PATHS]
-SERVICEHOME = /tmp/c_normal_client
address@hidden@ test_defaults.conf
-[gnunetd]
-HOSTKEY = hostkeys/0002-hostkey
+[arm]
+UNIXPATH = /tmp/test-service-arm-46
+PORT = 20058
-[client]
-HOME = $SERVICEHOME
+[core]
+UNIXPATH = /tmp/test-service-core-45
+PORT = 20057
-[gns]
-AUTOSTART = NO
+[ats]
+UNIXPATH = /tmp/test-service-ats-51
+PORT = 20066
-[namestore]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-57
-
-
-[resolver]
-AUTOSTART = YES
-PORT = 20071
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-56
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
-
-[mesh]
-AUTOSTART = YES
-PORT = 20070
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-55
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nse]
-AUTOSTART = YES
-PORT = 20069
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-54
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-53
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20068
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-56
+PORT = 20071
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-43
+PORT = 20054
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[fs]
+UNIXPATH = /tmp/test-service-fs-48
+PORT = 20059
-[peerinfo]
-AUTOSTART = YES
-PORT = 20067
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-52
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
-
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20066
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-51
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-AUTOSTART = YES
+UNIXPATH = /tmp/test-service-transport-50
PORT = 20065
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-PLUGINS = tcp
-UNIXPATH = /tmp/test-service-transport-50
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
[transport-tcp]
PORT = 0
ADVERTISED_PORT = 20064
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 0
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
-[transport-http]
-PORT = 0
-MAX_CONNECTIONS = 128
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-52
+USE_INCLUDED_HELLOS = YES
+PORT = 20067
-[transport-https]
-PORT = 0
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
+[PATHS]
+SERVICEHOME = /tmp/c_normal_client
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
+[nse]
+UNIXPATH = /tmp/test-service-nse-54
+PORT = 20069
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[gnunetd]
+HOSTKEY = hostkeys/0002-hostkey
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[transport-http]
+PORT = 0
-[template]
-AUTOSTART = NO
-PORT = 20060
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-49
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20059
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-48
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
+[transport-https]
PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-47
-PROVIDE_EXIT = NO
-[arm]
-PORT = 20058
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-46
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
-SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
-HTTP-PROXY =
-
-[core]
-AUTOSTART = YES
-PORT = 20057
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-45
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nat]
-BEHIND_NAT = YES
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20056
-
-[statistics]
-AUTOSTART = YES
-PORT = 20055
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-44
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[dht]
-AUTOSTART = YES
-PORT = 20054
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-43
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[chat]
-UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-[consensus]
-AUTOSTART = NO
-
-
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,354 +1,63 @@
-[PATHS]
-SERVICEHOME = /tmp/c_normal_client
address@hidden@ test_defaults.conf
-[gnunetd]
-HOSTKEY = hostkeys/0002-hostkey
+[arm]
+UNIXPATH = /tmp/test-service-arm-46
+PORT = 20058
-[client]
-HOME = $SERVICEHOME
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[vpn]
+[lockmanager]
AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-57
+[core]
+UNIXPATH = /tmp/test-service-core-45
+PORT = 20057
-[resolver]
-AUTOSTART = YES
-PORT = 20071
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-56
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[ats]
+UNIXPATH = /tmp/test-service-ats-51
+PORT = 20066
-[mesh]
-AUTOSTART = YES
-PORT = 20070
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-55
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nse]
-AUTOSTART = YES
-PORT = 20069
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-54
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-53
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20068
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-56
+PORT = 20071
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-43
+PORT = 20054
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[fs]
+UNIXPATH = /tmp/test-service-fs-48
+PORT = 20059
-[peerinfo]
-AUTOSTART = YES
-PORT = 20067
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-52
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
-
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20066
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-51
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-AUTOSTART = YES
-PORT = 20065
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
PLUGINS = tcp udp
UNIXPATH = /tmp/test-service-transport-50
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+PORT = 20065
[transport-tcp]
PORT = 0
ADVERTISED_PORT = 20064
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 0
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-52
+USE_INCLUDED_HELLOS = YES
+PORT = 20067
+
+[PATHS]
+SERVICEHOME = /tmp/c_normal_client
+
+[nse]
+UNIXPATH = /tmp/test-service-nse-54
+PORT = 20069
+
[transport-http]
PORT = 0
-MAX_CONNECTIONS = 128
[transport-https]
PORT = 0
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
-
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
-
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
-
-[template]
-AUTOSTART = NO
-PORT = 20060
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-49
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20059
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-48
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-47
-PROVIDE_EXIT = NO
-
-[arm]
-PORT = 20058
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-46
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
-SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
-HTTP-PROXY =
-
-[core]
-AUTOSTART = YES
-PORT = 20057
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-45
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nat]
-BEHIND_NAT = YES
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20056
-
-[statistics]
-AUTOSTART = YES
-PORT = 20055
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-44
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[dht]
-AUTOSTART = YES
-PORT = 20054
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-43
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[chat]
-UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp-1
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-[consensus]
-AUTOSTART = NO
-
-
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
2013-08-30 14:59:20 UTC (rev 28922)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
2013-08-30 15:48:50 UTC (rev 28923)
@@ -1,354 +1,66 @@
-[PATHS]
-SERVICEHOME = /tmp/c_normal_client
address@hidden@ test_defaults.conf
-[gnunetd]
-HOSTKEY = hostkeys/0002-hostkey
+[arm]
+UNIXPATH = /tmp/test-service-arm-46
+PORT = 20058
-[client]
-HOME = $SERVICEHOME
-
-[gns]
-AUTOSTART = NO
-
-[namestore]
-AUTOSTART = NO
-
-[vpn]
+[lockmanager]
AUTOSTART = YES
-PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-vpn-57
+[core]
+UNIXPATH = /tmp/test-service-core-45
+PORT = 20057
-[resolver]
-AUTOSTART = YES
-PORT = 20071
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-resolver
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-resolver-56
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = NO
+[ats]
+UNIXPATH = /tmp/test-service-ats-51
+PORT = 20066
-[mesh]
-AUTOSTART = YES
-PORT = 20070
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-mesh
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-mesh-55
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nse]
-AUTOSTART = YES
-PORT = 20069
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-nse
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-nse-54
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-PROOFFILE = $SERVICEHOME/.nse-proof
-HISTOGRAM = $SERVICEHOME/nse-history.log
-WORKDELAY = 5 ms
-INTERVAL = 1 h
-WORKBITS = 1
-
-[topology]
-MINIMUM-FRIENDS = 0
-FRIENDS-ONLY = NO
-AUTOCONNECT = YES
-TARGET-CONNECTION-COUNT = 16
-FRIENDS = $SERVICEHOME/friends
-BINARY = gnunet-daemon-topology
-
[datastore]
-AUTOSTART = YES
UNIXPATH = /tmp/test-service-datastore-53
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
PORT = 20068
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-datastore
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-QUOTA = 100 MB
-BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
-DATABASE = sqlite
-[datastore-sqlite]
-FILENAME = $SERVICEHOME/datastore/sqlite.db
+[resolver]
+UNIXPATH = /tmp/test-service-resolver-56
+PORT = 20071
-[datastore-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[dht]
+UNIXPATH = /tmp/test-service-dht-43
+PORT = 20054
-[datastore-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[fs]
+UNIXPATH = /tmp/test-service-fs-48
+PORT = 20059
-[peerinfo]
-AUTOSTART = YES
-PORT = 20067
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-peerinfo
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-peerinfo-52
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-HOSTS = $SERVICEHOME/data/hosts/
-
-[TESTING]
-WEAKRANDOM = NO
-CONNECT_TIMEOUT = 30 s
-CONNECT_ATTEMPTS = 3
-MAX_OUTSTANDING_CONNECTIONS = 50
-DELETE_FILES = YES
-
-[ats]
-AUTOSTART = YES
-PORT = 20066
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-ats
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-ats-51
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-WAN_QUOTA_IN = unlimited
-WAN_QUOTA_OUT = unlimited
-DUMP_MLP = NO
-DUMP_SOLUTION = NO
-DUMP_OVERWRITE = NO
-DUMP_MIN_PEERS = 0
-DUMP_MIN_ADDRS = 0
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
-
[transport]
-AUTOSTART = YES
-PORT = 20065
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-transport
-NEIGHBOUR_LIMIT = 50
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
PLUGINS = tcp udp http
UNIXPATH = /tmp/test-service-transport-50
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
+PORT = 20065
[transport-tcp]
PORT = 0
ADVERTISED_PORT = 20064
-MAX_CONNECTIONS = 128
-TIMEOUT = 5 s
-USE_LOCALADDR = YES
[transport-udp]
PORT = 0
-BROADCAST = YES
-BROADCAST_INTERVAL = 30000
-MAX_BPS = 1000000
-USE_LOCALADDR = YES
-[transport-http]
-PORT = 0
-MAX_CONNECTIONS = 128
+[dv]
+UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http
-[transport-https]
-PORT = 0
-CRYPTO_INIT = NORMAL
-KEY_FILE = https.key
-CERT_FILE = https.cert
-MAX_CONNECTIONS = 128
+[peerinfo]
+UNIXPATH = /tmp/test-service-peerinfo-52
+USE_INCLUDED_HELLOS = YES
+PORT = 20067
-[transport-wlan]
-INTERFACE = mon0
-TESTMODE = 0
+[PATHS]
+SERVICEHOME = /tmp/c_normal_client
-[datacache-mysql]
-DATABASE = gnunet
-CONFIG = ~/.my.cnf
+[nse]
+UNIXPATH = /tmp/test-service-nse-54
+PORT = 20069
-[datacache-postgres]
-CONFIG = connect_timeout=10; dbname=gnunet
+[transport-http]
+PORT = 0
-[template]
-AUTOSTART = NO
-PORT = 20060
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-template
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-template-49
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[fs]
-AUTOSTART = YES
-INDEXDB = $SERVICEHOME/idxinfo.lst
-TRUST = $SERVICEHOME/data/credit/
-IDENTITY_DIR = $SERVICEHOME/identities/
-STATE_DIR = $SERVICEHOME/persistence/
-UPDATE_DIR = $SERVICEHOME/updates/
-PORT = 20059
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-fs
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DELAY = YES
-CONTENT_CACHING = YES
-CONTENT_PUSHING = YES
-UNIXPATH = /tmp/test-service-fs-48
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-MAX_PENDING_REQUESTS = 65536
-MIN_MIGRATION_DELAY = 100 ms
-EXPECTED_NEIGHBOUR_COUNT = 128
-
-[vpn]
-BINARY = gnunet-daemon-vpn
-IPV6ADDR = 1234::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.11.10.1
-IPV4MASK = 255.255.0.0
-VIRTDNS = 10.11.10.2
-VIRTDNS6 = 1234::17
-IFNAME = vpn-gnunet
-
-[exit]
-BINARY = gnunet-daemon-exit
-IPV6ADDR = 1234:1::1
-IPV6PREFIX = 32
-IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.0.0
-IFNAME = exit-gnunet
-ENABLE_UDP = NO
-ENABLE_TCP = NO
-
-[dns]
-AUTOSTART = YES
+[transport-https]
PORT = 0
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dns
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-dns-47
-PROVIDE_EXIT = NO
-[arm]
-PORT = 20058
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-arm
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist fs
-UNIXPATH = /tmp/test-service-arm-46
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[hostlist]
-HTTPPORT = 8080
-HOME = $SERVICEHOME
-HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-BINARY = gnunet-daemon-hostlist
-OPTIONS = -b
-SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
-HTTP-PROXY =
-
-[core]
-AUTOSTART = YES
-PORT = 20057
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-core
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-core-45
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[nat]
-BEHIND_NAT = YES
-PUNCHED_NAT = NO
-ENABLE_UPNP = NO
-USE_LOCALADDR = YES
-USE_HOSTNAME = NO
-ENABLE_ICMP_CLIENT = NO
-ENABLE_ICMP_SERVER = NO
-DISABLEV6 = YES
-RETURN_LOCAL_ADDRESSES = NO
-HOSTNAME_DNS_FREQUENCY = 1200000
-IFC_SCAN_FREQUENCY = 3000000
-DYNDNS_FREQUENCY = 140000
-EXTERNAL_ADDRESS = 127.0.0.1
-INTERNAL_ADDRESS = 127.0.0.1
-BINDTO = 127.0.0.1
-
-[gnunet-nat-server]
-HOSTNAME = gnunet.org
-PORT = 20056
-
-[statistics]
-AUTOSTART = YES
-PORT = 20055
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-statistics
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/test-service-statistics-44
-UNIX_MATCH_UID = NO
-UNIX_MATCH_GID = YES
-
-[dht]
-AUTOSTART = YES
-PORT = 20054
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/test-service-dht-43
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[chat]
-UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp_http
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dv]
-UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-[consensus]
-AUTOSTART = NO
-
-
Added: gnunet/src/integration-tests/confs/test_defaults.conf
===================================================================
--- gnunet/src/integration-tests/confs/test_defaults.conf
(rev 0)
+++ gnunet/src/integration-tests/confs/test_defaults.conf 2013-08-30
15:48:50 UTC (rev 28923)
@@ -0,0 +1,93 @@
+[arm]
+DEFAULTSERVICES = topology hostlist fs
+
+[namestore]
+AUTOSTART = NO
+
+[dns]
+UNIXPATH = /tmp/test-service-dns-47
+PORT = 0
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+PROVIDE_EXIT = NO
+
+[consensus]
+AUTOSTART = NO
+
+[lockmanager]
+AUTOSTART = NO
+
+[ats]
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
+
+[mesh]
+UNIXPATH = /tmp/test-service-mesh-55
+PORT = 20070
+
+[datastore]
+UNIX_MATCH_UID = YES
+QUOTA = 100 MB
+BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+
+[dhtcache]
+DATABASE = sqlite
+QUOTA = 1 MB
+
+[TESTING]
+WEAKRANDOM = NO
+
+[nat]
+BEHIND_NAT = YES
+DISABLEV6 = YES
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+BINDTO = 127.0.0.1
+
+[fs]
+INDEXDB = $SERVICEHOME/idxinfo.lst
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
+UPDATE_DIR = $SERVICEHOME/updates/
+TRUST = $SERVICEHOME/data/credit/
+
+[transport]
+PLUGINS = tcp
+
+[transport-tcp]
+USE_LOCALADDR = YES
+
+[transport-udp]
+BROADCAST_INTERVAL = 30000
+USE_LOCALADDR = YES
+
+[hostlist]
+SERVERS =
+
+[vpn]
+UNIXPATH = /tmp/gnunet-service-vpn-57
+PORT = 0
+
+[peerinfo]
+USE_INCLUDED_HELLOS = NO
+
+[statistics]
+UNIXPATH = /tmp/test-service-statistics-44
+PORT = 20055
+
+[template]
+AUTOSTART = NO
+
+[nse]
+WORKBITS = 1
+
+[gns]
+AUTOSTART = NO
+
+[datacache-mysql]
+DATABASE = gnunet
+CONFIG = ~/.my.cnf
+
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28923 - in gnunet/src/integration-tests: . confs,
gnunet <=