[GNUnet-SVN] r25576 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2012-12-20 11:57:51 +0100 (Thu, 20 Dec 2012)
New Revision: 25576

Modified:
   gnunet/src/mesh/test_mesh_small.conf
Log:
-new conf file

Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf        2012-12-20 10:47:33 UTC (rev 
25575)
+++ gnunet/src/mesh/test_mesh_small.conf        2012-12-20 10:57:51 UTC (rev 
25576)
@@ -14,6 +14,10 @@
 # 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 = 10010
 DEFAULTSERVICES = core dht mesh
@@ -72,34 +76,3 @@
 [testing]
 WEAKRANDOM = YES
 
-[testing_old]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = LINE
-BLACKLIST_TOPOLOGY = LINE
-BLACKLIST_TRANSPORTS = tcp udp http unix
-#TOPOLOGY_FILE = small.dat
-#CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 25
-#PERCENTAGE = 3
-#PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 660 s
-CONNECT_ATTEMPTS = 2
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-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 = 30 s
-CONNECTION_LIMIT = 16
-#DATA_OUTPUT_FILE=data_output