X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Ftest_mesh_small.conf;h=0aec8ff7f94da66868c9340fda3d1db9be3f0421;hb=94d8bba6dea46db5cc5ead1770b0c5c0a1811b02;hp=d016e1dea006f3aea33ae8a62a485c164cfb31a4;hpb=6aae69bbb5a389a2e47478b46fa1d5620c2cfbcd;p=oweals%2Fgnunet.git

diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index d016e1dea..0aec8ff7f 100644
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -2,65 +2,32 @@
 SERVICEHOME = /tmp/test_mesh_small/
 DEFAULTCONFIG = test_mesh_small.conf
 
-[nse]
-PORT = 0
-UNIXPATH = /tmp/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = YES
-DEBUG = NO
-CONFIG = $DEFAULTCONFIG
-# Overriding network settings for faster testing (do NOT use
-# these values in production just because they are here)
-WORKDELAY = 10000
-INTERVAL = 3600000
-WORKBITS = 0
-PROOFFILE = $SERVICEHOME/nse.proof
-
 [arm]
-PORT = 0
-DEFAULTSERVICES = core mesh
-UNIXPATH = /tmp/test-nse-service-arm.unix
+PORT = 10010
+DEFAULTSERVICES = core dht mesh
 #DEBUG = YES
 
 [statistics]
 AUTOSTART = YES
-PORT = 0
-
-[transport-https]
-PORT = 0
-
-[transport-http]
-PORT = 0
+PORT = 10000
 
-[transport-udp]
-PORT = 0
-
-[transport-tcp]
-ADVERTISED_PORT = 0
-PORT = 0
-
-[gnunet-nat-server]
-PORT = 0
-
-[statistics]
+[dht]
+DEBUG = NO
 AUTOSTART = YES
-PORT = 0
-
-[fs]
-AUTOSTART = NO
-PORT = 0
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+PORT = 10001
 
-[datastore]
-AUTOSTART = NO
-PORT = 0
+[nse]
+WORKBITS = 0
 
-[dht]
+[dns]
 AUTOSTART = NO
-PORT = 0
+PORT = 10011
 
 [transport]
-PORT = 0
+PORT = 10002
 AUTOSTART = YES
 
 [nat]
@@ -72,53 +39,45 @@ ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
-[transport-unix]
-PORT = 11111
+[ats]
+WAN_QUOTA_IN = 1 GB
+WAN_QUOTA_OUT = 1 GB
 
 [core]
 AUTOSTART = YES
-PORT = 0
+PORT = 10003
 
 [peerinfo]
 AUTOSTART = YES
-PORT = 0
-
-[dns]
-AUTOSTART = NO
-PORT = 0
-
-[resolver]
-PORT = 0
+PORT = 10004
 
 [mesh]
-PORT = 0
-
-[topology]
-PORT = 0
-AUTOSTART = NO
-
-[transport]
-PORT = 0
-plugins = unix
+PORT = 10005
+DEBUG=YES
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
+# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
 
 [testing]
 NUM_PEERS = 16
 WEAKRANDOM = YES
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
-#CONNECT_TOPOLOGY = ERDOS_RENYI
+TOPOLOGY = 2D_TORUS
+CONNECT_TOPOLOGY = 2D_TORUS
+#TOPOLOGY_FILE = small.dat
+CONNECT_TOPOLOGY = 2D_TORUS
 #CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 #CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
 #PERCENTAGE = 3
 #PROBABILITY = .1
 F2F = NO
-CONNECT_TIMEOUT = 60
-CONNECT_ATTEMPTS = 3
+CONNECT_TIMEOUT = 660 s
+CONNECT_ATTEMPTS = 2
 DEBUG = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_CONCURRENT_SSH = 10
 USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
+PEERGROUP_TIMEOUT = 2400 s
 TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
 MAX_OUTSTANDING_CONNECTIONS = 75
 #SINGLE_PEERINFO_PER_HOST = YES
@@ -128,6 +87,6 @@ MAX_OUTSTANDING_CONNECTIONS = 75
 DELETE_FILES = YES
 
 [test_mesh_small]
-WAIT_TIME = 2
-CONNECTION_LIMIT = 10
-DATA_OUTPUT_FILE=data_output
\ No newline at end of file
+WAIT_TIME = 300 s
+CONNECTION_LIMIT = 16
+#DATA_OUTPUT_FILE=data_output