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