-more datacache integration work

[oweals/gnunet.git] / src / testbed / testbed.conf.in

diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index f3f437d334f31a93ac4cf3ce1b3432a914cc05a1..386e00433f656eff7e9e9fa649c681135a0875af 100644 (file)
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -1,8 +1,7 @@
 [testbed]
 AUTOSTART = NO
-@UNIXONLY@ PORT = 2101
+@JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-testbed
 
 # How long should operations wait?
@@ -12,20 +11,20 @@ OPERATION_TIMEOUT = 30 s
 # helper binary is searched in @prefix@/lib/gnunet/libexec/
 # HELPER_BINARY_PATH = @prefix@/lib/gnunet/libexec/gnunet-helper-testbed
 
-# Add your local network address here. For example, if you want to running
+# Add your local network address here. For example, if you want to run
 # testbed on a group of hosts connected to network 192.168.1.0/24, then set
 #   ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 # Multiple network addresses can be given.  They should be separated by `;'
 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
 
 # How many maximum number of operations can be run in parallel.  This number
-# should be decreased if the system is getting overloaded and to keep reduce the
-# load of testbed.
+# should be decreased if the system is getting overloaded and to reduce the load
+# exerted by the emulation.
 MAX_PARALLEL_OPERATIONS = 1000
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 1
 
@@ -40,12 +39,19 @@ OVERLAY_TOPOLOGY = NONE
 # requiring this option are RANDOM, SMALL_WORLD and SMALL_WORLD ring.
 # OVERLAY_RANDOM_LINKS =
 
-# If the OVERLAY_TOPOLOGY is set to FROM_FILE.  This option is ignored for all
-# other topology values.  This option should contain the path to the file
-# containing the topology information.  The format of the file is presented at:
-# https://gnunet.org/content/topology-file-format
+# This option is required if the OVERLAY_TOPOLOGY is set to FROM_FILE.  It is
+# ignored for all other topologies.  This option should contain the path to
+# the file containing the topology information.  The format of the file is
+# presented at: https://gnunet.org/content/topology-file-format
 # OVERLAY_TOPOLOGY_FILE = /path/to/topology-file
 
+# The following options are required if the OVERLAY_TOPOLOGY is set to
+# SCALE_FREE.  They are ignored in all other cases.
+# The number of maximum peers which can connect to a peer
+SCALE_FREE_TOPOLOGY_CAP = 70
+# The minimum number of peers which a peer has to connect
+SCALE_FREE_TOPOLOGY_M = 5
+
 # How many maximum number of handles to peers' services should be kept open at
 # any time.  This number also keeps a check on the number of open descriptors as
 # opening a service connection results in opening a file descriptor.
@@ -88,7 +94,7 @@ AUTOSTART = NO
 @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
@@ -98,6 +104,22 @@ UNIX_MATCH_GID = YES
 AUTOSTART = NO
 @UNIXONLY@ PORT = 2103
 HOSTNAME = localhost
-UNIXPATH = /tmp/gnunet-service-testbed-barrier.sock
+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