- fix makefile

[oweals/gnunet.git] / src / mesh / test_mesh.conf

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index 58dff5adceba5ee160fededbd82a93cfa198a0e8..5a2f03dd0ad2ba4f71499658a1a53f449eb2cdcf 100644 (file)
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -1,26 +1,10 @@
-[PATHS]
-SERVICEHOME = /tmp/test-mesh/
-
-[mesh]
-BINARY = gnunet-service-mesh-new
+[testbed]
 AUTOSTART = NO
+PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
-PORT = 10511
-#PREFIX = valgrind --leak-check=full
-#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
-REFRESH_PATH_TIME = 2 s
-APP_ANNOUNCE_TIME = 5 s
-ID_ANNOUNCE_TIME = 5 s
-CONNECT_TIMEOUT = 30 s
-DEFAULT_TTL = 16
-DHT_REPLICATION_LEVEL = 3
-MAX_TUNNELS = 10
-MAX_MSGS_QUEUE = 20
-
-[testbed]
-NUM_PEERS = 5
 OVERLAY_TOPOLOGY = LINE
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [fs]
 AUTOSTART = NO
@@ -28,32 +12,40 @@ AUTOSTART = NO
 [resolver]
 AUTOSTART = NO
 
-[vpn]
+[mesh]
+#BINARY = gnunet-service-mesh-enc
+#PREFIX = valgrind --leak-check=full
+#PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 AUTOSTART = NO
-PORT = 10012
+ACCEPT_FROM = 127.0.0.1;
+REFRESH_CONNECTION_TIME = 2 s
+ID_ANNOUNCE_TIME = 5 s
+CONNECT_TIMEOUT = 30 s
+DEFAULT_TTL = 16
+DHT_REPLICATION_LEVEL = 10
+MAX_TUNNELS = 10
+MAX_CONNECTIONS = 10
+MAX_MSGS_QUEUE = 20
+DISABLE_TRY_CONNECT = YES
 
 [dht]
-AUTOSTART = YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-PORT = 12100
+AUTOSTART = NO
 DISABLE_TRY_CONNECT = YES
 FORCE_NSE = 3
 
-[block]
-plugins = dht test
-
 [dhtcache]
 QUOTA = 1 MB
-DATABASE = sqlite
+DATABASE = heap
 
 [transport]
-PLUGINS = tcp
+PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
+#MANIPULATE_DELAY_IN = 10 ms
+#MANIPULATE_DELAY_OUT = 10 ms
+
 
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -61,20 +53,22 @@ WAN_QUOTA_IN = 3932160
 
 [core]
 PORT = 12092
+AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
 
 [arm]
-DEFAULTSERVICES = core mesh
+DEFAULTSERVICES = core transport dht mesh statistics
 PORT = 12366
 
-[transport-tcp]
+[transport-udp]
 TIMEOUT = 300 s
 PORT = 12368
 
-[TESTING]
-WEAKRANDOM = YES
-
 [gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
+
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-mesh/
 
 [dns]
 AUTOSTART = NO
@@ -82,8 +76,25 @@ AUTOSTART = NO
 [nse]
 AUTOSTART = NO
 
-[namestore]
+[vpn]
+AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+DISABLEV6 = YES
+USE_LOCALADDR = YES
+
+[gns-helper-service-w32]
 AUTOSTART = NO
 
 [consensus]
 AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[statistics]
+AUTOSTART = NO
+
+[peerinfo]
+NO_IO = YES