- working version of NSE profiler

1 files changed, 17 insertions, 58 deletions

diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 398eb27de..b9d0c3efc 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -1,8 +1,18 @@
 [PATHS]
 SERVICEHOME = /tmp/nse-profiler/
 
+[testbed]
+AUTOSTART = NO
+PORT = 12113
+ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
+HOSTNAME = localhost
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
+OVERLAY_TOPOLOGY = RANDOM
+OVERLAY_RANDOM_LINKS = 10
+OPERATION_TIMEOUT = 45 s
+
 [nse]
-PORT = 0
+PORT = 12114
 UNIXPATH = /tmp/test-nse-service-nse.unix
 BINARY = gnunet-service-nse
 #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
@@ -16,28 +26,24 @@ WORKBITS = 0
 PROOFFILE = $SERVICEHOME/nse.proof
 
 [arm]
-PORT = 0
-DEFAULTSERVICES = core
+DEFAULTSERVICES = core nse
 UNIXPATH = /tmp/test-nse-service-arm.unix
 
 [statistics]
 AUTOSTART = YES
-PORT=0
+PORT = 12115
 
 [fs]
 AUTOSTART = NO
-PORT=0
 
 [datastore]
 AUTOSTART = NO
-PORT = 0
 
 [dht]
 AUTOSTART = NO
-PORT = 0
 
 [nat]
-DISABLEV6 = YES 
+DISABLEV6 = YES
 BINDTO = 127.0.0.1
 ENABLE_UPNP = NO
 BEHIND_NAT = NO
@@ -46,31 +52,16 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [transport]
-PORT = 0
-plugins = unix
-
-[transport-unix]
-PORT = 1
-
-[transport-tcp]
-PORT = 0
+plugins = udp
 
 [transport-udp]
-PORT = 0
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
+PORT = 12116
 
 [core]
 AUTOSTART = YES
-PORT = 0
 
 [peerinfo]
 AUTOSTART = YES
-PORT = 0
 
 [dns]
 AUTOSTART = NO
@@ -82,10 +73,7 @@ AUTOSTART = NO
 AUTOSTART = NO
 
 [resolver]
-PORT = 0
-
-[ats]
-PORT = 0
+AUTOSTART = YES
 
 [mesh]
 AUTOSTART = NO
@@ -99,35 +87,6 @@ AUTOSTART = NO
 [vpn]
 AUTOSTART = NO
 
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 2000
-TOPOLOGY = NONE
-#CONNECT_TOPOLOGY = SMALL_WORLD_RING
-CONNECT_TOPOLOGY = ERDOS_RENYI
-CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM
-CONNECT_TOPOLOGY_OPTION_MODIFIER = 5
-# PERCENTAGE = 3
-PROBABILITY = .1
-F2F = NO
-CONNECT_TIMEOUT = 360 s
-CONNECT_ATTEMPTS = 3
-#HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
-HOSTKEYSFILE = hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers_initial
-MAX_OUTSTANDING_CONNECTIONS = 100
-#SINGLE_PEERINFO_PER_HOST = YES
-#NUM_PEERINFO_PER_HOST = 10
-#SINGLE_STATISTICS_PER_HOST = YES
-#NUM_STATISTICS_PER_HOST = 10
-DELETE_FILES = NO
-#SKEW_VARIANCE = 30000
-
 [nse-profiler]
 OUTPUT_FILE = nse_output_2000_peers.dat
 TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers