1 files changed, 18 insertions, 24 deletions
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 0a24b5a..494e813 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -1,6 +1,5 @@
 [PATHS]
 SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client.conf
 
 [gnunetd]
 #HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@ AUTOSTART = YES
 PORT = 0
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dns
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@ AUTOSTART = YES
 PORT = 20035
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-resolver
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@ AUTOSTART = YES
 PORT = 20034
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-mesh
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@ AUTOSTART = YES
 PORT = 20033
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-nse
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -65,7 +60,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof
 HISTOGRAM = $SERVICEHOME/nse-history.log
 WORKDELAY = 5 ms
 INTERVAL = 1 h
-WORKBITS = 26
+WORKBITS = 1
 
 [topology]
 MINIMUM-FRIENDS = 0
@@ -73,7 +68,6 @@ FRIENDS-ONLY = NO
 AUTOCONNECT = YES
 TARGET-CONNECTION-COUNT = 16
 FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-topology
 
 [datastore]
@@ -84,7 +78,6 @@ UNIX_MATCH_GID = YES
 PORT = 20032
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-datastore
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@ AUTOSTART = YES
 PORT = 20031
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-peerinfo
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -131,15 +123,14 @@ AUTOSTART = YES
 PORT = 20030
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 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 = 65536
-WAN_QUOTA_OUT = 65536
+WAN_QUOTA_IN = unlimited
+WAN_QUOTA_OUT = unlimited
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
 DUMP_OVERWRITE = NO
@@ -149,12 +140,11 @@ ATS_MIN_INTERVAL = 15000
 ATS_EXEC_INTERVAL = 30000
 
 [transport]
-#DEBUG = YES
+#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
 PORT = 20029
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-transport
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
@@ -206,7 +196,6 @@ AUTOSTART = NO
 PORT = 20024
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-template
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -224,7 +213,6 @@ UPDATE_DIR = $SERVICEHOME/updates/
 PORT = 20023
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-fs
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -239,7 +227,6 @@ MIN_MIGRATION_DELAY = 100 ms
 EXPECTED_NEIGHBOUR_COUNT = 128
 
 [vpn]
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-vpn
 IPV6ADDR = 1234::1
 IPV6PREFIX = 32
@@ -250,7 +237,6 @@ VIRTDNS6 = 1234::17
 IFNAME = vpn-gnunet
 
 [exit]
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-exit
 IPV6ADDR = 1234:1::1
 IPV6PREFIX = 32
@@ -265,7 +251,6 @@ AUTOSTART = YES
 PORT = 0
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dns
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -276,7 +261,6 @@ PROVIDE_EXIT = NO
 PORT = 20022
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -289,7 +273,6 @@ UNIX_MATCH_GID = YES
 HTTPPORT = 8080
 HOME = $SERVICEHOME
 HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 OPTIONS = -b
 SERVERS = http://localhost:8080/
@@ -300,7 +283,6 @@ AUTOSTART = YES
 PORT = 20021
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-core
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -334,7 +316,6 @@ AUTOSTART = YES
 PORT = 20019
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-statistics
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -347,7 +328,6 @@ AUTOSTART = YES
 PORT = 20018
 HOSTNAME = localhost
 HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-dht
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -360,5 +340,19 @@ UNIX_MATCH_GID = YES
 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
+
+