diff options
Diffstat (limited to 'src/dht')
-rw-r--r-- | src/dht/dht.conf.in | 1 | ||||
-rw-r--r-- | src/dht/test_dht_2dtorus.conf | 11 | ||||
-rw-r--r-- | src/dht/test_dht_api_data.conf | 40 | ||||
-rw-r--r-- | src/dht/test_dht_api_peer1.conf | 33 | ||||
-rw-r--r-- | src/dht/test_dht_line.conf | 18 | ||||
-rw-r--r-- | src/dht/test_dht_monitor.conf | 21 | ||||
-rw-r--r-- | src/dht/test_dht_multipeer.conf | 28 |
7 files changed, 2 insertions, 150 deletions
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in index c8cf84386..af9ab24bd 100644 --- a/src/dht/dht.conf.in +++ b/src/dht/dht.conf.in | |||
@@ -1,4 +1,5 @@ | |||
1 | [dht] | 1 | [dht] |
2 | FORCESTART = YES | ||
2 | AUTOSTART = @AUTOSTART@ | 3 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2095 | 4 | @JAVAPORT@PORT = 2095 |
4 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf index 9b725b09e..2a7f75b9f 100644 --- a/src/dht/test_dht_2dtorus.conf +++ b/src/dht/test_dht_2dtorus.conf | |||
@@ -1,16 +1,10 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/ | 2 | GNUNET_TEST_HOME = /tmp/test_dht_2dtorus/ |
3 | 3 | ||
4 | [arm] | ||
5 | DEFAULTSERVICES = core dht | ||
6 | |||
7 | [dhtcache] | 4 | [dhtcache] |
8 | QUOTA = 1 MB | 5 | QUOTA = 1 MB |
9 | DATABASE = heap | 6 | DATABASE = heap |
10 | 7 | ||
11 | [dns] | ||
12 | AUTOSTART = NO | ||
13 | |||
14 | [nat] | 8 | [nat] |
15 | DISABLEV6 = YES | 9 | DISABLEV6 = YES |
16 | RETURN_LOCAL_ADDRESSES = YES | 10 | RETURN_LOCAL_ADDRESSES = YES |
@@ -32,8 +26,3 @@ WORKDELAY = 500 ms | |||
32 | INTERVAL = 60 s | 26 | INTERVAL = 60 s |
33 | WORKBITS = 0 | 27 | WORKBITS = 0 |
34 | 28 | ||
35 | [vpn] | ||
36 | AUTOSTART = NO | ||
37 | |||
38 | [namestore] | ||
39 | AUTOSTART = NO | ||
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf index 30bf3534b..51cf99b0f 100644 --- a/src/dht/test_dht_api_data.conf +++ b/src/dht/test_dht_api_data.conf | |||
@@ -1,15 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | GNUNET_TEST_HOME = /tmp/test-dht-api/ | 2 | GNUNET_TEST_HOME = /tmp/test-dht-api/ |
3 | 3 | ||
4 | [fs] | ||
5 | AUTOSTART = NO | ||
6 | |||
7 | [resolver] | ||
8 | AUTOSTART = NO | ||
9 | |||
10 | [datastore] | ||
11 | AUTOSTART = NO | ||
12 | |||
13 | [dhtcache] | 4 | [dhtcache] |
14 | QUOTA = 1 MB | 5 | QUOTA = 1 MB |
15 | DATABASE = heap | 6 | DATABASE = heap |
@@ -24,33 +15,13 @@ MINIMUM-FRIENDS = 0 | |||
24 | WAN_QUOTA_IN = 1 GB | 15 | WAN_QUOTA_IN = 1 GB |
25 | WAN_QUOTA_OUT = 1 GB | 16 | WAN_QUOTA_OUT = 1 GB |
26 | 17 | ||
27 | [core] | ||
28 | PORT = 2092 | ||
29 | |||
30 | [dht] | ||
31 | PORT = 12370 | ||
32 | |||
33 | [transport] | 18 | [transport] |
34 | plugins = tcp | 19 | plugins = tcp |
35 | NEIGHBOUR_LIMIT = 50 | 20 | NEIGHBOUR_LIMIT = 50 |
36 | PORT = 2091 | 21 | PORT = 2091 |
37 | 22 | ||
38 | [peerinfo] | ||
39 | PORT = 2090 | ||
40 | |||
41 | [resolver] | ||
42 | PORT = 2089 | ||
43 | |||
44 | [statistics] | ||
45 | PORT = 2088 | ||
46 | |||
47 | [arm] | ||
48 | DEFAULTSERVICES = | ||
49 | PORT = 2087 | ||
50 | |||
51 | [transport-tcp] | 23 | [transport-tcp] |
52 | TIMEOUT = 300 s | 24 | TIMEOUT = 300 s |
53 | PORT = 2094 | ||
54 | 25 | ||
55 | [nat] | 26 | [nat] |
56 | DISABLEV6 = YES | 27 | DISABLEV6 = YES |
@@ -61,14 +32,3 @@ ALLOW_NAT = NO | |||
61 | INTERNAL_ADDRESS = 127.0.0.1 | 32 | INTERNAL_ADDRESS = 127.0.0.1 |
62 | EXTERNAL_ADDRESS = 127.0.0.1 | 33 | EXTERNAL_ADDRESS = 127.0.0.1 |
63 | 34 | ||
64 | [dns] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | [namestore] | ||
68 | AUTOSTART = NO | ||
69 | |||
70 | [nse] | ||
71 | AUTOSTART = NO | ||
72 | |||
73 | [vpn] | ||
74 | AUTOSTART=NO | ||
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf index 8c88c7380..13c59d070 100644 --- a/src/dht/test_dht_api_peer1.conf +++ b/src/dht/test_dht_api_peer1.conf | |||
@@ -1,17 +1,3 @@ | |||
1 | [fs] | ||
2 | AUTOSTART = NO | ||
3 | |||
4 | [resolver] | ||
5 | AUTOSTART = NO | ||
6 | |||
7 | [dht] | ||
8 | AUTOSTART = YES | ||
9 | ACCEPT_FROM6 = ::1; | ||
10 | ACCEPT_FROM = 127.0.0.1; | ||
11 | HOSTNAME = localhost | ||
12 | PORT = 12100 | ||
13 | BINARY = gnunet-service-dht | ||
14 | |||
15 | [dhtcache] | 1 | [dhtcache] |
16 | QUOTA = 1 MB | 2 | QUOTA = 1 MB |
17 | DATABASE = heap | 3 | DATABASE = heap |
@@ -27,16 +13,8 @@ PORT = 12365 | |||
27 | WAN_QUOTA_IN = 1 GB | 13 | WAN_QUOTA_IN = 1 GB |
28 | WAN_QUOTA_OUT = 1 GB | 14 | WAN_QUOTA_OUT = 1 GB |
29 | 15 | ||
30 | [core] | ||
31 | PORT = 12092 | ||
32 | |||
33 | [arm] | ||
34 | DEFAULTSERVICES = core | ||
35 | PORT = 12366 | ||
36 | |||
37 | [transport-tcp] | 16 | [transport-tcp] |
38 | TIMEOUT = 300 s | 17 | TIMEOUT = 300 s |
39 | PORT = 12368 | ||
40 | BINDTO = 127.0.0.1 | 18 | BINDTO = 127.0.0.1 |
41 | 19 | ||
42 | [PATHS] | 20 | [PATHS] |
@@ -51,14 +29,3 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
51 | EXTERNAL_ADDRESS = 127.0.0.1 | 29 | EXTERNAL_ADDRESS = 127.0.0.1 |
52 | USE_LOCALADDR = NO | 30 | USE_LOCALADDR = NO |
53 | 31 | ||
54 | [dns] | ||
55 | AUTOSTART = NO | ||
56 | |||
57 | [nse] | ||
58 | AUTOSTART = NO | ||
59 | |||
60 | [vpn] | ||
61 | AUTOSTART=NO | ||
62 | |||
63 | [namestore] | ||
64 | AUTOSTART = NO | ||
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf index f8646ca2b..024ff2770 100644 --- a/src/dht/test_dht_line.conf +++ b/src/dht/test_dht_line.conf | |||
@@ -4,14 +4,8 @@ GNUNET_TEST_HOME = /tmp/test_dht_line/ | |||
4 | QUOTA = 1 MB | 4 | QUOTA = 1 MB |
5 | DATABASE = heap | 5 | DATABASE = heap |
6 | 6 | ||
7 | [arm] | ||
8 | DEFAULTSERVICES = core dht | ||
9 | |||
10 | [dns] | ||
11 | AUTOSTART = NO | ||
12 | |||
13 | [nat] | 7 | [nat] |
14 | DISABLEV6 = YES | 8 | DISABLEV6 = YES |
15 | RETURN_LOCAL_ADDRESSES = YES | 9 | RETURN_LOCAL_ADDRESSES = YES |
16 | USE_LOCALADDR = YES | 10 | USE_LOCALADDR = YES |
17 | ENABLE_UPNP = NO | 11 | ENABLE_UPNP = NO |
@@ -24,15 +18,9 @@ EXTERNAL_ADDRESS = 127.0.0.1 | |||
24 | WAN_QUOTA_IN = 1 GB | 18 | WAN_QUOTA_IN = 1 GB |
25 | WAN_QUOTA_OUT = 1 GB | 19 | WAN_QUOTA_OUT = 1 GB |
26 | 20 | ||
27 | [testing] | ||
28 | WEAKRANDOM = YES | ||
29 | |||
30 | [testbed] | 21 | [testbed] |
31 | OVERLAY_TOPOLOGY = LINE | 22 | OVERLAY_TOPOLOGY = LINE |
32 | 23 | ||
33 | [namestore] | ||
34 | AUTOSTART = NO | ||
35 | |||
36 | [transport] | 24 | [transport] |
37 | plugins = tcp | 25 | plugins = tcp |
38 | 26 | ||
@@ -41,7 +29,3 @@ WORKDELAY = 500 ms | |||
41 | INTERVAL = 60 s | 29 | INTERVAL = 60 s |
42 | WORKBITS = 0 | 30 | WORKBITS = 0 |
43 | 31 | ||
44 | [vpn] | ||
45 | AUTOSTART = NO | ||
46 | |||
47 | |||
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf index 7ba9f8381..415a2e5fd 100644 --- a/src/dht/test_dht_monitor.conf +++ b/src/dht/test_dht_monitor.conf | |||
@@ -1,9 +1,3 @@ | |||
1 | [fs] | ||
2 | AUTOSTART = NO | ||
3 | |||
4 | [resolver] | ||
5 | AUTOSTART = NO | ||
6 | |||
7 | [dhtcache] | 1 | [dhtcache] |
8 | QUOTA = 1 MB | 2 | QUOTA = 1 MB |
9 | DATABASE = heap | 3 | DATABASE = heap |
@@ -15,9 +9,6 @@ PLUGINS = tcp | |||
15 | WAN_QUOTA_IN = 1 GB | 9 | WAN_QUOTA_IN = 1 GB |
16 | WAN_QUOTA_OUT = 1 GB | 10 | WAN_QUOTA_OUT = 1 GB |
17 | 11 | ||
18 | [arm] | ||
19 | DEFAULTSERVICES = dht core | ||
20 | |||
21 | [testbed] | 12 | [testbed] |
22 | OVERLAY_TOPOLOGY = LINE | 13 | OVERLAY_TOPOLOGY = LINE |
23 | 14 | ||
@@ -34,15 +25,3 @@ EXTERNAL_ADDRESS = 127.0.0.1 | |||
34 | USE_LOCALADDR = YES | 25 | USE_LOCALADDR = YES |
35 | RETURN_LOCAL_ADDRESSES = YES | 26 | RETURN_LOCAL_ADDRESSES = YES |
36 | 27 | ||
37 | [dns] | ||
38 | AUTOSTART = NO | ||
39 | |||
40 | [namestore] | ||
41 | AUTOSTART = NO | ||
42 | |||
43 | [nse] | ||
44 | AUTOSTART = NO | ||
45 | |||
46 | [vpn] | ||
47 | AUTOSTART=NO | ||
48 | |||
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf index f8abaec23..b6e1646d3 100644 --- a/src/dht/test_dht_multipeer.conf +++ b/src/dht/test_dht_multipeer.conf | |||
@@ -1,9 +1,3 @@ | |||
1 | [fs] | ||
2 | AUTOSTART = NO | ||
3 | |||
4 | [resolver] | ||
5 | AUTOSTART = NO | ||
6 | |||
7 | [dhtcache] | 1 | [dhtcache] |
8 | QUOTA = 1 MB | 2 | QUOTA = 1 MB |
9 | DATABASE = heap | 3 | DATABASE = heap |
@@ -15,19 +9,10 @@ PLUGINS = tcp | |||
15 | WAN_QUOTA_IN = 1 GB | 9 | WAN_QUOTA_IN = 1 GB |
16 | WAN_QUOTA_OUT = 1 GB | 10 | WAN_QUOTA_OUT = 1 GB |
17 | 11 | ||
18 | [arm] | ||
19 | DEFAULTSERVICES = dht core | ||
20 | |||
21 | [TESTING] | ||
22 | WEAKRANDOM = YES | ||
23 | |||
24 | [testbed] | 12 | [testbed] |
25 | OVERLAY_TOPOLOGY = FROM_FILE | 13 | OVERLAY_TOPOLOGY = FROM_FILE |
26 | OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat | 14 | OVERLAY_TOPOLOGY_FILE = test_dht_multipeer_topology.dat |
27 | 15 | ||
28 | [gnunetd] | ||
29 | HOSTKEY = $GNUNET_TEST_HOME/.hostkey | ||
30 | |||
31 | [PATHS] | 16 | [PATHS] |
32 | GNUNET_TEST_HOME = /tmp/test-dht-multipeer/ | 17 | GNUNET_TEST_HOME = /tmp/test-dht-multipeer/ |
33 | 18 | ||
@@ -41,16 +26,3 @@ INTERNAL_ADDRESS = 127.0.0.1 | |||
41 | EXTERNAL_ADDRESS = 127.0.0.1 | 26 | EXTERNAL_ADDRESS = 127.0.0.1 |
42 | USE_LOCALADDR = YES | 27 | USE_LOCALADDR = YES |
43 | 28 | ||
44 | [dns] | ||
45 | AUTOSTART = NO | ||
46 | |||
47 | [namestore] | ||
48 | AUTOSTART = NO | ||
49 | |||
50 | [nse] | ||
51 | AUTOSTART = NO | ||
52 | |||
53 | [vpn] | ||
54 | AUTOSTART=NO | ||
55 | |||
56 | |||