- fixes

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

diff --git a/src/mesh/test_mesh_small.conf b/src/mesh/test_mesh_small.conf
index 7c33c56522d593016c8fa9b2153016c38057514c..943ef3638af884c4a0c591b7db8ce724e198fc3f 100644 (file)
--- a/src/mesh/test_mesh_small.conf
+++ b/src/mesh/test_mesh_small.conf
@@ -1,66 +1,53 @@
 [PATHS]
 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
+[mesh]
+PORT = 10005
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+REFRESH_PATH_TIME = 5 s
+APP_ANNOUNCE_TIME = 2 s
+ID_ANNOUNCE_TIME = 2 s
+CONNECT_TIMEOUT = 30 s
+DEFAULT_TTL = 64
+DHT_REPLICAITON_LEVEL = 3
+# PREFIX = valgrind --leak-check=full --suppressions=valgrind-mesh.supp
+# PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args
+
+[testbed]
+NUM_PEERS = 5
+OVERLAY_TOPOLOGY = LINE
 
 [arm]
-PORT = 0
-DEFAULTSERVICES = core mesh
-UNIXPATH = /tmp/test-nse-service-arm.unix
-#DEBUG = YES
+PORT = 10010
+DEFAULTSERVICES = core dht mesh
 
 [statistics]
 AUTOSTART = YES
-PORT = 0
-
-[transport-https]
-PORT = 0
-
-[transport-http]
-PORT = 0
-
-[transport-udp]
-PORT = 0
+PORT = 10000
 
-[transport-tcp]
-ADVERTISED_PORT = 0
-PORT = 0
-
-[gnunet-nat-server]
-PORT = 0
-
-[statistics]
+[dht]
 AUTOSTART = YES
-PORT = 0
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+PORT = 10001
 
-[fs]
-AUTOSTART = NO
-PORT = 0
+[nse]
+WORKBITS = 0
+INTERVAL = 60 s
+WORKDELAY = 500 ms
 
-[datastore]
+[dns]
 AUTOSTART = NO
-PORT = 0
+PORT = 10011
 
-[dht]
+[vpn]
 AUTOSTART = NO
-PORT = 0
+PORT = 10012
 
 [transport]
-PORT = 0
+PORT = 10002
 AUTOSTART = YES
 
 [nat]
@@ -71,63 +58,21 @@ BEHIND_NAT = NO
 ALLOW_NAT = NO
 INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
+RETURN_LOCAL_ADDRESSES = YES
+USE_LOCALADDR = YES
 
-[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
-
-[mesh]
-PORT = 0
-
-[topology]
-PORT = 0
-AUTOSTART = NO
-
-[transport]
-PORT = 0
-plugins = unix
+PORT = 10004
 
 [testing]
-NUM_PEERS = 16
 WEAKRANDOM = YES
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
-#CONNECT_TOPOLOGY = ERDOS_RENYI
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
-#PERCENTAGE = 3
-#PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 60
-CONNECT_ATTEMPTS = 3
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400
-TOPOLOGY_OUTPUT_FILE = mesh_topo_initial
-MAX_OUTSTANDING_CONNECTIONS = 75
-#SINGLE_PEERINFO_PER_HOST = YES
-#NUM_PEERINFO_PER_HOST = 10
-#SINGLE_STATISTICS_PER_HOST = YES
-#NUM_STATISTICS_PER_HOST = 10
-DELETE_FILES = YES
 
-[test_mesh_small]
-WAIT_TIME = 10
-CONNECTION_LIMIT = 10
-DATA_OUTPUT_FILE=data_output
\ No newline at end of file