diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-01 13:42:30 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-01 13:42:30 +0000 |
commit | 003d9c41d5ff799d9472489ba0544bb4a6942c85 (patch) | |
tree | 43564196a819cbe6748f4e14887bd146312dd99d /src/hostlist | |
parent | 0ea2ffb99da4645d3984fd0b207bd78d261e8356 (diff) | |
download | gnunet-003d9c41d5ff799d9472489ba0544bb4a6942c85.tar.gz gnunet-003d9c41d5ff799d9472489ba0544bb4a6942c85.zip |
optimizing cfg
Diffstat (limited to 'src/hostlist')
-rw-r--r-- | src/hostlist/Makefile.am | 1 | ||||
-rw-r--r-- | src/hostlist/learning_data.conf | 34 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist.conf | 61 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_data.conf | 72 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_peer1.conf | 68 | ||||
-rw-r--r-- | src/hostlist/test_gnunet_daemon_hostlist_peer2.conf | 64 | ||||
-rw-r--r-- | src/hostlist/test_hostlist_defaults.conf | 50 | ||||
-rw-r--r-- | src/hostlist/test_learning_adv_peer.conf | 62 | ||||
-rw-r--r-- | src/hostlist/test_learning_learn_peer.conf | 59 | ||||
-rw-r--r-- | src/hostlist/test_learning_learn_peer2.conf | 56 |
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 | ||
68 | EXTRA_DIST = \ | 68 | EXTRA_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 |
2 | SERVICEHOME = /tmp/test-gnunetd-hostlist/ | ||
3 | DEFAULTCONFIG = /etc/gnunetd.conf | ||
4 | |||
5 | [hostlist] | 2 | [hostlist] |
6 | PORT = 23354 | ||
7 | # port for hostlist http server | ||
8 | HTTPPORT = 28080 | 3 | HTTPPORT = 28080 |
9 | HOSTNAME = localhost | ||
10 | HOME = $SERVICEHOME | ||
11 | CONFIG = $DEFAULTCONFIG | ||
12 | BINARY = gnunet-daemon-hostlist | ||
13 | OPTIONS = -b -e | 4 | OPTIONS = -b -e |
14 | SERVERS = http://gnunet.org:8080/ | 5 | SERVERS = http://gnunet.org:8080/ |
15 | # proxy for downloading hostlists | 6 | PORT = 23354 |
16 | HTTP-PROXY = | 7 | HOSTNAME = localhost |
17 | |||
18 | [testing] | ||
19 | WEAKRANDOM = YES | ||
20 | |||
21 | [mesh] | ||
22 | AUTOSTART = NO | ||
23 | |||
24 | |||
25 | |||
26 | [dns] | ||
27 | AUTOSTART = NO | ||
28 | |||
29 | |||
30 | 8 | ||
31 | [nse] | 9 | [datastore] |
32 | AUTOSTART = NO | 10 | AUTOSTART = YES |
33 | 11 | ||
12 | [fs] | ||
13 | AUTOSTART = 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] |
2 | SERVICEHOME = /tmp/test-gnunetd-core-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ |
3 | DEFAULTCONFIG = test_core_api_peer1.conf | ||
4 | |||
5 | [resolver] | ||
6 | PORT = 12464 | ||
7 | #PREFIX = xterm -T resolver1 -e valgrind --tool=memcheck | ||
8 | |||
9 | [transport] | ||
10 | PORT = 12465 | ||
11 | PLUGINS = 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] | ||
18 | PORT = 12466 | ||
19 | DEFAULTSERVICES = hostlist | ||
20 | #GLOBAL_PREFIX = xterm -e valgrind --tool=memcheck | ||
21 | |||
22 | [statistics] | ||
23 | PORT = 12467 | ||
24 | #PREFIX = xterm -T statistics1 -e valgrind --tool=memcheck | ||
25 | |||
26 | [tcp] | ||
27 | PORT = 12468 | ||
28 | |||
29 | [peerinfo] | ||
30 | PORT = 12469 | ||
31 | #PREFIX = xterm -T peerinfo1 -e valgrind --tool=memcheck | ||
32 | #PREFIX = xterm -T peerinfo1 -e | ||
33 | |||
34 | [core] | ||
35 | PORT = 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] | ||
43 | WEAKRANDOM = YES | ||
44 | 4 | ||
45 | [hostlist] | 5 | [hostlist] |
46 | OPTIONS = -b | ||
47 | SERVERS = http://localhost:22471/ | ||
48 | HTTP-PROXY = | ||
49 | HTTPPORT = 12471 | 6 | HTTPPORT = 12471 |
50 | [mesh] | 7 | SERVERS = http://localhost:22471/ |
51 | AUTOSTART = NO | ||
52 | |||
53 | |||
54 | |||
55 | [dns] | ||
56 | AUTOSTART = NO | ||
57 | |||
58 | |||
59 | |||
60 | [nse] | ||
61 | AUTOSTART = 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 |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist/ | 2 | [transport-tcp] |
3 | DEFAULTCONFIG = /etc/gnunetd.conf | 3 | PORT = 12968 |
4 | |||
5 | [hostlist] | ||
6 | PORT = 23354 | ||
7 | # port for hostlist http server | ||
8 | HTTPPORT = 28080 | ||
9 | HOSTNAME = localhost | ||
10 | HOME = $SERVICEHOME | ||
11 | CONFIG = $DEFAULTCONFIG | ||
12 | BINARY = gnunet-daemon-hostlist | ||
13 | # consider having "-e" as default as well once implemented | ||
14 | OPTIONS = -b | ||
15 | SERVERS = http://gnunet.org:8080/ | ||
16 | # proxy for downloading hostlists | ||
17 | HTTP-PROXY = | ||
18 | |||
19 | [resolver] | ||
20 | PORT = 12964 | ||
21 | |||
22 | [transport] | ||
23 | PORT = 12965 | ||
24 | PLUGINS = tcp | ||
25 | #DEBUG = YES | ||
26 | DEBUG = NO | ||
27 | 4 | ||
28 | [arm] | 5 | [arm] |
29 | PORT = 12966 | 6 | PORT = 12966 |
30 | DEFAULTSERVICES = hostlist topology | 7 | DEFAULTSERVICES = hostlist topology |
31 | #GLOBAL_PREFIX = xterm -e gdb -x cmd --args | ||
32 | 8 | ||
33 | [statistics] | 9 | [statistics] |
34 | PORT = 12967 | 10 | PORT = 12967 |
35 | 11 | ||
36 | [transport-tcp] | 12 | [resolver] |
37 | PORT = 12968 | 13 | PORT = 12964 |
38 | DEBUG = NO | ||
39 | 14 | ||
40 | [peerinfo] | 15 | [peerinfo] |
41 | PORT = 12969 | 16 | PORT = 12969 |
42 | 17 | ||
18 | [transport] | ||
19 | PORT = 12965 | ||
20 | |||
43 | [core] | 21 | [core] |
44 | PORT = 12970 | 22 | PORT = 12970 |
45 | #DEBUG = YES | ||
46 | #PREFIX = valgrind --tool=memcheck\ | ||
47 | DEBUG = NO | ||
48 | |||
49 | [testing] | ||
50 | WEAKRANDOM = YES | ||
51 | |||
52 | [topology] | ||
53 | #DEBUG = YES | ||
54 | #PREFIX = valgrind --tool=memcheck | ||
55 | DEBUG = NO | ||
56 | |||
57 | [fs] | ||
58 | AUTOSTART = NO | ||
59 | |||
60 | [datastore] | ||
61 | AUTOSTART = NO | ||
62 | [mesh] | ||
63 | AUTOSTART = NO | ||
64 | |||
65 | |||
66 | |||
67 | [dns] | ||
68 | AUTOSTART = NO | ||
69 | |||
70 | |||
71 | |||
72 | [nse] | ||
73 | AUTOSTART = NO | ||
74 | 23 | ||
24 | [hostlist] | ||
25 | HTTPPORT = 28080 | ||
26 | SERVERS = http://gnunet.org:8080/ | ||
27 | PORT = 23354 | ||
28 | HOSTNAME = 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] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ |
3 | DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf | 4 | DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf |
4 | 5 | ||
5 | [resolver] | 6 | [transport-tcp] |
6 | PORT = 12964 | 7 | PORT = 12968 |
7 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock | ||
8 | |||
9 | [transport] | ||
10 | PORT = 12965 | ||
11 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
12 | PLUGINS = tcp | ||
13 | #DEBUG = YES | ||
14 | DEBUG = NO | ||
15 | 8 | ||
16 | [arm] | 9 | [arm] |
17 | PORT = 12966 | 10 | PORT = 12966 |
18 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | ||
19 | DEFAULTSERVICES = hostlist topology | 11 | DEFAULTSERVICES = hostlist topology |
20 | #GLOBAL_PREFIX = xterm -e gdb -x cmd --args | 12 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
21 | 13 | ||
22 | [statistics] | 14 | [statistics] |
23 | PORT = 12967 | 15 | PORT = 12967 |
24 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock | 16 | UNIXPATH = /tmp/gnunet-p1-service-statistics.sock |
25 | 17 | ||
26 | [transport-tcp] | 18 | [resolver] |
27 | PORT = 12968 | 19 | PORT = 12964 |
28 | DEBUG = NO | 20 | UNIXPATH = /tmp/gnunet-p1-service-resolver.sock |
29 | 21 | ||
30 | [peerinfo] | 22 | [peerinfo] |
31 | PORT = 12969 | 23 | PORT = 12969 |
32 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock | 24 | UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock |
33 | 25 | ||
26 | [transport] | ||
27 | PORT = 12965 | ||
28 | UNIXPATH = /tmp/gnunet-p1-service-transport.sock | ||
29 | DEBUG = NO | ||
30 | |||
34 | [core] | 31 | [core] |
35 | PORT = 12970 | 32 | PORT = 12970 |
36 | UNIXPATH = /tmp/gnunet-p1-service-core.sock | 33 | UNIXPATH = /tmp/gnunet-p1-service-core.sock |
37 | #DEBUG = YES | ||
38 | #PREFIX = valgrind --tool=memcheck\ | ||
39 | DEBUG = NO | ||
40 | |||
41 | [testing] | ||
42 | WEAKRANDOM = YES | ||
43 | 34 | ||
44 | [hostlist] | 35 | [hostlist] |
45 | HTTPPORT = 12980 | 36 | HTTPPORT = 12980 |
46 | SERVERS = http://localhost:12981/ | ||
47 | OPTIONS = -b -p | ||
48 | HOSTLISTFILE = hostlists_peer1.file | 37 | HOSTLISTFILE = hostlists_peer1.file |
49 | #DEBUG = YES | 38 | OPTIONS = -b -p |
50 | #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist | 39 | SERVERS = http://localhost:12981/ |
51 | DEBUG = NO | ||
52 | |||
53 | [topology] | ||
54 | #DEBUG = YES | ||
55 | #PREFIX = valgrind --tool=memcheck | ||
56 | DEBUG = NO | ||
57 | |||
58 | [fs] | ||
59 | AUTOSTART = NO | ||
60 | |||
61 | [datastore] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | [dht] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | [mesh] | ||
68 | AUTOSTART = NO | ||
69 | |||
70 | |||
71 | |||
72 | [dns] | ||
73 | AUTOSTART = NO | ||
74 | |||
75 | |||
76 | |||
77 | [nse] | ||
78 | AUTOSTART = 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] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ |
3 | DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf | 4 | DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf |
4 | 5 | ||
5 | [resolver] | 6 | [transport-tcp] |
6 | PORT = 22964 | 7 | PORT = 22968 |
7 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | ||
8 | DEBUG = NO | ||
9 | |||
10 | [transport] | ||
11 | PORT = 22965 | ||
12 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
13 | PLUGINS = tcp | ||
14 | DEBUG = NO | ||
15 | 8 | ||
16 | [arm] | 9 | [arm] |
17 | PORT = 22966 | 10 | PORT = 22966 |
18 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock | ||
19 | DEFAULTSERVICES = hostlist topology | 11 | DEFAULTSERVICES = hostlist topology |
20 | #GLOBAL_PREFIX = xterm -e gdb -x cmd --args | 12 | UNIXPATH = /tmp/gnunet-p2-service-arm.sock |
21 | DEBUG = NO | ||
22 | 13 | ||
23 | [statistics] | 14 | [statistics] |
24 | PORT = 22967 | 15 | PORT = 22967 |
25 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock | 16 | UNIXPATH = /tmp/gnunet-p2-service-statistics.sock |
26 | 17 | ||
27 | [transport-tcp] | 18 | [resolver] |
28 | PORT = 22968 | 19 | PORT = 22964 |
29 | DEBUG = NO | 20 | UNIXPATH = /tmp/gnunet-p2-service-resolver.sock |
30 | 21 | ||
31 | [peerinfo] | 22 | [peerinfo] |
32 | PORT = 22969 | 23 | PORT = 22969 |
33 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock | 24 | UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock |
34 | 25 | ||
26 | [transport] | ||
27 | PORT = 22965 | ||
28 | UNIXPATH = /tmp/gnunet-p2-service-transport.sock | ||
29 | |||
35 | [core] | 30 | [core] |
36 | PORT = 22970 | 31 | PORT = 22970 |
37 | UNIXPATH = /tmp/gnunet-p2-service-core.sock | 32 | UNIXPATH = /tmp/gnunet-p2-service-core.sock |
38 | DEBUG = NO | ||
39 | #PREFIX = valgrind --tool=memcheck | ||
40 | |||
41 | [testing] | ||
42 | WEAKRANDOM = YES | ||
43 | 33 | ||
44 | [hostlist] | 34 | [hostlist] |
45 | HTTPPORT = 12981 | 35 | HTTPPORT = 12981 |
46 | SERVERS = http://localhost:12980/ | ||
47 | OPTIONS = -b -p | ||
48 | DEBUG = NO | ||
49 | HOSTLISTFILE = hostlists_peer2.file | 36 | HOSTLISTFILE = hostlists_peer2.file |
50 | #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist | 37 | OPTIONS = -b -p |
51 | 38 | SERVERS = http://localhost:12980/ | |
52 | [topology] | ||
53 | #DEBUG = YES | ||
54 | #PREFIX = valgrind --tool=memcheck | ||
55 | DEBUG = NO | ||
56 | |||
57 | [fs] | ||
58 | AUTOSTART = NO | ||
59 | |||
60 | [datastore] | ||
61 | AUTOSTART = NO | ||
62 | |||
63 | [dht] | ||
64 | AUTOSTART = NO[mesh] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | |||
68 | |||
69 | [dns] | ||
70 | AUTOSTART = NO | ||
71 | |||
72 | |||
73 | |||
74 | [nse] | ||
75 | AUTOSTART = 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] | ||
2 | SERVICEHOME = /tmp/test-gnunet-hostlist/ | ||
3 | DEFAULTCONFIG = test_hostlist_default.conf | ||
4 | |||
5 | [resolver] | ||
6 | PORT = 12464 | ||
7 | |||
8 | [transport] | ||
9 | PORT = 12465 | ||
10 | PLUGINS = tcp | ||
11 | |||
12 | [arm] | ||
13 | PORT = 12466 | ||
14 | DEFAULTSERVICES = hostlist | ||
15 | |||
16 | [statistics] | ||
17 | PORT = 12467 | ||
18 | |||
19 | [tcp] | ||
20 | PORT = 12468 | ||
21 | |||
22 | [peerinfo] | ||
23 | PORT = 12469 | ||
24 | |||
25 | [core] | ||
26 | PORT = 12470 | ||
27 | |||
28 | [testing] | ||
29 | WEAKRANDOM = YES | ||
30 | |||
31 | [hostlist] | ||
32 | HTTP-PROXY = | ||
33 | |||
34 | [mesh] | ||
35 | AUTOSTART = NO | ||
36 | |||
37 | [dns] | ||
38 | AUTOSTART = NO | ||
39 | |||
40 | [nse] | ||
41 | AUTOSTART = NO | ||
42 | |||
43 | [datastore] | ||
44 | AUTOSTART = NO | ||
45 | |||
46 | [fs] | ||
47 | AUTOSTART = NO | ||
48 | |||
49 | [dht] | ||
50 | AUTOSTART = 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] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/ |
3 | DEFAULTCONFIG = test_learning_adv_peer.conf | 4 | DEFAULTCONFIG = test_learning_adv_peer.conf |
4 | 5 | ||
5 | [resolver] | 6 | [transport-tcp] |
6 | PORT = 22964 | 7 | PORT = 22968 |
7 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock | ||
8 | |||
9 | [transport] | ||
10 | PORT = 22965 | ||
11 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock | ||
12 | PLUGINS = tcp | ||
13 | #DEBUG = YES | ||
14 | 8 | ||
15 | [arm] | 9 | [arm] |
16 | PORT = 22966 | 10 | PORT = 22966 |
17 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock | ||
18 | DEFAULTSERVICES = topology hostlist | 11 | DEFAULTSERVICES = topology hostlist |
19 | #GLOBAL_PREFIX = xterm -e gdb -x cmd --args | 12 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock |
20 | DEBUG=YES | ||
21 | 13 | ||
22 | [statistics] | 14 | [statistics] |
23 | PORT = 22967 | 15 | PORT = 22967 |
24 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock | 16 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock |
25 | HOSTNAME = localhost | ||
26 | 17 | ||
27 | [transport-tcp] | 18 | [resolver] |
28 | PORT = 22968 | 19 | PORT = 22964 |
20 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock | ||
29 | 21 | ||
30 | [peerinfo] | 22 | [peerinfo] |
31 | PORT = 22969 | 23 | PORT = 22969 |
32 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock | 24 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock |
33 | 25 | ||
26 | [transport] | ||
27 | PORT = 22965 | ||
28 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock | ||
29 | |||
34 | [core] | 30 | [core] |
35 | PORT = 22970 | 31 | PORT = 22970 |
36 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock | 32 | UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock |
37 | #DEBUG = YES | ||
38 | #PREFIX = valgrind --tool=memcheck | ||
39 | |||
40 | [testing] | ||
41 | WEAKRANDOM = YES | ||
42 | 33 | ||
43 | [hostlist] | 34 | [hostlist] |
44 | EXTERNAL_DNS_NAME = localhost | ||
45 | HTTPPORT = 12981 | 35 | HTTPPORT = 12981 |
46 | SERVERS = http://localhost:12981/ | ||
47 | OPTIONS = -p -a | ||
48 | #OPTIONS = -b -p -a | ||
49 | #DEBUG = YES | ||
50 | HOSTLISTFILE = hostlists_adv_peer.file | 36 | HOSTLISTFILE = hostlists_adv_peer.file |
51 | 37 | OPTIONS = -p -a | |
52 | [topology] | 38 | SERVERS = http://localhost:12981/ |
53 | #DEBUG = YES | 39 | EXTERNAL_DNS_NAME = localhost |
54 | #PREFIX = valgrind --tool=memcheck | ||
55 | |||
56 | [fs] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | [datastore] | ||
60 | AUTOSTART = NO | ||
61 | 40 | ||
62 | [dht] | 41 | [dht] |
63 | AUTOSTART = NO | 42 | AUTOSTART = NO |
64 | [mesh] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | |||
68 | |||
69 | [dns] | ||
70 | AUTOSTART = NO | ||
71 | |||
72 | |||
73 | |||
74 | [nse] | ||
75 | AUTOSTART = 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] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/ |
3 | DEFAULTCONFIG = test_learning_learn_peer.conf | 4 | DEFAULTCONFIG = test_learning_learn_peer.conf |
4 | 5 | ||
5 | [resolver] | 6 | [transport-tcp] |
6 | PORT = 12964 | 7 | PORT = 12968 |
7 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock | ||
8 | |||
9 | [transport] | ||
10 | PORT = 12965 | ||
11 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock | ||
12 | PLUGINS = tcp | ||
13 | #DEBUG = YES | ||
14 | 8 | ||
15 | [arm] | 9 | [arm] |
16 | PORT = 12966 | 10 | PORT = 12966 |
17 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock | ||
18 | DEFAULTSERVICES = topology hostlist | 11 | DEFAULTSERVICES = topology hostlist |
19 | #GLOBAL_PREFIX = xterm -e gdb -x cmd --args | 12 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock |
20 | #DEBUG=YES | ||
21 | 13 | ||
22 | [statistics] | 14 | [statistics] |
23 | PORT = 12967 | 15 | PORT = 12967 |
24 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock | 16 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock |
25 | HOSTNAME = localhost | ||
26 | 17 | ||
27 | [transport-tcp] | 18 | [resolver] |
28 | PORT = 12968 | 19 | PORT = 12964 |
20 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock | ||
29 | 21 | ||
30 | [peerinfo] | 22 | [peerinfo] |
31 | PORT = 12969 | 23 | PORT = 12969 |
32 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock | 24 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock |
33 | 25 | ||
26 | [transport] | ||
27 | PORT = 12965 | ||
28 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock | ||
34 | 29 | ||
35 | [core] | 30 | [core] |
36 | PORT = 12970 | 31 | PORT = 12970 |
37 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock | 32 | UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock |
38 | #DEBUG = YES | ||
39 | #PREFIX = valgrind --tool=memcheck | ||
40 | |||
41 | [testing] | ||
42 | WEAKRANDOM = YES | ||
43 | 33 | ||
44 | [hostlist] | 34 | [hostlist] |
45 | HTTPPORT = 12980 | 35 | HTTPPORT = 12980 |
46 | SERVERS = http://localhost:12981/ | ||
47 | OPTIONS = -b -e | ||
48 | #OPTIONS = -b -p | ||
49 | #DEBUG = YES | ||
50 | HOSTLISTFILE = hostlists_learn_peer.file | 36 | HOSTLISTFILE = hostlists_learn_peer.file |
51 | 37 | OPTIONS = -b -e | |
52 | [topology] | 38 | SERVERS = http://localhost:12981/ |
53 | #DEBUG = YES | ||
54 | #PREFIX = valgrind --tool=memcheck | ||
55 | |||
56 | [fs] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | [datastore] | ||
60 | AUTOSTART = NO | ||
61 | 39 | ||
62 | [dht] | 40 | [dht] |
63 | AUTOSTART = NO | 41 | AUTOSTART = NO |
64 | [mesh] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | |||
68 | |||
69 | [dns] | ||
70 | AUTOSTART = NO | ||
71 | |||
72 | |||
73 | |||
74 | [nse] | ||
75 | AUTOSTART = 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] |
2 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ | 3 | SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/ |
3 | DEFAULTCONFIG = test_learning_learn_peer2.conf | 4 | DEFAULTCONFIG = test_learning_learn_peer2.conf |
4 | 5 | ||
5 | [resolver] | 6 | [transport-tcp] |
6 | PORT = 32964 | 7 | PORT = 32968 |
7 | UNIXPATH = /tmp/gnunet-p3-service-resolver.sock | ||
8 | |||
9 | [transport] | ||
10 | PORT = 32965 | ||
11 | UNIXPATH = /tmp/gnunet-p3-service-transport.sock | ||
12 | PLUGINS = tcp | ||
13 | #DEBUG = YES | ||
14 | 8 | ||
15 | [arm] | 9 | [arm] |
16 | PORT = 32966 | 10 | PORT = 32966 |
17 | UNIXPATH = /tmp/gnunet-p3-service-arm.sock | ||
18 | DEFAULTSERVICES = topology hostlist | 11 | DEFAULTSERVICES = topology hostlist |
19 | #GLOBAL_PREFIX = xterm -e gdb -x cmd --args | 12 | UNIXPATH = /tmp/gnunet-p3-service-arm.sock |
20 | DEBUG=NO | ||
21 | 13 | ||
22 | [statistics] | 14 | [statistics] |
23 | PORT = 32967 | 15 | PORT = 32967 |
24 | UNIXPATH = /tmp/gnunet-p3-service-statistics.sock | 16 | UNIXPATH = /tmp/gnunet-p3-service-statistics.sock |
25 | HOSTNAME = localhost | ||
26 | 17 | ||
27 | [transport-tcp] | 18 | [resolver] |
28 | PORT = 32968 | 19 | PORT = 32964 |
20 | UNIXPATH = /tmp/gnunet-p3-service-resolver.sock | ||
29 | 21 | ||
30 | [peerinfo] | 22 | [peerinfo] |
31 | PORT = 32969 | 23 | PORT = 32969 |
32 | UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock | 24 | UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock |
33 | 25 | ||
26 | [transport] | ||
27 | PORT = 32965 | ||
28 | UNIXPATH = /tmp/gnunet-p3-service-transport.sock | ||
29 | |||
34 | [core] | 30 | [core] |
35 | PORT = 32970 | 31 | PORT = 32970 |
36 | UNIXPATH = /tmp/gnunet-p3-service-core.sock | 32 | UNIXPATH = /tmp/gnunet-p3-service-core.sock |
37 | #DEBUG = YES | ||
38 | #PREFIX = valgrind --tool=memcheck | ||
39 | |||
40 | [testing] | ||
41 | WEAKRANDOM = YES | ||
42 | 33 | ||
43 | [hostlist] | 34 | [hostlist] |
44 | HTTPPORT = 32980 | 35 | HTTPPORT = 32980 |
45 | SERVERS = http://localhost:12981/ | ||
46 | OPTIONS = -b -e | ||
47 | #OPTIONS = -b -p | ||
48 | #DEBUG = YES | ||
49 | HOSTLISTFILE = hostlists_learn_peer2.file | 36 | HOSTLISTFILE = hostlists_learn_peer2.file |
50 | #BINARY = /home/grothoff/bin/gnunet-daemon-hostlist | 37 | OPTIONS = -b -e |
51 | 38 | SERVERS = http://localhost:12981/ | |
52 | |||
53 | [topology] | ||
54 | #DEBUG = YES | ||
55 | #PREFIX = valgrind --tool=memcheck | ||
56 | [mesh] | ||
57 | AUTOSTART = NO | ||
58 | |||
59 | |||
60 | |||
61 | [dns] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | |||
65 | |||
66 | [nse] | ||
67 | AUTOSTART = NO | ||
68 | |||
69 | 39 | ||