[GNUnet-SVN] r16318 - gnunet/src/testing

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r16318 - gnunet/src/testing

From:	gnunet
Subject:	[GNUnet-SVN] r16318 - gnunet/src/testing
Date:	Tue, 2 Aug 2011 09:46:21 +0200
Author: grothoff
Date: 2011-08-02 09:46:21 +0200 (Tue, 02 Aug 2011)
New Revision: 16318

Modified:
   gnunet/src/testing/test_testing_connect_peer1.conf
   gnunet/src/testing/test_testing_connect_peer2.conf
   gnunet/src/testing/test_testing_data.conf
   gnunet/src/testing/test_testing_data_remote.conf
   gnunet/src/testing/test_testing_data_topology_2d_torus.conf
   gnunet/src/testing/test_testing_data_topology_blacklist.conf
   gnunet/src/testing/test_testing_data_topology_churn.conf
   gnunet/src/testing/test_testing_data_topology_clique.conf
   gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
   gnunet/src/testing/test_testing_data_topology_clique_minimum.conf
   gnunet/src/testing/test_testing_data_topology_clique_random.conf
   gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf
   gnunet/src/testing/test_testing_data_topology_internat.conf
   gnunet/src/testing/test_testing_data_topology_none.conf
   gnunet/src/testing/test_testing_data_topology_ring.conf
   gnunet/src/testing/test_testing_data_topology_scale_free.conf
   gnunet/src/testing/test_testing_data_topology_small_world_ring.conf
   gnunet/src/testing/test_testing_data_topology_small_world_torus.conf
   gnunet/src/testing/test_testing_data_topology_stability.conf
   gnunet/src/testing/test_testing_peergroup_data.conf
Log:
towards simplified configs

Modified: gnunet/src/testing/test_testing_connect_peer1.conf
===================================================================
--- gnunet/src/testing/test_testing_connect_peer1.conf  2011-08-02 07:34:53 UTC 
(rev 16317)
+++ gnunet/src/testing/test_testing_connect_peer1.conf  2011-08-02 07:46:21 UTC 
(rev 16318)
@@ -1,3 +1,4 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/
 DEFAULTCONFIG = test_testing_connect_peer1.conf
@@ -2,75 +3,30 @@
 
-[resolver]
-PORT = 12564
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-HOSTNAME = localhost
+[transport-tcp]
+PORT = 12568
+BINDTO = 127.0.0.1
 
-[transport]
-PORT = 12565
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-HOSTNAME = localhost
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-
 [arm]
 PORT = 12566
+DEFAULTSERVICES = core
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-HOSTNAME = localhost
-DEFAULTSERVICES = core 
-# core in DEFAULTSERVICES required or test case will fail!
-#DEBUG = YES
 
 [statistics]
 PORT = 12567
 UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-HOSTNAME = localhost
 
-[transport-tcp]
-PORT = 12568
-BINDTO = 127.0.0.1
+[resolver]
+PORT = 12564
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12569
 UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-HOSTNAME = localhost
 
+[transport]
+PORT = 12565
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+
 [core]
 PORT = 12570
 UNIXPATH = /tmp/gnunet-p1-service-core.sock
-HOSTNAME = localhost
-#DEBUG = YES
 
-[testing]
-WEAKRANDOM = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_connect_peer2.conf
===================================================================
--- gnunet/src/testing/test_testing_connect_peer2.conf  2011-08-02 07:34:53 UTC 
(rev 16317)
+++ gnunet/src/testing/test_testing_connect_peer2.conf  2011-08-02 07:46:21 UTC 
(rev 16318)
@@ -1,3 +1,4 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
 SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/
 DEFAULTCONFIG = test_testing_connect_peer2.conf
@@ -2,75 +3,30 @@
 
-[resolver]
-PORT = 22564
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
-HOSTNAME = localhost
+[transport-tcp]
+PORT = 22568
+BINDTO = 127.0.0.1
 
-[transport]
-PORT = 22565
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
-HOSTNAME = localhost
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-
 [arm]
 PORT = 22566
+DEFAULTSERVICES = core
 UNIXPATH = /tmp/gnunet-p2-service-arm.sock
-DEFAULTSERVICES = core 
-#core in DEFAULTSERVICES required or test case will fail!
-HOSTNAME = localhost
-#DEBUG = YES
 
 [statistics]
 PORT = 22567
 UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
-HOSTNAME = localhost
 
-[transport-tcp]
-PORT = 22568
-BINDTO = 127.0.0.1
+[resolver]
+PORT = 22564
+UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22569
 UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
-HOSTNAME = localhost
 
