gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r30454 - gnunet/src/testbed


From: gnunet
Subject: [GNUnet-SVN] r30454 - gnunet/src/testbed
Date: Tue, 29 Oct 2013 11:41:46 +0100

Author: harsha
Date: 2013-10-29 11:41:46 +0100 (Tue, 29 Oct 2013)
New Revision: 30454

Added:
   gnunet/src/testbed/test_testbed_api_template.conf
Modified:
   gnunet/src/testbed/test_testbed_api.conf
   gnunet/src/testbed/test_testbed_api_statistics.conf
   gnunet/src/testbed/test_testbed_api_test_timeout.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
Log:
- use configuration template for duplicate configurations


Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf    2013-10-29 09:30:41 UTC (rev 
30453)
+++ gnunet/src/testbed/test_testbed_api.conf    2013-10-29 10:41:46 UTC (rev 
30454)
@@ -1,80 +1 @@
-[testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-TOPOLOGY = RANDOM
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = udp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-udp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
-[peerinfo]
-NO_IO = YES
address@hidden@ test_testbed_api_template.conf

Modified: gnunet/src/testbed/test_testbed_api_statistics.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_statistics.conf 2013-10-29 09:30:41 UTC 
(rev 30453)
+++ gnunet/src/testbed/test_testbed_api_statistics.conf 2013-10-29 10:41:46 UTC 
(rev 30454)
@@ -1,91 +1,9 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = 2D_TORUS
 MAX_PARALLEL_SERVICE_CONNECTIONS = 2
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
 [statistics]
 AUTOSTART = YES
 PORT = 30
-
-[peerinfo]
-NO_IO = YES

Added: gnunet/src/testbed/test_testbed_api_template.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_template.conf                           
(rev 0)
+++ gnunet/src/testbed/test_testbed_api_template.conf   2013-10-29 10:41:46 UTC 
(rev 30454)
@@ -0,0 +1,80 @@
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1;
+HOSTNAME = localhost
+OVERLAY_TOPOLOGY = NONE
+#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
+
+[fs]
+AUTOSTART = NO
+
+[resolver]
+AUTOSTART = NO
+
+[mesh]
+AUTOSTART = NO
+
+[dht]
+AUTOSTART = NO
+
+[dhtcache]
+QUOTA = 1 MB
+DATABASE = heap
+
+[transport]
+PLUGINS = udp
+ACCEPT_FROM6 = ::1;
+ACCEPT_FROM = 127.0.0.1;
+NEIGHBOUR_LIMIT = 50
+PORT = 12365
+
+[ats]
+WAN_QUOTA_OUT = 3932160
+WAN_QUOTA_IN = 3932160
+
+[core]
+PORT = 12092
+AUTOSTART = YES
+USE_EPHEMERAL_KEYS = NO
+
+[arm]
+DEFAULTSERVICES = core transport
+PORT = 12366
+
+[transport-udp]
+TIMEOUT = 300 s
+PORT = 12368
+
+[gnunetd]
+HOSTKEY = $GNUNET_TEST_HOME/.hostkey
+
+[PATHS]
+GNUNET_TEST_HOME = /tmp/test-testbed/
+
+[dns]
+AUTOSTART = NO
+
+[nse]
+AUTOSTART = NO
+
+[vpn]
+AUTOSTART = NO
+
+[nat]
+RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
+
+[consensus]
+AUTOSTART = NO
+
+[gns]
+AUTOSTART = NO
+
+[statistics]
+AUTOSTART = NO
+
+[peerinfo]
+NO_IO = YES

Modified: gnunet/src/testbed/test_testbed_api_test_timeout.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_test_timeout.conf       2013-10-29 
09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_test_timeout.conf       2013-10-29 
10:41:46 UTC (rev 30454)
@@ -1,89 +1,5 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
 OVERLAY_TOPOLOGY = CLIQUE
 SETUP_TIMEOUT = 2 s
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[statistics]
-AUTOSTART = NO
-
-[peerinfo]
-NO_IO = YES

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf        
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topology2dtorus.conf        
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,77 +1,5 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = 2D_TORUS
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf 
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf 
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,77 +1,4 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = CLIQUE
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf       
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyfromfile.conf       
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,70 +1,5 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = FROM_FILE
 OVERLAY_TOPOLOGY_FILE = overlay_topology.txt
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = udp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-udp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf   
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf   
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,77 +1,4 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = LINE
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf 
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf 
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,77 +1,5 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
 OVERLAY_TOPOLOGY = RANDOM
 OVERLAY_RANDOM_LINKS = 5
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf   
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyring.conf   
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,77 +1,4 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = RING
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf      
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyscalefree.conf      
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,79 +1,6 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
-NEIGHBOUR_LIMIT = 100
 OVERLAY_TOPOLOGY = SCALE_FREE
 SCALE_FREE_TOPOLOGY_CAP = 70
 SCALE_FREE_TOPOLOGY_M = 5
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO

Modified: 
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf     
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworld.conf     
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,81 +1,5 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
 OVERLAY_TOPOLOGY = SMALL_WORLD
 OVERLAY_RANDOM_LINKS = 3
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-

Modified: 
gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf 
2013-10-29 09:30:41 UTC (rev 30453)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologysmallworldring.conf 
2013-10-29 10:41:46 UTC (rev 30454)
@@ -1,81 +1,5 @@
address@hidden@ test_testbed_api_template.conf
+
 [testbed]
-AUTOSTART = NO
-PORT = 12113
-ACCEPT_FROM = 127.0.0.1;
-HOSTNAME = localhost
 OVERLAY_TOPOLOGY = SMALL_WORLD_RING
 OVERLAY_RANDOM_LINKS = 3
-#PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
-
-[fs]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[dhtcache]
-QUOTA = 1 MB
-DATABASE = heap
-
-[transport]
-PLUGINS = tcp
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-PORT = 12365
-
-[ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
-
-[core]
-PORT = 12092
-AUTOSTART = YES
-USE_EPHEMERAL_KEYS = NO
-
-[arm]
-DEFAULTSERVICES = core transport
-PORT = 12366
-
-[transport-tcp]
-TIMEOUT = 300 s
-PORT = 12368
-
-[TESTING]
-NUM_PEERS = 5
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
-
-[gnunetd]
-HOSTKEY = $GNUNET_TEST_HOME/.hostkey
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/test-testbed/
-
-[dns]
-AUTOSTART = NO
-
-[nse]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
-[nat]
-RETURN_LOCAL_ADDRESSES = YES
-
-[gns-helper-service-w32]
-AUTOSTART = NO
-
-[consensus]
-AUTOSTART = NO
-




reply via email to

[Prev in Thread] Current Thread [Next in Thread]