aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2011-08-01 13:42:30 +0000
committerChristian Grothoff <christian@grothoff.org>2011-08-01 13:42:30 +0000
commit003d9c41d5ff799d9472489ba0544bb4a6942c85 (patch)
tree43564196a819cbe6748f4e14887bd146312dd99d /src/hostlist
parent0ea2ffb99da4645d3984fd0b207bd78d261e8356 (diff)
downloadgnunet-003d9c41d5ff799d9472489ba0544bb4a6942c85.tar.gz
gnunet-003d9c41d5ff799d9472489ba0544bb4a6942c85.zip
optimizing cfg
Diffstat (limited to 'src/hostlist')
-rw-r--r--src/hostlist/Makefile.am1
-rw-r--r--src/hostlist/learning_data.conf34
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist.conf61
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_data.conf72
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer1.conf68
-rw-r--r--src/hostlist/test_gnunet_daemon_hostlist_peer2.conf64
-rw-r--r--src/hostlist/test_hostlist_defaults.conf50
-rw-r--r--src/hostlist/test_learning_adv_peer.conf62
-rw-r--r--src/hostlist/test_learning_learn_peer.conf59
-rw-r--r--src/hostlist/test_learning_learn_peer2.conf56
10 files changed, 140 insertions, 387 deletions
diff --git a/src/hostlist/Makefile.am b/src/hostlist/Makefile.am
index 15c8f86a7..8af1d4a7f 100644
--- a/src/hostlist/Makefile.am
+++ b/src/hostlist/Makefile.am
@@ -66,6 +66,7 @@ test_gnunet_daemon_hostlist_learning_LDADD = \
66 $(top_builddir)/src/util/libgnunetutil.la 66 $(top_builddir)/src/util/libgnunetutil.la
67 67
68EXTRA_DIST = \ 68EXTRA_DIST = \
69 test_hostlist_defaults.conf \
69 test_gnunet_daemon_hostlist_data.conf \ 70 test_gnunet_daemon_hostlist_data.conf \
70 test_gnunet_daemon_hostlist_peer1.conf \ 71 test_gnunet_daemon_hostlist_peer1.conf \
71 test_gnunet_daemon_hostlist_peer2.conf \ 72 test_gnunet_daemon_hostlist_peer2.conf \
diff --git a/src/hostlist/learning_data.conf b/src/hostlist/learning_data.conf
index 8a37a8cd9..e3a38972c 100644
--- a/src/hostlist/learning_data.conf
+++ b/src/hostlist/learning_data.conf
@@ -1,34 +1,14 @@
1[PATHS] 1@INLINE@ test_hostlist_defaults.conf
2SERVICEHOME = /tmp/test-gnunetd-hostlist/
3DEFAULTCONFIG = /etc/gnunetd.conf
4
5[hostlist] 2[hostlist]
6PORT = 23354
7# port for hostlist http server
8HTTPPORT = 28080 3HTTPPORT = 28080
9HOSTNAME = localhost
10HOME = $SERVICEHOME
11CONFIG = $DEFAULTCONFIG
12BINARY = gnunet-daemon-hostlist
13OPTIONS = -b -e 4OPTIONS = -b -e
14SERVERS = http://gnunet.org:8080/ 5SERVERS = http://gnunet.org:8080/
15# proxy for downloading hostlists 6PORT = 23354
16HTTP-PROXY = 7HOSTNAME = localhost
17
18[testing]
19WEAKRANDOM = YES
20
21[mesh]
22AUTOSTART = NO
23
24
25
26[dns]
27AUTOSTART = NO
28
29
30 8
31[nse] 9[datastore]
32AUTOSTART = NO 10AUTOSTART = YES
33 11
12[fs]
13AUTOSTART = YES
34 14
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.conf b/src/hostlist/test_gnunet_daemon_hostlist.conf
index fe05b4d65..82f768776 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist.conf
@@ -1,63 +1,8 @@
1@INLINE@ test_hostlist_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-core-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
3DEFAULTCONFIG = test_core_api_peer1.conf
4
5[resolver]
6PORT = 12464
7#PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck
8
9[transport]
10PORT = 12465
11PLUGINS = tcp
12#PREFIX = xterm -T transport1 -e
13#PREFIX = xterm -T transport1 -e gdb -x cmd --args
14#PREFIX = xterm -T transport1 -e valgrind --tool=memcheck
15#DEBUG = YES
16
17[arm]
18PORT = 12466
19DEFAULTSERVICES = hostlist
20#GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck
21
22[statistics]
23PORT = 12467
24#PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck
25
26[tcp]
27PORT = 12468
28
29[peerinfo]
30PORT = 12469
31#PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck
32#PREFIX = xterm -T peerinfo1 -e
33
34[core]
35PORT = 12470
36#PREFIX = xterm -T core1 -e valgrind --tool=memcheck
37#OPTIONS = -l log-core-1
38#PREFIX = xterm -T core1 -e gdb -x cmd --args
39#PREFIX = xterm -T core1 -e
40#DEBUG = YES
41
42[testing]
43WEAKRANDOM = YES
44 4
45[hostlist] 5[hostlist]
46OPTIONS = -b
47SERVERS = http://localhost:22471/
48HTTP-PROXY =
49HTTPPORT = 12471 6HTTPPORT = 12471
50[mesh] 7SERVERS = http://localhost:22471/
51AUTOSTART = NO
52
53
54
55[dns]
56AUTOSTART = NO
57
58
59
60[nse]
61AUTOSTART = NO
62
63 8
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_data.conf b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
index 507ea0805..74d16be89 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_data.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_data.conf
@@ -1,75 +1,29 @@
1[PATHS] 1@INLINE@ test_hostlist_defaults.conf
2SERVICEHOME = /tmp/test-gnunet-hostlist/ 2[transport-tcp]
3DEFAULTCONFIG = /etc/gnunetd.conf 3PORT = 12968
4
5[hostlist]
6PORT = 23354
7# port for hostlist http server
8HTTPPORT = 28080
9HOSTNAME = localhost
10HOME = $SERVICEHOME
11CONFIG = $DEFAULTCONFIG
12BINARY = gnunet-daemon-hostlist
13# consider having "-e" as default as well once implemented
14OPTIONS = -b
15SERVERS = http://gnunet.org:8080/
16# proxy for downloading hostlists
17HTTP-PROXY =
18
19[resolver]
20PORT = 12964
21
22[transport]
23PORT = 12965
24PLUGINS = tcp
25#DEBUG = YES
26DEBUG = NO
27 4
28[arm] 5[arm]
29PORT = 12966 6PORT = 12966
30DEFAULTSERVICES = hostlist topology 7DEFAULTSERVICES = hostlist topology
31#GLOBAL_PREFIX = xterm -e gdb -x cmd --args
32 8
33[statistics] 9[statistics]
34PORT = 12967 10PORT = 12967
35 11
36[transport-tcp] 12[resolver]
37PORT = 12968 13PORT = 12964
38DEBUG = NO
39 14
40[peerinfo] 15[peerinfo]
41PORT = 12969 16PORT = 12969
42 17
18[transport]
19PORT = 12965
20
43[core] 21[core]
44PORT = 12970 22PORT = 12970
45#DEBUG = YES
46#PREFIX = valgrind --tool=memcheck\
47DEBUG = NO
48
49[testing]
50WEAKRANDOM = YES
51
52[topology]
53#DEBUG = YES
54#PREFIX = valgrind --tool=memcheck
55DEBUG = NO
56
57[fs]
58AUTOSTART = NO
59
60[datastore]
61AUTOSTART = NO
62[mesh]
63AUTOSTART = NO
64
65
66
67[dns]
68AUTOSTART = NO
69
70
71
72[nse]
73AUTOSTART = NO
74 23
24[hostlist]
25HTTPPORT = 28080
26SERVERS = http://gnunet.org:8080/
27PORT = 23354
28HOSTNAME = localhost
75 29
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index dbc4367dc..679da289a 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -1,80 +1,40 @@
1@INLINE@ test_hostlist_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
3DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf 4DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 12964 7PORT = 12968
7UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
8
9[transport]
10PORT = 12965
11UNIXPATH = /tmp/gnunet-p1-service-transport.sock
12PLUGINS = tcp
13#DEBUG = YES
14DEBUG = NO
15 8
16[arm] 9[arm]
17PORT = 12966 10PORT = 12966
18UNIXPATH = /tmp/gnunet-p1-service-arm.sock
19DEFAULTSERVICES = hostlist topology 11DEFAULTSERVICES = hostlist topology
20#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 12UNIXPATH = /tmp/gnunet-p1-service-arm.sock
21 13
22[statistics] 14[statistics]
23PORT = 12967 15PORT = 12967
24UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 16UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
25 17
26[transport-tcp] 18[resolver]
27PORT = 12968 19PORT = 12964
28DEBUG = NO 20UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
29 21
30[peerinfo] 22[peerinfo]
31PORT = 12969 23PORT = 12969
32UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 24UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
33 25
26[transport]
27PORT = 12965
28UNIXPATH = /tmp/gnunet-p1-service-transport.sock
29DEBUG = NO
30
34[core] 31[core]
35PORT = 12970 32PORT = 12970
36UNIXPATH = /tmp/gnunet-p1-service-core.sock 33UNIXPATH = /tmp/gnunet-p1-service-core.sock
37#DEBUG = YES
38#PREFIX = valgrind --tool=memcheck\
39DEBUG = NO
40
41[testing]
42WEAKRANDOM = YES
43 34
44[hostlist] 35[hostlist]
45HTTPPORT = 12980 36HTTPPORT = 12980
46SERVERS = http://localhost:12981/
47OPTIONS = -b -p
48HOSTLISTFILE = hostlists_peer1.file 37HOSTLISTFILE = hostlists_peer1.file
49#DEBUG = YES 38OPTIONS = -b -p
50#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist 39SERVERS = http://localhost:12981/
51DEBUG = NO
52
53[topology]
54#DEBUG = YES
55#PREFIX = valgrind --tool=memcheck
56DEBUG = NO
57
58[fs]
59AUTOSTART = NO
60
61[datastore]
62AUTOSTART = NO
63
64[dht]
65AUTOSTART = NO
66
67[mesh]
68AUTOSTART = NO
69
70
71
72[dns]
73AUTOSTART = NO
74
75
76
77[nse]
78AUTOSTART = NO
79
80 40
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index befce219b..2b8eb33d0 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -1,77 +1,39 @@
1@INLINE@ test_hostlist_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
3DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf 4DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 22964 7PORT = 22968
7UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
8DEBUG = NO
9
10[transport]
11PORT = 22965
12UNIXPATH = /tmp/gnunet-p2-service-transport.sock
13PLUGINS = tcp
14DEBUG = NO
15 8
16[arm] 9[arm]
17PORT = 22966 10PORT = 22966
18UNIXPATH = /tmp/gnunet-p2-service-arm.sock
19DEFAULTSERVICES = hostlist topology 11DEFAULTSERVICES = hostlist topology
20#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 12UNIXPATH = /tmp/gnunet-p2-service-arm.sock
21DEBUG = NO
22 13
23[statistics] 14[statistics]
24PORT = 22967 15PORT = 22967
25UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 16UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
26 17
27[transport-tcp] 18[resolver]
28PORT = 22968 19PORT = 22964
29DEBUG = NO 20UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
30 21
31[peerinfo] 22[peerinfo]
32PORT = 22969 23PORT = 22969
33UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 24UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
34 25
26[transport]
27PORT = 22965
28UNIXPATH = /tmp/gnunet-p2-service-transport.sock
29
35[core] 30[core]
36PORT = 22970 31PORT = 22970
37UNIXPATH = /tmp/gnunet-p2-service-core.sock 32UNIXPATH = /tmp/gnunet-p2-service-core.sock
38DEBUG = NO
39#PREFIX = valgrind --tool=memcheck
40
41[testing]
42WEAKRANDOM = YES
43 33
44[hostlist] 34[hostlist]
45HTTPPORT = 12981 35HTTPPORT = 12981
46SERVERS = http://localhost:12980/
47OPTIONS = -b -p
48DEBUG = NO
49HOSTLISTFILE = hostlists_peer2.file 36HOSTLISTFILE = hostlists_peer2.file
50#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist 37OPTIONS = -b -p
51 38SERVERS = http://localhost:12980/
52[topology]
53#DEBUG = YES
54#PREFIX = valgrind --tool=memcheck
55DEBUG = NO
56
57[fs]
58AUTOSTART = NO
59
60[datastore]
61AUTOSTART = NO
62
63[dht]
64AUTOSTART = NO[mesh]
65AUTOSTART = NO
66
67
68
69[dns]
70AUTOSTART = NO
71
72
73
74[nse]
75AUTOSTART = NO
76
77 39
diff --git a/src/hostlist/test_hostlist_defaults.conf b/src/hostlist/test_hostlist_defaults.conf
new file mode 100644
index 000000000..473ac2a95
--- /dev/null
+++ b/src/hostlist/test_hostlist_defaults.conf
@@ -0,0 +1,50 @@
1[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist/
3DEFAULTCONFIG = test_hostlist_default.conf
4
5[resolver]
6PORT = 12464
7
8[transport]
9PORT = 12465
10PLUGINS = tcp
11
12[arm]
13PORT = 12466
14DEFAULTSERVICES = hostlist
15
16[statistics]
17PORT = 12467
18
19[tcp]
20PORT = 12468
21
22[peerinfo]
23PORT = 12469
24
25[core]
26PORT = 12470
27
28[testing]
29WEAKRANDOM = YES
30
31[hostlist]
32HTTP-PROXY =
33
34[mesh]
35AUTOSTART = NO
36
37[dns]
38AUTOSTART = NO
39
40[nse]
41AUTOSTART = NO
42
43[datastore]
44AUTOSTART = NO
45
46[fs]
47AUTOSTART = NO
48
49[dht]
50AUTOSTART = NO
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index f0329d170..73e58a6b7 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,77 +1,43 @@
1@INLINE@ test_hostlist_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
3DEFAULTCONFIG = test_learning_adv_peer.conf 4DEFAULTCONFIG = test_learning_adv_peer.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 22964 7PORT = 22968
7UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock
8
9[transport]
10PORT = 22965
11UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock
12PLUGINS = tcp
13#DEBUG = YES
14 8
15[arm] 9[arm]
16PORT = 22966 10PORT = 22966
17UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock
18DEFAULTSERVICES = topology hostlist 11DEFAULTSERVICES = topology hostlist
19#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 12UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock
20DEBUG=YES
21 13
22[statistics] 14[statistics]
23PORT = 22967 15PORT = 22967
24UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock 16UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock
25HOSTNAME = localhost
26 17
27[transport-tcp] 18[resolver]
28PORT = 22968 19PORT = 22964
20UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock
29 21
30[peerinfo] 22[peerinfo]
31PORT = 22969 23PORT = 22969
32UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock 24UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock
33 25
26[transport]
27PORT = 22965
28UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock
29
34[core] 30[core]
35PORT = 22970 31PORT = 22970
36UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock 32UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock
37#DEBUG = YES
38#PREFIX = valgrind --tool=memcheck
39
40[testing]
41WEAKRANDOM = YES
42 33
43[hostlist] 34[hostlist]
44EXTERNAL_DNS_NAME = localhost
45HTTPPORT = 12981 35HTTPPORT = 12981
46SERVERS = http://localhost:12981/
47OPTIONS = -p -a
48#OPTIONS = -b -p -a
49#DEBUG = YES
50HOSTLISTFILE = hostlists_adv_peer.file 36HOSTLISTFILE = hostlists_adv_peer.file
51 37OPTIONS = -p -a
52[topology] 38SERVERS = http://localhost:12981/
53#DEBUG = YES 39EXTERNAL_DNS_NAME = localhost
54#PREFIX = valgrind --tool=memcheck
55
56[fs]
57AUTOSTART = NO
58
59[datastore]
60AUTOSTART = NO
61 40
62[dht] 41[dht]
63AUTOSTART = NO 42AUTOSTART = NO
64[mesh]
65AUTOSTART = NO
66
67
68
69[dns]
70AUTOSTART = NO
71
72
73
74[nse]
75AUTOSTART = NO
76
77 43
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 9f7e5d3da..41966a27c 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,77 +1,42 @@
1@INLINE@ test_hostlist_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
3DEFAULTCONFIG = test_learning_learn_peer.conf 4DEFAULTCONFIG = test_learning_learn_peer.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 12964 7PORT = 12968
7UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock
8
9[transport]
10PORT = 12965
11UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock
12PLUGINS = tcp
13#DEBUG = YES
14 8
15[arm] 9[arm]
16PORT = 12966 10PORT = 12966
17UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock
18DEFAULTSERVICES = topology hostlist 11DEFAULTSERVICES = topology hostlist
19#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 12UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock
20#DEBUG=YES
21 13
22[statistics] 14[statistics]
23PORT = 12967 15PORT = 12967
24UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock 16UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock
25HOSTNAME = localhost
26 17
27[transport-tcp] 18[resolver]
28PORT = 12968 19PORT = 12964
20UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock
29 21
30[peerinfo] 22[peerinfo]
31PORT = 12969 23PORT = 12969
32UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock 24UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock
33 25
26[transport]
27PORT = 12965
28UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock
34 29
35[core] 30[core]
36PORT = 12970 31PORT = 12970
37UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock 32UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock
38#DEBUG = YES
39#PREFIX = valgrind --tool=memcheck
40
41[testing]
42WEAKRANDOM = YES
43 33
44[hostlist] 34[hostlist]
45HTTPPORT = 12980 35HTTPPORT = 12980
46SERVERS = http://localhost:12981/
47OPTIONS = -b -e
48#OPTIONS = -b -p
49#DEBUG = YES
50HOSTLISTFILE = hostlists_learn_peer.file 36HOSTLISTFILE = hostlists_learn_peer.file
51 37OPTIONS = -b -e
52[topology] 38SERVERS = http://localhost:12981/
53#DEBUG = YES
54#PREFIX = valgrind --tool=memcheck
55
56[fs]
57AUTOSTART = NO
58
59[datastore]
60AUTOSTART = NO
61 39
62[dht] 40[dht]
63AUTOSTART = NO 41AUTOSTART = NO
64[mesh]
65AUTOSTART = NO
66
67
68
69[dns]
70AUTOSTART = NO
71
72
73
74[nse]
75AUTOSTART = NO
76
77 42
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 4d2f0d485..4fd54bbc9 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -1,69 +1,39 @@
1@INLINE@ test_hostlist_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ 3SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
3DEFAULTCONFIG = test_learning_learn_peer2.conf 4DEFAULTCONFIG = test_learning_learn_peer2.conf
4 5
5[resolver] 6[transport-tcp]
6PORT = 32964 7PORT = 32968
7UNIXPATH = /tmp/gnunet-p3-service-resolver.sock
8
9[transport]
10PORT = 32965
11UNIXPATH = /tmp/gnunet-p3-service-transport.sock
12PLUGINS = tcp
13#DEBUG = YES
14 8
15[arm] 9[arm]
16PORT = 32966 10PORT = 32966
17UNIXPATH = /tmp/gnunet-p3-service-arm.sock
18DEFAULTSERVICES = topology hostlist 11DEFAULTSERVICES = topology hostlist
19#GLOBAL_PREFIX = xterm -e gdb -x cmd --args 12UNIXPATH = /tmp/gnunet-p3-service-arm.sock
20DEBUG=NO
21 13
22[statistics] 14[statistics]
23PORT = 32967 15PORT = 32967
24UNIXPATH = /tmp/gnunet-p3-service-statistics.sock 16UNIXPATH = /tmp/gnunet-p3-service-statistics.sock
25HOSTNAME = localhost
26 17
27[transport-tcp] 18[resolver]
28PORT = 32968 19PORT = 32964
20UNIXPATH = /tmp/gnunet-p3-service-resolver.sock
29 21
30[peerinfo] 22[peerinfo]
31PORT = 32969 23PORT = 32969
32UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock 24UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock
33 25
26[transport]
27PORT = 32965
28UNIXPATH = /tmp/gnunet-p3-service-transport.sock
29
34[core] 30[core]
35PORT = 32970 31PORT = 32970
36UNIXPATH = /tmp/gnunet-p3-service-core.sock 32UNIXPATH = /tmp/gnunet-p3-service-core.sock
37#DEBUG = YES
38#PREFIX = valgrind --tool=memcheck
39
40[testing]
41WEAKRANDOM = YES
42 33
43[hostlist] 34[hostlist]
44HTTPPORT = 32980 35HTTPPORT = 32980
45SERVERS = http://localhost:12981/
46OPTIONS = -b -e
47#OPTIONS = -b -p
48#DEBUG = YES
49HOSTLISTFILE = hostlists_learn_peer2.file 36HOSTLISTFILE = hostlists_learn_peer2.file
50#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist 37OPTIONS = -b -e
51 38SERVERS = http://localhost:12981/
52
53[topology]
54#DEBUG = YES
55#PREFIX = valgrind --tool=memcheck
56[mesh]
57AUTOSTART = NO
58
59
60
61[dns]
62AUTOSTART = NO
63
64
65
66[nse]
67AUTOSTART = NO
68
69 39