summaryrefslogtreecommitdiff
path: root/src/nse
diff options
context:
space:
mode:
Diffstat (limited to 'src/nse')
-rw-r--r--src/nse/nse.conf.in1
-rw-r--r--src/nse/nse_infiniband.conf56
-rw-r--r--src/nse/nse_profiler_test.conf56
-rw-r--r--src/nse/test_nse.conf55
4 files changed, 5 insertions, 163 deletions
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index 96d82d812..02e7261cf 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,5 +1,6 @@
[nse]
AUTOSTART = @AUTOSTART@
+FORCESTART = YES
@JAVAPORT@PORT = 2097
HOSTNAME = localhost
BINARY = gnunet-service-nse
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index fc2e4f8b7..8e98b18c3 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -3,7 +3,7 @@ GNUNET_TEST_HOME = /tmp/nse-profiler/
[testbed]
AUTOSTART = NO
-PORT = 12113
+ORT = 12113
ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
HOSTNAME = localhost
MAX_PARALLEL_OPERATIONS = 400
@@ -14,12 +14,7 @@ SETUP_TIMEOUT = 30m
STATS_DIR= /home/totakura/nse/test/load
[nse]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = NO
+FORCESTART = YES
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 60 s
@@ -28,23 +23,6 @@ WORKBITS = 0
PROOFFILE = $GNUNET_TEST_HOME/nse.proof
HISTOGRAM_DIR = /home/totakura/nse/test/histograms
-[arm]
-DEFAULTSERVICES = core nse
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[statistics]
-AUTOSTART = YES
-PORT = 12115
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -60,36 +38,6 @@ plugins = udp
[transport-udp]
PORT = 12116
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-
-[cadet]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
[nse-profiler]
OUTPUT_FILE = nse_output_2000_peers.dat
TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 26bcda520..b118132d1 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -12,11 +12,7 @@ OVERLAY_RANDOM_LINKS = 1000
OPERATION_TIMEOUT = 45 s
[nse]
-PORT = 12114
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
-#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
+FORCESTART = YES
AUTOSTART = NO
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
@@ -25,23 +21,6 @@ INTERVAL = 10 s
WORKBITS = 0
PROOFFILE = $GNUNET_TEST_HOME/nse.proof
-[arm]
-DEFAULTSERVICES = core nse
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[statistics]
-AUTOSTART = YES
-PORT = 12115
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -54,39 +33,6 @@ EXTERNAL_ADDRESS = 127.0.0.1
[transport]
plugins = udp
-[transport-udp]
-PORT = 12116
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
-[dns]
-AUTOSTART = NO
-
-[topology]
-AUTOSTART = NO
-
-[dv]
-AUTOSTART = NO
-
-[resolver]
-AUTOSTART = YES
-
-[cadet]
-AUTOSTART = NO
-
-[chat]
-AUTOSTART = NO
-
-[gns]
-AUTOSTART = NO
-
-[vpn]
-AUTOSTART = NO
-
[nse-profiler]
OUTPUT_FILE = nse_output_2000_peers.dat
TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index b6239140e..c6061f421 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -2,45 +2,16 @@
GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
[nse]
-PORT = 22353
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
-BINARY = gnunet-service-nse
-#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = YES
+FORCESTART = YES
PROOFFILE = $GNUNET_TEST_HOME/proof.nse
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 1 ms
INTERVAL = 60 s
WORKBITS = 1
-
HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
-
-[arm]
-PORT = 22354
-DEFAULTSERVICES = nse core
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
-
-[fs]
-AUTOSTART = NO
-
-[datastore]
-AUTOSTART = NO
-
-[dht]
-AUTOSTART = NO
-
-[transport]
-AUTOSTART = YES
-
-[core]
-AUTOSTART = YES
-
-[peerinfo]
-AUTOSTART = YES
-
[nat]
DISABLEV6 = YES
BINDTO = 127.0.0.1
@@ -50,27 +21,3 @@ ALLOW_NAT = NO
INTERNAL_ADDRESS = 127.0.0.1
EXTERNAL_ADDRESS = 127.0.0.1
-[dns]
-AUTOSTART = NO
-
-[testing]
-WEAKRANDOM = YES
-
-[testing_old]
-NUM_PEERS = 10
-TOPOLOGY = NONE
-CONNECT_TOPOLOGY = SMALL_WORLD_RING
-PERCENTAGE = 3
-F2F = NO
-CONNECT_TIMEOUT = 60 s
-CONNECT_ATTEMPTS = 3
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 20
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 1000 s
-
-DELETE_FILES = NO
-
-
-[consensus]
-AUTOSTART = NO