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