+[transport]
+PORT = 22565
+UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+
 [core]
 PORT = 22570
 UNIXPATH = /tmp/gnunet-p2-service-core.sock
-HOSTNAME = localhost
-#DEBUG = YES
 
-[testing]
-WEAKRANDOM = YES
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data.conf
===================================================================
--- gnunet/src/testing/test_testing_data.conf   2011-08-02 07:34:53 UTC (rev 
16317)
+++ gnunet/src/testing/test_testing_data.conf   2011-08-02 07:46:21 UTC (rev 
16318)
@@ -1,64 +1,7 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-
 [arm]
-PORT = 2566
 DEFAULTSERVICES = core
 
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-#USE_LOCALADDR = YES
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[mesh]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_remote.conf
===================================================================
--- gnunet/src/testing/test_testing_data_remote.conf    2011-08-02 07:34:53 UTC 
(rev 16317)
+++ gnunet/src/testing/test_testing_data_remote.conf    2011-08-02 07:46:21 UTC 
(rev 16318)
@@ -1,59 +1,21 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_remote.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-AUTOSTART = NO
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core] 
-PORT = 2570
-
-[testing]
+[TESTING]
 CONTROL_HOST = 131.159.20.42
 HOSTFILE = remote_hosts.txt
-WEAKRANDOM = YES
-NUM_PEERS = 5
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 MAX_OUTSTANDING_SSH = 5
 
-[dht]
+[statistics]
 AUTOSTART = NO
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[datastore]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[fs]
+AUTOSTART = YES
 
+[mesh]
+AUTOSTART = YES
 
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_2d_torus.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_2d_torus.conf 2011-08-02 
07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_2d_torus.conf 2011-08-02 
07:46:21 UTC (rev 16318)
@@ -1,59 +1,17 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
+[TESTING]
 NUM_PEERS = 13
-WEAKRANDOM = YES
 TOPOLOGY = 2D_TORUS
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[fs]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_blacklist.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_blacklist.conf        
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_blacklist.conf        
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,72 +1,22 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-BLACKLIST_FILE = $SERVICEHOME/blacklist
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
+[TESTING]
 NUM_PEERS = 4
-WEAKRANDOM = YES
 TOPOLOGY = CLIQUE
 BLACKLIST_TOPOLOGY = RING
 BLACKLIST_TRANSPORTS = tcp udp http
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[transport-udp]
+PORT = 2568
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[datastore]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[fs]
+AUTOSTART = YES
 
+[mesh]
+AUTOSTART = YES
 
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_churn.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_churn.conf    2011-08-02 
07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_churn.conf    2011-08-02 
07:46:21 UTC (rev 16318)
@@ -1,67 +1,22 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_churn.conf
 
-[resolver]
-PORT = 2564
+[TESTING]
+NUM_PEERS = 12
 
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
+[transport-udp]
+PORT = 2568
 
 [arm]
-PORT = 2566
 DEFAULTSERVICES = peerinfo transport core
 
-[statistics]
-PORT = 2567
+[datastore]
+AUTOSTART = YES
 
-[transport-tcp]
-PORT = 2568
+[fs]
+AUTOSTART = YES
 
-[transport-udp]
-PORT = 2568
+[mesh]
+AUTOSTART = YES
 
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 12
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dht]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_clique.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique.conf   2011-08-02 
07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_clique.conf   2011-08-02 
07:46:21 UTC (rev 16318)
@@ -1,74 +1,25 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
+[TESTING]
+CONNECT_TIMEOUT = 180
+CONNECT_ATTEMPTS = 14
+NUM_PEERS = 4
+TOPOLOGY = CLIQUE
 
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
 [transport-tcp]
-PORT = 2568
 ENABLE_UPNP = NO
 
 [transport-udp]
 PORT = 2568
 
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
+[datastore]
+AUTOSTART = YES
 
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
+[fs]
+AUTOSTART = YES
 
-[testing]
-NUM_PEERS = 4
-WEAKRANDOM = YES
-TOPOLOGY = CLIQUE
-F2F = YES
-CONNECT_TIMEOUT = 180
-CONNECT_ATTEMPTS = 14
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[mesh]
+AUTOSTART = YES
 
-[dht]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_clique_dfs.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_clique_dfs.conf       
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,71 +1,25 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = peerinfo transport core
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
+[TESTING]
 NUM_PEERS = 7
-WEAKRANDOM = YES
 TOPOLOGY = CLIQUE
 CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[transport-udp]
+PORT = 2568
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[arm]
+DEFAULTSERVICES = peerinfo transport core
 
-[dns]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
+[fs]
+AUTOSTART = YES
 
