X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmesh%2Ftest_mesh.conf;h=5a2f03dd0ad2ba4f71499658a1a53f449eb2cdcf;hb=aa52254dd92fe8d0658b83807b3141a765cc86a5;hp=e7d265bea04e10bce0c4121c1a42478e0ab26e16;hpb=76e897b90794cd1cde6b0a2f79c70104ca6c98f5;p=oweals%2Fgnunet.git

diff --git a/src/mesh/test_mesh.conf b/src/mesh/test_mesh.conf
index e7d265bea..5a2f03dd0 100644
--- a/src/mesh/test_mesh.conf
+++ b/src/mesh/test_mesh.conf
@@ -1,27 +1,10 @@
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-mesh/
-
-[mesh]
-BINARY = gnunet-service-mesh-enc
+[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
-ID_ANNOUNCE_TIME = 5 s
-CONNECT_TIMEOUT = 30 s
-DEFAULT_TTL = 16
-DHT_REPLICATION_LEVEL = 3
-MAX_TUNNELS = 10
-MAX_CONNECTIONS = 10
-MAX_MSGS_QUEUE = 20
-#DROP_PERCENT = 1
-
-[testbed]
-NUM_PEERS = 5
 OVERLAY_TOPOLOGY = LINE
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [fs]
 AUTOSTART = NO
@@ -29,16 +12,24 @@ 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
 
@@ -47,11 +38,14 @@ QUOTA = 1 MB
 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
@@ -59,31 +53,48 @@ 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
 
+[gnunetd]
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
+
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-mesh/
+
 [dns]
 AUTOSTART = NO
 
 [nse]
 AUTOSTART = NO
 
-[namestore]
-AUTOSTART = NO
-
-[consensus]
+[vpn]
 AUTOSTART = NO
 
 [nat]
-# Allow running on systems with only loopback?
 RETURN_LOCAL_ADDRESSES = YES
-# Disable redundant addresses...
 DISABLEV6 = YES
 USE_LOCALADDR = YES
 
+[gns-helper-service-w32]
+AUTOSTART = NO
+
+[consensus]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[statistics]
+AUTOSTART = NO
+
+[peerinfo]
+NO_IO = YES