configure ATS ports conflict-free for tests

[oweals/gnunet.git] / contrib / defaults.conf

diff --git a/contrib/defaults.conf b/contrib/defaults.conf
index 86c6a25edf535e98aab80b7769a8954cf86e11cd..9922ebf16965963b5734d6490f33eb1add0a8be2 100644 (file)
--- a/contrib/defaults.conf
+++ b/contrib/defaults.conf
@@ -217,6 +217,7 @@ HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-transport
+#PREFIX = valgrind
 NEIGHBOUR_LIMIT = 50
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
@@ -235,7 +236,21 @@ UNIX_MATCH_GID = YES
 # REJECT_FROM6 =
 # PREFIX =
 
+[ats]
+AUTOSTART = YES
+PORT = 2098
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-ats
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-ats.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
 
+TOTAL_QUOTA_IN = 65536
+TOTAL_QUOTA_OUT = 65536
 # ATS options
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
@@ -253,7 +268,7 @@ PORT = 2092
 HOSTNAME = localhost
 HOME = $SERVICEHOME
 CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-core
+BINARY = gnunet-service-core-new
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 # quotas are in bytes per second now!
@@ -452,9 +467,9 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-vpn
 IPV6ADDR = 1234::1
 IPV6PREFIX = 32
-IPV4ADDR = 10.10.10.1
-IPV4MASK = 255.255.255.0
-VIRTDNS = 10.10.10.2
+IPV4ADDR = 10.11.10.1
+IPV4MASK = 255.255.0.0
+VIRTDNS = 10.11.10.2
 IFNAME = vpn-gnunet
 
 [exit]
@@ -463,7 +478,7 @@ BINARY = gnunet-daemon-exit
 IPV6ADDR = 1234:1::1
 IPV6PREFIX = 32
 IPV4ADDR = 10.10.1.1
-IPV4MASK = 255.255.255.0
+IPV4MASK = 255.255.0.0
 IFNAME = exit-gnunet
 ENABLE_UDP = NO
 ENABLE_TCP = NO