[testbed]
AUTOSTART = NO
-@UNIXONLY@ PORT = 2101
+@JAVAPORT@ PORT = 2101
HOSTNAME = localhost
-HOME = $SERVICEHOME
BINARY = gnunet-service-testbed
# How long should operations wait?
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-testbed.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
@UNIXONLY@ PORT = 2102
HOSTNAME = localhost
BINARY = gnunet-service-testbed-logger
-UNIXPATH = /tmp/gnunet-gnunet-testbed-logger.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gnunet-testbed-logger.sock
DIR = /tmp
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
+
+
+[testbed-barrier]
+AUTOSTART = NO
+@UNIXONLY@ PORT = 2103
+HOSTNAME = localhost
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+
+# This section is related to configuring underlay restrictions to simulate
+# connectivity restrictions of NAT boxes
+[testbed-underlay]
+AUTOSTART = NO
+BINARY = gnunet-daemon-testbed-underlay
+# The sqlite3 database file containing information about what underlay
+# restrictions to apply
+# DBFILE =
+
+[latency-logger]
+AUTOSTART = NO
+BINARY = gnunet-daemon-latency-logger
+# The sqlite3 database file where the latency values are to be stored
+# DBFILE =
\ No newline at end of file