aboutsummaryrefslogtreecommitdiff
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 @@
1[nse] 1[nse]
2AUTOSTART = @AUTOSTART@ 2AUTOSTART = @AUTOSTART@
3FORCESTART = YES
3@JAVAPORT@PORT = 2097 4@JAVAPORT@PORT = 2097
4HOSTNAME = localhost 5HOSTNAME = localhost
5BINARY = gnunet-service-nse 6BINARY = 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/
3 3
4[testbed] 4[testbed]
5AUTOSTART = NO 5AUTOSTART = NO
6PORT = 12113 6ORT = 12113
7ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16; 7ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
8HOSTNAME = localhost 8HOSTNAME = localhost
9MAX_PARALLEL_OPERATIONS = 400 9MAX_PARALLEL_OPERATIONS = 400
@@ -14,12 +14,7 @@ SETUP_TIMEOUT = 30m
14STATS_DIR= /home/totakura/nse/test/load 14STATS_DIR= /home/totakura/nse/test/load
15 15
16[nse] 16[nse]
17PORT = 12114 17FORCESTART = YES
18UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
19BINARY = gnunet-service-nse
20#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
21#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
22AUTOSTART = NO
23# Overriding network settings for faster testing (do NOT use 18# Overriding network settings for faster testing (do NOT use
24# these values in production just because they are here) 19# these values in production just because they are here)
25WORKDELAY = 60 s 20WORKDELAY = 60 s
@@ -28,23 +23,6 @@ WORKBITS = 0
28PROOFFILE = $GNUNET_TEST_HOME/nse.proof 23PROOFFILE = $GNUNET_TEST_HOME/nse.proof
29HISTOGRAM_DIR = /home/totakura/nse/test/histograms 24HISTOGRAM_DIR = /home/totakura/nse/test/histograms
30 25
31[arm]
32DEFAULTSERVICES = core nse
33UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
34
35[statistics]
36AUTOSTART = YES
37PORT = 12115
38
39[fs]
40AUTOSTART = NO
41
42[datastore]
43AUTOSTART = NO
44
45[dht]
46AUTOSTART = NO
47
48[nat] 26[nat]
49DISABLEV6 = YES 27DISABLEV6 = YES
50BINDTO = 127.0.0.1 28BINDTO = 127.0.0.1
@@ -60,36 +38,6 @@ plugins = udp
60[transport-udp] 38[transport-udp]
61PORT = 12116 39PORT = 12116
62 40
63[core]
64AUTOSTART = YES
65
66[peerinfo]
67AUTOSTART = YES
68
69[dns]
70AUTOSTART = NO
71
72[topology]
73AUTOSTART = NO
74
75[dv]
76AUTOSTART = NO
77
78[resolver]
79AUTOSTART = YES
80
81[cadet]
82AUTOSTART = NO
83
84[chat]
85AUTOSTART = NO
86
87[gns]
88AUTOSTART = NO
89
90[vpn]
91AUTOSTART = NO
92
93[nse-profiler] 41[nse-profiler]
94OUTPUT_FILE = nse_output_2000_peers.dat 42OUTPUT_FILE = nse_output_2000_peers.dat
95TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers 43TOPOLOGY_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
12OPERATION_TIMEOUT = 45 s 12OPERATION_TIMEOUT = 45 s
13 13
14[nse] 14[nse]
15PORT = 12114 15FORCESTART = YES
16UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
17BINARY = gnunet-service-nse
18#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
19#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
20AUTOSTART = NO 16AUTOSTART = NO
21# Overriding network settings for faster testing (do NOT use 17# Overriding network settings for faster testing (do NOT use
22# these values in production just because they are here) 18# these values in production just because they are here)
@@ -25,23 +21,6 @@ INTERVAL = 10 s
25WORKBITS = 0 21WORKBITS = 0
26PROOFFILE = $GNUNET_TEST_HOME/nse.proof 22PROOFFILE = $GNUNET_TEST_HOME/nse.proof
27 23
28[arm]
29DEFAULTSERVICES = core nse
30UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
31
32[statistics]
33AUTOSTART = YES
34PORT = 12115
35
36[fs]
37AUTOSTART = NO
38
39[datastore]
40AUTOSTART = NO
41
42[dht]
43AUTOSTART = NO
44
45[nat] 24[nat]
46DISABLEV6 = YES 25DISABLEV6 = YES
47BINDTO = 127.0.0.1 26BINDTO = 127.0.0.1
@@ -54,39 +33,6 @@ EXTERNAL_ADDRESS = 127.0.0.1
54[transport] 33[transport]
55plugins = udp 34plugins = udp
56 35
57[transport-udp]
58PORT = 12116
59
60[core]
61AUTOSTART = YES
62
63[peerinfo]
64AUTOSTART = YES
65
66[dns]
67AUTOSTART = NO
68
69[topology]
70AUTOSTART = NO
71
72[dv]
73AUTOSTART = NO
74
75[resolver]
76AUTOSTART = YES
77
78[cadet]
79AUTOSTART = NO
80
81[chat]
82AUTOSTART = NO
83
84[gns]
85AUTOSTART = NO
86
87[vpn]
88AUTOSTART = NO
89
90[nse-profiler] 36[nse-profiler]
91OUTPUT_FILE = nse_output_2000_peers.dat 37OUTPUT_FILE = nse_output_2000_peers.dat
92TOPOLOGY_OUTPUT_FILE = nse_topo_2000_peers 38TOPOLOGY_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 @@
2GNUNET_TEST_HOME = /tmp/test-nse-multipeer/ 2GNUNET_TEST_HOME = /tmp/test-nse-multipeer/
3 3
4[nse] 4[nse]
5PORT = 22353
6UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix
7BINARY = gnunet-service-nse
8#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
9#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p 5#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
10AUTOSTART = YES 6FORCESTART = YES
11PROOFFILE = $GNUNET_TEST_HOME/proof.nse 7PROOFFILE = $GNUNET_TEST_HOME/proof.nse
12# Overriding network settings for faster testing (do NOT use 8# Overriding network settings for faster testing (do NOT use
13# these values in production just because they are here) 9# these values in production just because they are here)
14WORKDELAY = 1 ms 10WORKDELAY = 1 ms
15INTERVAL = 60 s 11INTERVAL = 60 s
16WORKBITS = 1 12WORKBITS = 1
17
18HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram 13HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram
19 14
20
21[arm]
22PORT = 22354
23DEFAULTSERVICES = nse core
24UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
25
26[fs]
27AUTOSTART = NO
28
29[datastore]
30AUTOSTART = NO
31
32[dht]
33AUTOSTART = NO
34
35[transport]
36AUTOSTART = YES
37
38[core]
39AUTOSTART = YES
40
41[peerinfo]
42AUTOSTART = YES
43
44[nat] 15[nat]
45DISABLEV6 = YES 16DISABLEV6 = YES
46BINDTO = 127.0.0.1 17BINDTO = 127.0.0.1
@@ -50,27 +21,3 @@ ALLOW_NAT = NO
50INTERNAL_ADDRESS = 127.0.0.1 21INTERNAL_ADDRESS = 127.0.0.1
51EXTERNAL_ADDRESS = 127.0.0.1 22EXTERNAL_ADDRESS = 127.0.0.1
52 23
53[dns]
54AUTOSTART = NO
55
56[testing]
57WEAKRANDOM = YES
58
59[testing_old]
60NUM_PEERS = 10
61TOPOLOGY = NONE
62CONNECT_TOPOLOGY = SMALL_WORLD_RING
63PERCENTAGE = 3
64F2F = NO
65CONNECT_TIMEOUT = 60 s
66CONNECT_ATTEMPTS = 3
67HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
68MAX_CONCURRENT_SSH = 20
69USE_PROGRESSBARS = YES
70PEERGROUP_TIMEOUT = 1000 s
71
72DELETE_FILES = NO
73
74
75[consensus]
76AUTOSTART = NO