+[mesh]
+AUTOSTART = YES
 
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_clique_minimum.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_minimum.conf   
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_clique_minimum.conf   
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,71 +1,22 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
+[TESTING]
 NUM_PEERS = 20
-WEAKRANDOM = YES
 TOPOLOGY = CLIQUE
 CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
 CONNECT_TOPOLOGY_OPTION_MODIFIER = 2.0
-#F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[transport-udp]
+PORT = 2568
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[datastore]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[fs]
+AUTOSTART = YES
 
+[mesh]
+AUTOSTART = YES
 
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_clique_random.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_clique_random.conf    
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_clique_random.conf    
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,73 +1,28 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-AUTOSTART = NO
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-AUTOSTART = NO
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
+[TESTING]
 NUM_PEERS = 20
-WEAKRANDOM = YES
 TOPOLOGY = CLIQUE
 CONNECT_TOPOLOGY_OPTION = CONNECT_RANDOM_SUBSET
 CONNECT_TOPOLOGY_OPTION_MODIFIER = .15
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
+[transport-udp]
+PORT = 2568
+
+[statistics]
 AUTOSTART = NO
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
+[resolver]
 AUTOSTART = NO
 
+[datastore]
+AUTOSTART = YES
 
+[fs]
+AUTOSTART = YES
 
-[nse]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-

Modified: gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf      
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_erdos_renyi.conf      
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,59 +1,16 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
+[TESTING]
 TOPOLOGY = ERDOS_RENYI
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[fs]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_internat.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_internat.conf 2011-08-02 
07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_internat.conf 2011-08-02 
07:46:21 UTC (rev 16318)
@@ -1,59 +1,16 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
+[TESTING]
 TOPOLOGY = INTERNAT
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[fs]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_none.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_none.conf     2011-08-02 
07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_none.conf     2011-08-02 
07:46:21 UTC (rev 16318)
@@ -1,76 +1,50 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-AUTOSTART = NO
-PORT = 0
+[TESTING]
+NUM_PEERS = 1000
+TOPOLOGY = NONE
+F2F = NO
+BLACKLIST_TOPOLOGY = NONE
+CONNECT_TOPOLOGY = RING
 
-[transport]
-PORT = 0
-PLUGINS = tcp
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=massif
+[transport-tcp]
+BINDTO = 127.0.0.1
 
-[topology]
-PORT = 0
-
 [arm]
 PORT = 0
-DEFAULTSERVICES = 
 
 [statistics]
 AUTOSTART = NO
 PORT = 0
 
-[transport-tcp]
-PORT = 2568
-BINDTO = 127.0.0.1
+[resolver]
+AUTOSTART = NO
+PORT = 0
 
 [peerinfo]
 PORT = 0
 
+[transport]
+PORT = 0
+
 [core]
 PORT = 0
 
+[topology]
+PORT = 0
+
 [hostlist]
 PORT = 0
 
+[datastore]
+AUTOSTART = YES
+
 [fs]
+AUTOSTART = YES
 PORT = 0
 
-[testing]
-NUM_PEERS = 1000
-WEAKRANDOM = YES
-TOPOLOGY = NONE
-F2F = NO
-BLACKLIST_TOPOLOGY = NONE
-CONNECT_TOPOLOGY = RING
-#CONNECT_TOPOLOGY = 2D_TORUS
-#CONNECT_TOPOLOGY = CLIQUE
-#CONNECT_TOPOLOGY_OPTION = CONNECT_DFS
-#CONNECT_TOPOLOGY_OPTION_MODIFIER = 20
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+[mesh]
+AUTOSTART = YES
 
-[dht]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_ring.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_ring.conf     2011-08-02 
07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_ring.conf     2011-08-02 
07:46:21 UTC (rev 16318)
@@ -1,59 +1,16 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
+[TESTING]
 TOPOLOGY = RING
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[fs]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_scale_free.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_scale_free.conf       
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,69 +1,23 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
 
-[resolver]
-PORT = 2564
+[TESTING]
+NUM_PEERS = 50
+TOPOLOGY = SCALE_FREE
 
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
+[transport-udp]
+PORT = 2568
 
 [arm]
-PORT = 2566
 DEFAULTSERVICES = peerinfo transport core
 
-[statistics]
-PORT = 2567
+[datastore]
+AUTOSTART = YES
 
-[transport-tcp]
-PORT = 2568
+[fs]
+AUTOSTART = YES
 
-[transport-udp]
-PORT = 2568
+[mesh]
+AUTOSTART = YES
 
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 50
-WEAKRANDOM = YES
-TOPOLOGY = SCALE_FREE
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-
-[dht]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_small_world_ring.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_small_world_ring.conf 
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_small_world_ring.conf 
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,59 +1,17 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
+[TESTING]
 NUM_PEERS = 25
-WEAKRANDOM = YES
 TOPOLOGY = SMALL_WORLD_RING
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[fs]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_small_world_torus.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_small_world_torus.conf        
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_small_world_torus.conf        
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,59 +1,16 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-#DEBUG = YES
-
-[testing]
-NUM_PEERS = 5
-WEAKRANDOM = YES
+[TESTING]
 TOPOLOGY = SMALL_WORLD
-F2F = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[datastore]
+AUTOSTART = YES
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[fs]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_data_topology_stability.conf
===================================================================
--- gnunet/src/testing/test_testing_data_topology_stability.conf        
2011-08-02 07:34:53 UTC (rev 16317)
+++ gnunet/src/testing/test_testing_data_topology_stability.conf        
2011-08-02 07:46:21 UTC (rev 16318)
@@ -1,73 +1,21 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_data_topology_clique.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#PREFIX = xterm -e xterm -T transport -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#PREFIX = valgrind --tool=callgrind --log-file=callgrind.%p
-#DEBUG = YES
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = 
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[transport-udp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T peerinfo -e gdb --args
-#BINARY = 
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/peerinfo/.libs/gnunet-service-peerinfo
-#PREFIX = valgrind --tool=memcheck --log-file=peerinfo%p
-
-[core]
-PORT = 2570
-#PREFIX = xterm -e xterm -T CORE -e gdb --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-#DEBUG = YES
-
-[testing]
+[TESTING]
 SETTLE_TIME = 600
 NUM_PEERS = 2
-WEAKRANDOM = YES
-#CONNECT_TOPOLOGY = CLIQUE
 TOPOLOGY = CLIQUE
-F2F = YES
-#DEBUG = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
 
-[dht]
-AUTOSTART = NO
+[transport-udp]
+PORT = 2568
 
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
+[datastore]
+AUTOSTART = YES
 
-[dns]
-AUTOSTART = NO
+[fs]
+AUTOSTART = YES
 
+[mesh]
+AUTOSTART = YES
 
-
-[nse]
-AUTOSTART = NO
-
-

Modified: gnunet/src/testing/test_testing_peergroup_data.conf
===================================================================
--- gnunet/src/testing/test_testing_peergroup_data.conf 2011-08-02 07:34:53 UTC 
(rev 16317)
+++ gnunet/src/testing/test_testing_peergroup_data.conf 2011-08-02 07:46:21 UTC 
(rev 16318)
@@ -1,40 +1,11 @@
address@hidden@ test_testing_defaults.conf
 [PATHS]
-SERVICEHOME = /tmp/test-gnunet-testing/
 DEFAULTCONFIG = test_testing_peergroup_data.conf
 
-[resolver]
-PORT = 2564
-
-[transport]
-PORT = 2565
-PLUGINS = tcp
-#DEBUG = YES
-#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
-#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-
-[arm]
-PORT = 2566
-DEFAULTSERVICES = core
-
-[statistics]
-PORT = 2567
-
-[transport-tcp]
-PORT = 2568
-
-[peerinfo]
-PORT = 2569
-
-[core]
-PORT = 2570
-
-[testing]
-WEAKRANDOM = YES
-HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-#The following options are REQUIRED for peergroup convenience usage!
+[TESTING]
+CONNECT_ATTEMPTS = 2
 MAX_OUTSTANDING_CONNECTIONS = 20
 MAX_CONCURRENT_SSH = 1
-CONNECT_ATTEMPTS = 2
 PEERGROUP_TIMEOUT = 300
 TOPOLOGY = CLIQUE
 PERCENTAGE = 0.5
@@ -46,31 +17,9 @@
 BLACKLIST_TRANSPORTS = tcp udp
 USE_PROGRESSBARS = NO
 
+[arm]
+DEFAULTSERVICES = core
 
-[fs]
-AUTOSTART = NO
+[mesh]
+AUTOSTART = YES
 
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[nat]
-DISABLEV6 = YES
-ENABLE_UPNP = NO
-BEHIND_NAT = NO
-ALLOW_NAT = NO
-INTERNAL_ADDRESS = 127.0.0.1
-EXTERNAL_ADDRESS = 127.0.0.1
-USE_LOCALADDR = NO
-
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-
-
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r16318 - gnunet/src/testing, gnunet <=
Prev by Date: [GNUnet-SVN] r16317 - gnunet/contrib
Next by Date: [GNUnet-SVN] r16319 - gnunet/src/transport
Previous by thread: [GNUnet-SVN] r16317 - gnunet/contrib
Next by thread: [GNUnet-SVN] r16319 - gnunet/src/transport
Index(es):
- Date
- Thread