aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/transport/Makefile.am1
-rw-r--r--src/transport/template_cfg_peer1.conf133
-rw-r--r--src/transport/template_cfg_peer2.conf134
-rw-r--r--src/transport/test_plugin_transport_data.conf34
-rw-r--r--src/transport/test_plugin_transport_data_http.conf58
-rw-r--r--src/transport/test_plugin_transport_data_udp.conf39
-rw-r--r--src/transport/test_quota_compliance_data.conf34
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf120
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf115
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf124
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf126
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf124
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf127
-rw-r--r--src/transport/test_quota_compliance_udp_peer1.conf118
-rw-r--r--src/transport/test_quota_compliance_udp_peer2.conf117
-rw-r--r--src/transport/test_quota_compliance_unix_peer1.conf116
-rw-r--r--src/transport/test_quota_compliance_unix_peer2.conf117
-rw-r--r--src/transport/test_transport_api_data.conf108
-rw-r--r--src/transport/test_transport_api_http_peer1.conf125
-rw-r--r--src/transport/test_transport_api_http_peer2.conf125
-rw-r--r--src/transport/test_transport_api_https_peer1.conf133
-rw-r--r--src/transport/test_transport_api_https_peer2.conf136
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf149
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf152
-rw-r--r--src/transport/test_transport_api_multiaddress_tcp_peer1.conf38
-rw-r--r--src/transport/test_transport_api_multiaddress_tcp_peer2.conf43
-rw-r--r--src/transport/test_transport_api_rel_http_peer1.conf129
-rw-r--r--src/transport/test_transport_api_rel_http_peer2.conf127
-rw-r--r--src/transport/test_transport_api_rel_https_peer1.conf131
-rw-r--r--src/transport/test_transport_api_rel_https_peer2.conf133
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf131
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf131
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf133
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf134
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf128
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf130
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf129
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf125
-rw-r--r--src/transport/test_transport_api_unix_peer1.conf126
-rw-r--r--src/transport/test_transport_api_unix_peer2.conf125
-rw-r--r--src/transport/test_transport_api_wlan_peer1.conf125
-rw-r--r--src/transport/test_transport_api_wlan_peer2.conf124
-rw-r--r--src/transport/test_transport_ats_1addr.conf76
-rw-r--r--src/transport/test_transport_ats_2addr.conf77
-rw-r--r--src/transport/test_transport_ats_4addr.conf86
-rw-r--r--src/transport/test_transport_defaults.conf46
46 files changed, 799 insertions, 4193 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 864dd8231..2ce2a48be 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -566,6 +566,7 @@ test_transport_api_multi_LDADD = \
566EXTRA_DIST = \ 566EXTRA_DIST = \
567 gnunet-transport-certificate-creation \ 567 gnunet-transport-certificate-creation \
568 ats_mlp_p100_m400.problem \ 568 ats_mlp_p100_m400.problem \
569 test_transport_defaults.conf \
569 test_transport_api_data.conf \ 570 test_transport_api_data.conf \
570 test_transport_api_tcp_peer1.conf \ 571 test_transport_api_tcp_peer1.conf \
571 test_transport_api_tcp_peer2.conf \ 572 test_transport_api_tcp_peer2.conf \
diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf
index 36c148f98..d724a6e8b 100644
--- a/src/transport/template_cfg_peer1.conf
+++ b/src/transport/template_cfg_peer1.conf
@@ -1,126 +1,31 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = template_cfg_peer1.conf
5
1[transport-tcp] 6[transport-tcp]
2PORT = 12000 7PORT = 12000
3 8TIMEOUT = 5000
4[nat]
5DISABLEV6 = YES
6BINDTO = 127.0.0.1
7BEHIND_NAT = NO
8#ALLOW_NAT = NO
9ENABLE_UPNP = NO
10INTERNAL_ADDRESS = 127.0.0.1
11EXTERNAL_ADDRESS = 127.0.0.1
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[transport]
33PLUGINS = tcp
34#DEBUG = YES
35#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
36#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg
37ACCEPT_FROM6 = ::1;
38ACCEPT_FROM = 127.0.0.1;
39NEIGHBOUR_LIMIT = 50
40#BINARY = gnunet-service-transport
41#BINARY = /home/grothoff/bin/gnunet-service-transport
42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME
44HOSTNAME = localhost
45PORT = 12001
46UNIXPATH = /tmp/gnunet-p1-service-transport.sock
47
48[peerinfo]
49TRUST = $SERVICEHOME/data/credit/
50HOSTS = $SERVICEHOME/data/hosts/
51ACCEPT_FROM6 = ::1;
52ACCEPT_FROM = 127.0.0.1;
53BINARY = gnunet-service-peerinfo
54CONFIG = $DEFAULTCONFIG
55HOME = $SERVICEHOME
56HOSTNAME = localhost
57PORT = 12002
58UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
59
60[resolver]
61ACCEPT_FROM6 = ::1;
62ACCEPT_FROM = 127.0.0.1;
63BINARY = gnunet-service-resolver
64CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME
66HOSTNAME = localhost
67PORT = 12003
68UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
69
70[statistics]
71AUTOSTART = YES
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12004
79UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
80 9
81[arm] 10[arm]
82DEFAULTSERVICES = transport
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 12005 11PORT = 12005
12DEFAULTSERVICES = transport
90UNIXPATH = /tmp/gnunet-p1-service-arm.sock 13UNIXPATH = /tmp/gnunet-p1-service-arm.sock
91 14
92[TESTING] 15[statistics]
93WEAKRANDOM = YES 16PORT = 12004
94 17UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
95[gnunetd]
96HOSTKEY = $SERVICEHOME/.hostkey
97
98[PATHS]
99#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
100SERVICEHOME = /tmp/test-transport/api-tcp-p1/
101
102[fs]
103AUTOSTART = NO
104
105[datastore]
106AUTOSTART = NO
107
108[core]
109AUTOSTART = NO
110
111[dht]
112AUTOSTART = NO
113
114[mesh]
115AUTOSTART = NO
116
117
118[dns]
119AUTOSTART = NO
120 18
19[resolver]
20PORT = 12003
21UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
121 22
23[peerinfo]
24PORT = 12002
25UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
122 26
123[nse] 27[transport]
124AUTOSTART = NO 28PORT = 12001
29UNIXPATH = /tmp/gnunet-p1-service-transport.sock
125 30
126 31
diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf
index c862a3556..2fb65b9c9 100644
--- a/src/transport/template_cfg_peer2.conf
+++ b/src/transport/template_cfg_peer2.conf
@@ -1,126 +1,32 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = template_cfg_peer2.conf
5
1[transport-tcp] 6[transport-tcp]
2PORT = 0 7PORT = 0
3 8TIMEOUT = 5000
4[nat]
5DISABLEV6 = YES
6BINDTO = 127.0.0.1
7BEHIND_NAT = NO
8#ALLOW_NAT = NO
9ENABLE_UPNP = NO
10EXTERNAL_ADDRESS = 127.0.0.1
11INTERNAL_ADDRESS = 127.0.0.1
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[transport]
33PLUGINS = tcp
34#DEBUG = YES
35ACCEPT_FROM6 = ::1;
36ACCEPT_FROM = 127.0.0.1;
37NEIGHBOUR_LIMIT = 50
38#BINARY = /home/grothoff/bin/gnunet-service-transport
39#BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME
42HOSTNAME = localhost
43PORT = 12010
44UNIXPATH = /tmp/gnunet-p2-service-transport.sock
45#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg
46#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 12011
59UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
60
61[resolver]
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12012
69UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
70
71[statistics]
72AUTOSTART = YES
73ACCEPT_FROM6 = ::1;
74ACCEPT_FROM = 127.0.0.1;
75BINARY = gnunet-service-statistics
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12013
80UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
81 9
82[arm] 10[arm]
83DEFAULTSERVICES = transport
84ACCEPT_FROM6 = ::1;
85ACCEPT_FROM = 127.0.0.1;
86BINARY = gnunet-service-arm
87CONFIG = $DEFAULTCONFIG
88HOME = $SERVICEHOME
89HOSTNAME = localhost
90PORT = 12014 11PORT = 12014
12DEFAULTSERVICES = transport
91UNIXPATH = /tmp/gnunet-p2-service-arm.sock 13UNIXPATH = /tmp/gnunet-p2-service-arm.sock
92 14
93[TESTING] 15[statistics]
94WEAKRANDOM = YES 16PORT = 12013
95 17UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
96[gnunetd]
97HOSTKEY = $SERVICEHOME/.hostkey
98
99[PATHS]
100#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
101SERVICEHOME = /tmp/test-transport/api-tcp-p2/
102
103[core]
104AUTOSTART = NO
105
106[fs]
107AUTOSTART = NO
108
109[datastore]
110AUTOSTART = NO
111
112[dht]
113AUTOSTART = NO
114
115[mesh]
116AUTOSTART = NO
117
118[dns]
119AUTOSTART = NO
120 18
19[resolver]
20PORT = 12012
21UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
121 22
23[peerinfo]
24PORT = 12011
25UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
26TRUST = $SERVICEHOME/data/credit/
122 27
123[nse] 28[transport]
124AUTOSTART = NO 29PORT = 12010
30UNIXPATH = /tmp/gnunet-p2-service-transport.sock
125 31
126 32
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf
index 329749314..e3e619fb3 100644
--- a/src/transport/test_plugin_transport_data.conf
+++ b/src/transport/test_plugin_transport_data.conf
@@ -1,12 +1,11 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ 3SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
4DEFAULTCONFIG = test_plugin_transport_data.conf
3 5
4[resolver] 6[transport-tcp]
5PORT = 2364 7PORT = 2368
6 8TIMEOUT = 5000
7[transport]
8PORT = 2365
9PLUGINS = tcp
10 9
11[arm] 10[arm]
12PORT = 2366 11PORT = 2366
@@ -14,28 +13,13 @@ PORT = 2366
14[statistics] 13[statistics]
15PORT = 2367 14PORT = 2367
16 15
17[transport-tcp] 16[resolver]
18PORT = 2368 17PORT = 2364
19 18
20[peerinfo] 19[peerinfo]
21PORT = 2369 20PORT = 2369
22 21
23[testing] 22[transport]
24WEAKRANDOM = YES 23PORT = 2365
25
26[dht]
27AUTOSTART = NO
28
29[mesh]
30AUTOSTART = NO
31
32
33[dns]
34AUTOSTART = NO
35
36
37
38[nse]
39AUTOSTART = NO
40 24
41 25
diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf
index 68b526cc8..e3982a1f5 100644
--- a/src/transport/test_plugin_transport_data_http.conf
+++ b/src/transport/test_plugin_transport_data_http.conf
@@ -1,68 +1,28 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2DEFAULTCONFIG = test_plugin_transport_data_http.conf
3SERVICEHOME = /tmp/test-transport/plugin_http/ 3SERVICEHOME = /tmp/test-transport/plugin_http/
4DEFAULTCONFIG = test_plugin_transport_data_http.conf
4 5
5[TESTING] 6[transport-tcp]
6WEAKRANDOM = YES 7TIMEOUT = 5000
7 8
8[transport-http] 9[transport-http]
9PORT = 12320 10PORT = 12320
10DEBUG = YES 11DEBUG = YES
11#USE_IPv4 = NO
12#USE_IPv6 = NO
13USE_IPv6 = YES 12USE_IPv6 = YES
14#BINDTO4 = 127.0.0.1
15#BINDTO6 = ::1
16#USE_LOCALADDR = YES
17
18 13
19[transport-https] 14[transport-https]
20PORT = 12321 15PORT = 12321
21DEBUG = YES 16CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
22#USE_IPv4 = NO
23#USE_IPv6 = NO
24USE_IPv6 = YES
25#BINDTO4 = 127.0.0.1
26#BINDTO6 = ::1
27KEY_FILE = https_key.key 17KEY_FILE = https_key.key
28CERT_FILE = https_cert.crt 18CERT_FILE = https_cert.crt
29CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL 19DEBUG = YES
30#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL 20USE_IPv6 = YES
31#CRYPTO_INIT = PERFORMANCE
32#USE_LOCALADDR = YES
33
34[transport]
35PREFIX = valgrind --leak-check=full
36#DEBUG = YES
37
38[statistics]
39ACCEPT_FROM6 = ::1;
40ACCEPT_FROM = 127.0.0.1;
41BINARY = gnunet-service-statistics
42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME
44HOSTNAME = localhost
45PORT = 12322
46 21
47[arm] 22[arm]
48DEFAULTSERVICES = topology hostlist
49ACCEPT_FROM6 = ::1;
50ACCEPT_FROM = 127.0.0.1;
51BINARY = gnunet-service-arm
52CONFIG = $DEFAULTCONFIG
53HOME = $SERVICEHOME
54HOSTNAME = localhost
55PORT = 12323 23PORT = 12323
56 24
57[dht] 25[statistics]
58AUTOSTART = NO 26PORT = 12322
59
60[mesh]
61AUTOSTART = NO
62
63[dns]
64AUTOSTART = NO
65[nse]
66AUTOSTART = NO
67 27
68 28
diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf
index 173addc7f..8b1378917 100644
--- a/src/transport/test_plugin_transport_data_udp.conf
+++ b/src/transport/test_plugin_transport_data_udp.conf
@@ -1,40 +1 @@
1[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
3
4[resolver]
5PORT = 2364
6
7[transport]
8PORT = 2365
9PLUGINS = udp
10
11[arm]
12PORT = 2366
13
14[statistics]
15PORT = 2367
16
17[transport-udp]
18PORT = 2368
19
20[peerinfo]
21PORT = 2369
22
23[testing]
24WEAKRANDOM = YES
25
26[dht]
27AUTOSTART = NO
28
29[mesh]
30AUTOSTART = NO
31
32[dns]
33AUTOSTART = NO
34
35
36
37[nse]
38AUTOSTART = NO
39
40
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf
index 885138076..7f93a15ba 100644
--- a/src/transport/test_quota_compliance_data.conf
+++ b/src/transport/test_quota_compliance_data.conf
@@ -1,12 +1,11 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunetd-plugin-transport/ 3SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
4DEFAULTCONFIG = test_quota_compliance_data.conf
3 5
4[resolver] 6[transport-tcp]
5PORT = 2364 7PORT = 2368
6 8TIMEOUT = 5000
7[transport]
8PORT = 2365
9PLUGINS = tcp
10 9
11[arm] 10[arm]
12PORT = 2366 11PORT = 2366
@@ -14,28 +13,13 @@ PORT = 2366
14[statistics] 13[statistics]
15PORT = 2367 14PORT = 2367
16 15
17[transport-tcp] 16[resolver]
18PORT = 2368 17PORT = 2364
19USE_LOCALADDR = YES
20 18
21[peerinfo] 19[peerinfo]
22PORT = 2369 20PORT = 2369
23 21
24[testing] 22[transport]
25WEAKRANDOM = YES 23PORT = 2365
26
27[dht]
28AUTOSTART = NO
29
30[mesh]
31AUTOSTART = NO
32
33[dns]
34AUTOSTART = NO
35
36
37
38[nse]
39AUTOSTART = NO
40 24
41 25
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 8d8229857..0411accaa 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -1,120 +1,14 @@
1[PATHS]
2SERVICEHOME = /tmp/test-transport/quota-http-p1/
3DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
4
5[fs]
6AUTOSTART = NO
7
8[datastore]
9AUTOSTART = NO
10
11[hostlist]
12HTTP-PROXY =
13SERVERS = http://gnunet.org:8080/
14OPTIONS = -b
15BINARY = gnunet-daemon-hostlist
16CONFIG = $DEFAULTCONFIG
17HOME = $SERVICEHOME
18HOSTNAME = localhost
19HTTPPORT = 8080
20
21[topology]
22BINARY = gnunet-daemon-topology
23CONFIG = $DEFAULTCONFIG
24FRIENDS = $SERVICEHOME/friends
25TARGET-CONNECTION-COUNT = 16
26AUTOCONNECT = YES
27FRIENDS-ONLY = NO
28MINIMUM-FRIENDS = 0
29
30[core]
31AUTOSTART = NO
32
33[transport-http]
34PORT = 4010
35DEBUG = NO
36USE_IPv4 = YES
37USE_IPv6 = NO
38BINDTO4 = 127.0.0.1
39#BINDTO6 = ::1
40USE_LOCALADDR = YES
41
42[transport]
43PORT = 4011
44UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock
45plugins = http
46#DEBUG = YES
47PREFIX =
48ACCEPT_FROM6 = ::1;
49ACCEPT_FROM = 127.0.0.1;
50NEIGHBOUR_LIMIT = 50
51BINARY = gnunet-service-transport
52CONFIG = $DEFAULTCONFIG
53HOME = $SERVICEHOME
54HOSTNAME = localhost
55
56[peerinfo]
57PORT = 4012
58UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock
59TRUST = $SERVICEHOME/data/credit/
60HOSTS = $SERVICEHOME/data/hosts/
61ACCEPT_FROM6 = ::1;
62ACCEPT_FROM = 127.0.0.1;
63BINARY = gnunet-service-peerinfo
64CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME
66HOSTNAME = localhost
67
68[resolver] 1[resolver]
69PORT = 4013 2PORT = 4013
70UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock 3UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock
71ACCEPT_FROM6 = ::1;
72ACCEPT_FROM = 127.0.0.1;
73BINARY = gnunet-service-resolver
74CONFIG = $DEFAULTCONFIG
75HOME = $SERVICEHOME
76HOSTNAME = localhost
77
78[statistics]
79PORT = 4014
80UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer1.sock
81ACCEPT_FROM6 = ::1;
82ACCEPT_FROM = 127.0.0.1;
83BINARY = gnunet-service-statistics
84CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME
86HOSTNAME = localhost
87
88[arm]
89PORT = 4015
90UNIXPATH = /tmp/test_quota_compliance_http_arm_peer1.sock
91DEFAULTSERVICES =
92ACCEPT_FROM6 = ::1;
93ACCEPT_FROM = 127.0.0.1;
94BINARY = gnunet-service-arm
95CONFIG = $DEFAULTCONFIG
96HOME = $SERVICEHOME
97HOSTNAME = localhost
98
99[TESTING]
100WEAKRANDOM = YES
101
102[gnunetd]
103HOSTKEY = $SERVICEHOME/.hostkey
104
105
106[dht]
107AUTOSTART = NO
108
109[mesh]
110AUTOSTART = NO
111
112[dns]
113AUTOSTART = NO
114
115 4
5[peerinfo]
6PORT = 4012
7UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock
116 8
117[nse] 9[transport]
118AUTOSTART = NO 10PORT = 4011
11PLUGINS = http
12UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock
119 13
120 14
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index 9b3dc9694..747c92114 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -1,3 +1,4 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
3DEFAULTCONFIG = test_quota_compliance_http_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
@@ -8,114 +9,26 @@ DEBUG = NO
8USE_IPv4 = YES 9USE_IPv4 = YES
9USE_IPv6 = NO 10USE_IPv6 = NO
10BINDTO4 = 127.0.0.1 11BINDTO4 = 127.0.0.1
11#BINDTO6 = ::1
12USE_LOCALADDR = YES
13
14[fs]
15AUTOSTART = NO
16
17[datastore]
18AUTOSTART = NO
19
20[hostlist]
21HTTP-PROXY =
22SERVERS = http://gnunet.org:8080/
23OPTIONS = -b
24BINARY = gnunet-daemon-hostlist
25CONFIG = $DEFAULTCONFIG
26HOME = $SERVICEHOME
27HOSTNAME = localhost
28HTTPPORT = 8080
29
30[topology]
31BINARY = gnunet-daemon-topology
32CONFIG = $DEFAULTCONFIG
33FRIENDS = $SERVICEHOME/friends
34TARGET-CONNECTION-COUNT = 16
35AUTOCONNECT = YES
36FRIENDS-ONLY = NO
37MINIMUM-FRIENDS = 0
38
39[core]
40AUTOSTART = NO
41
42[transport]
43PORT = 3011
44UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock
45plugins = http
46#DEBUG = YES
47PREFIX =
48ACCEPT_FROM6 = ::1;
49ACCEPT_FROM = 127.0.0.1;
50NEIGHBOUR_LIMIT = 50
51BINARY = gnunet-service-transport
52CONFIG = $DEFAULTCONFIG
53HOME = $SERVICEHOME
54HOSTNAME = localhost
55
56[peerinfo]
57PORT = 3012
58UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock
59TRUST = $SERVICEHOME/data/credit/
60HOSTS = $SERVICEHOME/data/hosts/
61ACCEPT_FROM6 = ::1;
62ACCEPT_FROM = 127.0.0.1;
63BINARY = gnunet-service-peerinfo
64CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME
66HOSTNAME = localhost
67
68[resolver]
69PORT = 3013
70UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock
71ACCEPT_FROM6 = ::1;
72ACCEPT_FROM = 127.0.0.1;
73BINARY = gnunet-service-resolver
74CONFIG = $DEFAULTCONFIG
75HOME = $SERVICEHOME
76HOSTNAME = localhost
77
78[statistics]
79PORT = 3014
80UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock
81ACCEPT_FROM6 = ::1;
82ACCEPT_FROM = 127.0.0.1;
83BINARY = gnunet-service-statistics
84CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME
86HOSTNAME = localhost
87 12
88[arm] 13[arm]
89PORT = 3015 14PORT = 3015
90UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock 15UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock
91DEFAULTSERVICES =
92ACCEPT_FROM6 = ::1;
93ACCEPT_FROM = 127.0.0.1;
94BINARY = gnunet-service-arm
95CONFIG = $DEFAULTCONFIG
96HOME = $SERVICEHOME
97HOSTNAME = localhost
98
99[TESTING]
100WEAKRANDOM = YES
101
102[gnunetd]
103HOSTKEY = $SERVICEHOME/.hostkey
104
105
106[dht]
107AUTOSTART = NO
108 16
109[mesh] 17[statistics]
110AUTOSTART = NO 18PORT = 3014
111 19UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock
112
113[dns]
114AUTOSTART = NO
115 20
21[resolver]
22PORT = 3013
23UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock
116 24
25[peerinfo]
26PORT = 3012
27UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock
117 28
118[nse] 29[transport]
119AUTOSTART = NO 30PORT = 3011
31PLUGINS = http
32UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock
120 33
121 34
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 1e6844462..692077c55 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -1,126 +1,36 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
3DEFAULTCONFIG = test_quota_compliance_https_peer1.conf 4DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
4 5
5[fs]
6AUTOSTART = NO
7
8[datastore]
9AUTOSTART = NO
10
11[hostlist]
12HTTP-PROXY =
13SERVERS = http://gnunet.org:8080/
14OPTIONS = -b
15BINARY = gnunet-daemon-hostlist
16CONFIG = $DEFAULTCONFIG
17HOME = $SERVICEHOME
18HOSTNAME = localhost
19HTTPPORT = 8080
20
21[topology]
22BINARY = gnunet-daemon-topology
23CONFIG = $DEFAULTCONFIG
24FRIENDS = $SERVICEHOME/friends
25TARGET-CONNECTION-COUNT = 16
26AUTOCONNECT = YES
27FRIENDS-ONLY = NO
28MINIMUM-FRIENDS = 0
29
30[core]
31AUTOSTART = NO
32
33[transport-https] 6[transport-https]
34PORT = 4001 7PORT = 4001
35#DEBUG = YES 8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
9KEY_FILE = https_key_quota_p1.key
10CERT_FILE = https_cert_quota_p1.crt
36USE_IPv4 = YES 11USE_IPv4 = YES
37USE_IPv6 = NO 12USE_IPv6 = NO
38BINDTO4 = 127.0.0.1 13BINDTO4 = 127.0.0.1
39#BINDTO6 = ::1
40KEY_FILE = https_key_quota_p1.key
41CERT_FILE = https_cert_quota_p1.crt
42CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
43#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
44#CRYPTO_INIT = PERFORMANCE
45USE_LOCALADDR = YES
46
47[transport]
48PORT = 4002
49UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
50plugins = https
51#DEBUG = YES
52PREFIX =
53ACCEPT_FROM6 = ::1;
54ACCEPT_FROM = 127.0.0.1;
55NEIGHBOUR_LIMIT = 50
56BINARY = gnunet-service-transport
57CONFIG = $DEFAULTCONFIG
58HOME = $SERVICEHOME
59HOSTNAME = localhost
60
61
62[peerinfo]
63PORT = 4003
64UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock
65TRUST = $SERVICEHOME/data/credit/
66HOSTS = $SERVICEHOME/data/hosts/
67ACCEPT_FROM6 = ::1;
68ACCEPT_FROM = 127.0.0.1;
69BINARY = gnunet-service-peerinfo
70CONFIG = $DEFAULTCONFIG
71HOME = $SERVICEHOME
72HOSTNAME = localhost
73
74
75[resolver]
76PORT = 4004
77UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock
78ACCEPT_FROM6 = ::1;
79ACCEPT_FROM = 127.0.0.1;
80BINARY = gnunet-service-resolver
81CONFIG = $DEFAULTCONFIG
82HOME = $SERVICEHOME
83HOSTNAME = localhost
84
85[statistics]
86PORT = 4005
87UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock
88ACCEPT_FROM6 = ::1;
89ACCEPT_FROM = 127.0.0.1;
90BINARY = gnunet-service-statistics
91CONFIG = $DEFAULTCONFIG
92HOME = $SERVICEHOME
93HOSTNAME = localhost
94 14
95[arm] 15[arm]
96PORT = 4006 16PORT = 4006
97UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock 17UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock
98DEFAULTSERVICES =
99ACCEPT_FROM6 = ::1;
100ACCEPT_FROM = 127.0.0.1;
101BINARY = gnunet-service-arm
102CONFIG = $DEFAULTCONFIG
103HOME = $SERVICEHOME
104HOSTNAME = localhost
105 18
106[TESTING] 19[statistics]
107WEAKRANDOM = YES 20PORT = 4005
108 21UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock
109[gnunetd]
110HOSTKEY = $SERVICEHOME/.hostkey
111
112[dht]
113AUTOSTART = NO
114
115[mesh]
116AUTOSTART = NO
117
118[dns]
119AUTOSTART = NO
120 22
23[resolver]
24PORT = 4004
25UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock
121 26
27[peerinfo]
28PORT = 4003
29UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock
122 30
123[nse] 31[transport]
124AUTOSTART = NO 32PORT = 4002
33PLUGINS = https
34UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock
125 35
126 36
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index a27e8ccf9..0d22f9c78 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -1,128 +1,36 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
3DEFAULTCONFIG = test_quota_compliance_https_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
4 5
5[transport-https] 6[transport-https]
6PORT = 3001 7PORT = 3001
7#DEBUG = YES 8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
9KEY_FILE = https_key_quota_p2.key
10CERT_FILE = https_cert_qutoa_p2.crt
8USE_IPv4 = YES 11USE_IPv4 = YES
9USE_IPv6 = NO 12USE_IPv6 = NO
10BINDTO4 = 127.0.0.1 13BINDTO4 = 127.0.0.1
11#BINDTO6 = ::1
12KEY_FILE = https_key_quota_p2.key
13CERT_FILE = https_cert_qutoa_p2.crt
14CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
15#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
16#CRYPTO_INIT = PERFORMANCE
17USE_LOCALADDR = YES
18
19[fs]
20AUTOSTART = NO
21
22[datastore]
23AUTOSTART = NO
24
25[hostlist]
26HTTP-PROXY =
27SERVERS = http://gnunet.org:8080/
28OPTIONS = -b
29BINARY = gnunet-daemon-hostlist
30CONFIG = $DEFAULTCONFIG
31HOME = $SERVICEHOME
32HOSTNAME = localhost
33HTTPPORT = 8080
34
35[topology]
36BINARY = gnunet-daemon-topology
37CONFIG = $DEFAULTCONFIG
38FRIENDS = $SERVICEHOME/friends
39TARGET-CONNECTION-COUNT = 16
40AUTOCONNECT = YES
41FRIENDS-ONLY = NO
42MINIMUM-FRIENDS = 0
43
44[core]
45AUTOSTART = NO
46
47[transport]
48PORT = 3002
49UNIXPATH = /tmp/https_transport_peer2.sock
50plugins = https
51#DEBUG = YES
52PREFIX =
53ACCEPT_FROM6 = ::1;
54ACCEPT_FROM = 127.0.0.1;
55NEIGHBOUR_LIMIT = 50
56BINARY = gnunet-service-transport
57CONFIG = $DEFAULTCONFIG
58HOME = $SERVICEHOME
59HOSTNAME = localhost
60
61
62[peerinfo]
63PORT = 3003
64UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
65TRUST = $SERVICEHOME/data/credit/
66HOSTS = $SERVICEHOME/data/hosts/
67ACCEPT_FROM6 = ::1;
68ACCEPT_FROM = 127.0.0.1;
69BINARY = gnunet-service-peerinfo
70CONFIG = $DEFAULTCONFIG
71HOME = $SERVICEHOME
72HOSTNAME = localhost
73
74[resolver]
75PORT = 3004
76UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
77ACCEPT_FROM6 = ::1;
78ACCEPT_FROM = 127.0.0.1;
79BINARY = gnunet-service-resolver
80CONFIG = $DEFAULTCONFIG
81HOME = $SERVICEHOME
82HOSTNAME = localhost
83
84[statistics]
85PORT = 3005
86UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
87ACCEPT_FROM6 = ::1;
88ACCEPT_FROM = 127.0.0.1;
89BINARY = gnunet-service-statistics
90CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME
92HOSTNAME = localhost
93
94 14
95[arm] 15[arm]
96PORT = 3006 16PORT = 3006
97UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock 17UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock
98DEFAULTSERVICES =
99ACCEPT_FROM6 = ::1;
100ACCEPT_FROM = 127.0.0.1;
101BINARY = gnunet-service-arm
102CONFIG = $DEFAULTCONFIG
103HOME = $SERVICEHOME
104HOSTNAME = localhost
105
106 18
107[TESTING] 19[statistics]
108WEAKRANDOM = YES 20PORT = 3005
109 21UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock
110[gnunetd]
111HOSTKEY = $SERVICEHOME/.hostkey
112
113
114[dht]
115AUTOSTART = NO
116
117[mesh]
118AUTOSTART = NO
119
120[dns]
121AUTOSTART = NO
122 22
23[resolver]
24PORT = 3004
25UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock
123 26
27[peerinfo]
28PORT = 3003
29UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock
124 30
125[nse] 31[transport]
126AUTOSTART = NO 32PORT = 3002
33PLUGINS = https
34UNIXPATH = /tmp/https_transport_peer2.sock
127 35
128 36
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index a8ea8a11c..99b8311ee 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -1,126 +1,32 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-transport/quota-tcp-p1/ 3SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
3DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf 4DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
4 5
5[fs]
6AUTOSTART = NO
7
8[datastore]
9AUTOSTART = NO
10
11[hostlist]
12HTTP-PROXY =
13SERVERS = http://gnunet.org:8080/
14OPTIONS = -b
15BINARY = gnunet-daemon-hostlist
16CONFIG = $DEFAULTCONFIG
17HOME = $SERVICEHOME
18HOSTNAME = localhost
19HTTPPORT = 8080
20
21[topology]
22BINARY = gnunet-daemon-topology
23CONFIG = $DEFAULTCONFIG
24FRIENDS = $SERVICEHOME/friends
25TARGET-CONNECTION-COUNT = 16
26AUTOCONNECT = YES
27FRIENDS-ONLY = NO
28MINIMUM-FRIENDS = 0
29
30[core]
31AUTOSTART = NO
32
33[transport-udp]
34PORT = 4094
35
36[transport-tcp] 6[transport-tcp]
37TIMEOUT = 300000
38PORT = 4094 7PORT = 4094
39 8
40[nat] 9[transport-udp]
41DISABLEV6 = YES 10PORT = 4094
42BINDTO = 127.0.0.1
43ENABLE_UPNP = NO
44BEHIND_NAT = NO
45ALLOW_NAT = NO
46INTERNAL_ADDRESS = 127.0.0.1
47EXTERNAL_ADDRESS = 127.0.0.1
48
49[transport]
50plugins = tcp
51#DEBUG = YES
52PREFIX =
53ACCEPT_FROM6 = ::1;
54ACCEPT_FROM = 127.0.0.1;
55NEIGHBOUR_LIMIT = 50
56BINARY = gnunet-service-transport
57CONFIG = $DEFAULTCONFIG
58HOME = $SERVICEHOME
59HOSTNAME = localhost
60PORT = 4091
61UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock
62
63[peerinfo]
64TRUST = $SERVICEHOME/data/credit/
65HOSTS = $SERVICEHOME/data/hosts/
66ACCEPT_FROM6 = ::1;
67ACCEPT_FROM = 127.0.0.1;
68BINARY = gnunet-service-peerinfo
69CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME
71HOSTNAME = localhost
72PORT = 4090
73UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock
74
75[resolver]
76ACCEPT_FROM6 = ::1;
77ACCEPT_FROM = 127.0.0.1;
78BINARY = gnunet-service-resolver
79CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME
81HOSTNAME = localhost
82PORT = 4089
83UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock
84
85[statistics]
86ACCEPT_FROM6 = ::1;
87ACCEPT_FROM = 127.0.0.1;
88BINARY = gnunet-service-statistics
89CONFIG = $DEFAULTCONFIG
90HOME = $SERVICEHOME
91HOSTNAME = localhost
92PORT = 4088
93UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock
94 11
95[arm] 12[arm]
96DEFAULTSERVICES =
97ACCEPT_FROM6 = ::1;
98ACCEPT_FROM = 127.0.0.1;
99BINARY = gnunet-service-arm
100CONFIG = $DEFAULTCONFIG
101HOME = $SERVICEHOME
102HOSTNAME = localhost
103PORT = 4087 13PORT = 4087
104UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock 14UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock
105 15
106[TESTING] 16[statistics]
107WEAKRANDOM = YES 17PORT = 4088
108 18UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock
109[gnunetd]
110HOSTKEY = $SERVICEHOME/.hostkey
111
112
113[dht]
114AUTOSTART = NO
115
116[mesh]
117AUTOSTART = NO
118[dns]
119AUTOSTART = NO
120 19
20[resolver]
21PORT = 4089
22UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock
121 23
24[peerinfo]
25PORT = 4090
26UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock
122 27
123[nse] 28[transport]
124AUTOSTART = NO 29PORT = 4091
30UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock
125 31
126 32
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index b79ed1f30..11457d0ac 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -1,129 +1,32 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
3DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
4 5
5[transport-udp]
6PORT = 3094
7
8[transport-tcp] 6[transport-tcp]
9TIMEOUT = 300000
10PORT = 3094 7PORT = 3094
11USE_LOCALADDR = YES
12
13[nat]
14DISABLEV6 = YES
15BINDTO = 127.0.0.1
16ENABLE_UPNP = NO
17BEHIND_NAT = NO
18ALLOW_NAT = NO
19INTERNAL_ADDRESS = 127.0.0.1
20EXTERNAL_ADDRESS = 127.0.0.1
21
22[fs]
23AUTOSTART = NO
24
25[datastore]
26AUTOSTART = NO
27
28[hostlist]
29HTTP-PROXY =
30SERVERS = http://gnunet.org:8080/
31OPTIONS = -b
32BINARY = gnunet-daemon-hostlist
33CONFIG = $DEFAULTCONFIG
34HOME = $SERVICEHOME
35HOSTNAME = localhost
36HTTPPORT = 8080
37
38[topology]
39BINARY = gnunet-daemon-topology
40CONFIG = $DEFAULTCONFIG
41FRIENDS = $SERVICEHOME/friends
42TARGET-CONNECTION-COUNT = 16
43AUTOCONNECT = YES
44FRIENDS-ONLY = NO
45MINIMUM-FRIENDS = 0
46
47[core]
48AUTOSTART = NO
49
50[transport]
51plugins = tcp
52#DEBUG = YES
53PREFIX =
54ACCEPT_FROM6 = ::1;
55ACCEPT_FROM = 127.0.0.1;
56NEIGHBOUR_LIMIT = 50
57BINARY = gnunet-service-transport
58CONFIG = $DEFAULTCONFIG
59HOME = $SERVICEHOME
60HOSTNAME = localhost
61PORT = 3091
62UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock
63
64[peerinfo]
65TRUST = $SERVICEHOME/data/credit/
66HOSTS = $SERVICEHOME/data/hosts/
67ACCEPT_FROM6 = ::1;
68ACCEPT_FROM = 127.0.0.1;
69BINARY = gnunet-service-peerinfo
70CONFIG = $DEFAULTCONFIG
71HOME = $SERVICEHOME
72HOSTNAME = localhost
73PORT = 3090
74UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock
75 8
76[resolver] 9[transport-udp]
77ACCEPT_FROM6 = ::1; 10PORT = 3094
78ACCEPT_FROM = 127.0.0.1;
79BINARY = gnunet-service-resolver
80CONFIG = $DEFAULTCONFIG
81HOME = $SERVICEHOME
82HOSTNAME = localhost
83PORT = 3089
84UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock
85
86[statistics]
87ACCEPT_FROM6 = ::1;
88ACCEPT_FROM = 127.0.0.1;
89BINARY = gnunet-service-statistics
90CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME
92HOSTNAME = localhost
93PORT = 3088
94UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock
95 11
96[arm] 12[arm]
97DEFAULTSERVICES =
98ACCEPT_FROM6 = ::1;
99ACCEPT_FROM = 127.0.0.1;
100BINARY = gnunet-service-arm
101CONFIG = $DEFAULTCONFIG
102HOME = $SERVICEHOME
103HOSTNAME = localhost
104PORT = 3087 13PORT = 3087
105UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer2.sock 14UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer2.sock
106 15
107[TESTING] 16[statistics]
108WEAKRANDOM = YES 17PORT = 3088
109 18UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer2.sock
110[gnunetd]
111HOSTKEY = $SERVICEHOME/.hostkey
112
113
114[dht]
115AUTOSTART = NO
116
117[mesh]
118AUTOSTART = NO
119
120
121[dns]
122AUTOSTART = NO
123 19
20[resolver]
21PORT = 3089
22UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer2.sock
124 23
24[peerinfo]
25PORT = 3090
26UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer2.sock
125 27
126[nse] 28[transport]
127AUTOSTART = NO 29PORT = 3091
30UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer2.sock
128 31
129 32
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index f62cceb2f..c524966d2 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -1,120 +1,30 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
3DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf 4DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
4 5
5[fs]
6AUTOSTART = NO
7
8[datastore]
9AUTOSTART = NO
10
11[hostlist]
12HTTP-PROXY =
13SERVERS = http://gnunet.org:8080/
14OPTIONS = -b
15BINARY = gnunet-daemon-hostlist
16CONFIG = $DEFAULTCONFIG
17HOME = $SERVICEHOME
18HOSTNAME = localhost
19HTTPPORT = 8080
20
21[topology]
22BINARY = gnunet-daemon-topology
23CONFIG = $DEFAULTCONFIG
24FRIENDS = $SERVICEHOME/friends
25TARGET-CONNECTION-COUNT = 16
26AUTOCONNECT = YES
27FRIENDS-ONLY = NO
28MINIMUM-FRIENDS = 0
29
30[core]
31AUTOSTART = NO
32
33[transport-udp] 6[transport-udp]
34PORT = 4368 7PORT = 4368
35MAX_BPS = 50000000 8MAX_BPS = 50000000
36 9
37[transport]
38plugins = udp
39#DEBUG = YES
40PREFIX =
41ACCEPT_FROM6 = ::1;
42ACCEPT_FROM = 127.0.0.1;
43NEIGHBOUR_LIMIT = 50
44BINARY = gnunet-service-transport
45CONFIG = $DEFAULTCONFIG
46HOME = $SERVICEHOME
47HOSTNAME = localhost
48PORT = 4091
49UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock
50
51[peerinfo]
52TRUST = $SERVICEHOME/data/credit/
53HOSTS = $SERVICEHOME/data/hosts/
54ACCEPT_FROM6 = ::1;
55ACCEPT_FROM = 127.0.0.1;
56BINARY = gnunet-service-peerinfo
57CONFIG = $DEFAULTCONFIG
58HOME = $SERVICEHOME
59HOSTNAME = localhost
60PORT = 4090
61UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock
62
63[resolver]
64ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1;
66BINARY = gnunet-service-resolver
67CONFIG = $DEFAULTCONFIG
68HOME = $SERVICEHOME
69HOSTNAME = localhost
70PORT = 4089
71UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock
72
73[statistics]
74ACCEPT_FROM6 = ::1;
75ACCEPT_FROM = 127.0.0.1;
76BINARY = gnunet-service-statistics
77CONFIG = $DEFAULTCONFIG
78HOME = $SERVICEHOME
79HOSTNAME = localhost
80PORT = 4088
81UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock
82
83[arm] 10[arm]
84DEFAULTSERVICES =
85ACCEPT_FROM6 = ::1;
86ACCEPT_FROM = 127.0.0.1;
87BINARY = gnunet-service-arm
88CONFIG = $DEFAULTCONFIG
89HOME = $SERVICEHOME
90HOSTNAME = localhost
91PORT = 4087 11PORT = 4087
92UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer1.sock 12UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer1.sock
93 13
94[TESTING] 14[statistics]
95WEAKRANDOM = YES 15PORT = 4088
96 16UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock
97[gnunetd]
98HOSTKEY = $SERVICEHOME/.hostkey
99
100
101[nat]
102# Are we behind NAT?
103BEHIND_NAT = NO
104
105[dht]
106AUTOSTART = NO
107
108[mesh]
109AUTOSTART = NO
110
111
112[dns]
113AUTOSTART = NO
114
115 17
18[resolver]
19PORT = 4089
20UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock
116 21
117[nse] 22[peerinfo]
118AUTOSTART = NO 23PORT = 4090
24UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock
119 25
26[transport]
27PORT = 4091
28PLUGINS = udp
29UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock
120 30
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index b06ac66f0..ca590cfc6 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,3 +1,4 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
3DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
@@ -6,115 +7,25 @@ DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
6PORT = 3368 7PORT = 3368
7MAX_BPS = 50000000 8MAX_BPS = 50000000
8 9
9[fs]
10AUTOSTART = NO
11
12[datastore]
13AUTOSTART = NO
14
15[hostlist]
16HTTP-PROXY =
17SERVERS = http://gnunet.org:8080/
18OPTIONS = -b
19BINARY = gnunet-daemon-hostlist
20CONFIG = $DEFAULTCONFIG
21HOME = $SERVICEHOME
22HOSTNAME = localhost
23HTTPPORT = 8080
24
25[topology]
26BINARY = gnunet-daemon-topology
27CONFIG = $DEFAULTCONFIG
28FRIENDS = $SERVICEHOME/friends
29TARGET-CONNECTION-COUNT = 16
30AUTOCONNECT = YES
31FRIENDS-ONLY = NO
32MINIMUM-FRIENDS = 0
33
34[core]
35AUTOSTART = NO
36
37[transport]
38plugins = udp
39#DEBUG = YES
40PREFIX =
41ACCEPT_FROM6 = ::1;
42ACCEPT_FROM = 127.0.0.1;
43NEIGHBOUR_LIMIT = 50
44BINARY = gnunet-service-transport
45CONFIG = $DEFAULTCONFIG
46HOME = $SERVICEHOME
47HOSTNAME = localhost
48PORT = 3091
49UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock
50
51[peerinfo]
52TRUST = $SERVICEHOME/data/credit/
53HOSTS = $SERVICEHOME/data/hosts/
54ACCEPT_FROM6 = ::1;
55ACCEPT_FROM = 127.0.0.1;
56BINARY = gnunet-service-peerinfo
57CONFIG = $DEFAULTCONFIG
58HOME = $SERVICEHOME
59HOSTNAME = localhost
60PORT = 3090
61UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock
62
63[resolver]
64ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1;
66BINARY = gnunet-service-resolver
67CONFIG = $DEFAULTCONFIG
68HOME = $SERVICEHOME
69HOSTNAME = localhost
70PORT = 3089
71UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock
72
73[statistics]
74ACCEPT_FROM6 = ::1;
75ACCEPT_FROM = 127.0.0.1;
76BINARY = gnunet-service-statistics
77CONFIG = $DEFAULTCONFIG
78HOME = $SERVICEHOME
79HOSTNAME = localhost
80PORT = 3088
81UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock
82
83[arm] 10[arm]
84DEFAULTSERVICES =
85ACCEPT_FROM6 = ::1;
86ACCEPT_FROM = 127.0.0.1;
87BINARY = gnunet-service-arm
88CONFIG = $DEFAULTCONFIG
89HOME = $SERVICEHOME
90HOSTNAME = localhost
91PORT = 3087 11PORT = 3087
92UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer2.sock 12UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer2.sock
93 13
94[TESTING] 14[statistics]
95WEAKRANDOM = YES 15PORT = 3088
96 16UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock
97[gnunetd]
98HOSTKEY = $SERVICEHOME/.hostkey
99
100[nat]
101# Are we behind NAT?
102BEHIND_NAT = NO
103
104
105[dht]
106AUTOSTART = NO
107
108[mesh]
109AUTOSTART = NO
110
111
112[dns]
113AUTOSTART = NO
114 17
18[resolver]
19PORT = 3089
20UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock
115 21
22[peerinfo]
23PORT = 3090
24UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock
116 25
117[nse] 26[transport]
118AUTOSTART = NO 27PORT = 3091
28PLUGINS = udp
29UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock
119 30
120 31
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index a85c2643b..0952b739f 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -1,116 +1,28 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer1/ 3SERVICEHOME = /tmp/test_quota_compliance_peer1/
3DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf 4DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
4 5
5[fs]
6AUTOSTART = NO
7
8[datastore]
9AUTOSTART = NO
10
11[hostlist]
12HTTP-PROXY =
13SERVERS = http://gnunet.org:8080/
14OPTIONS = -b
15BINARY = gnunet-daemon-hostlist
16CONFIG = $DEFAULTCONFIG
17HOME = $SERVICEHOME
18HOSTNAME = localhost
19HTTPPORT = 8080
20
21[topology]
22BINARY = gnunet-daemon-topology
23CONFIG = $DEFAULTCONFIG
24FRIENDS = $SERVICEHOME/friends
25TARGET-CONNECTION-COUNT = 16
26AUTOCONNECT = YES
27FRIENDS-ONLY = NO
28MINIMUM-FRIENDS = 0
29
30[core]
31AUTOSTART = NO
32
33[transport-unix]
34PORT = 4368
35
36
37[transport]
38plugins = unix
39#DEBUG = YES
40PREFIX =
41ACCEPT_FROM6 = ::1;
42ACCEPT_FROM = 127.0.0.1;
43NEIGHBOUR_LIMIT = 50
44BINARY = gnunet-service-transport
45CONFIG = $DEFAULTCONFIG
46HOME = $SERVICEHOME
47HOSTNAME = localhost
48PORT = 4091
49UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock
50
51[peerinfo]
52TRUST = $SERVICEHOME/data/credit/
53HOSTS = $SERVICEHOME/data/hosts/
54ACCEPT_FROM6 = ::1;
55ACCEPT_FROM = 127.0.0.1;
56BINARY = gnunet-service-peerinfo
57CONFIG = $DEFAULTCONFIG
58HOME = $SERVICEHOME
59HOSTNAME = localhost
60PORT = 4090
61UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock
62
63[resolver]
64ACCEPT_FROM6 = ::1;
65ACCEPT_FROM = 127.0.0.1;
66BINARY = gnunet-service-resolver
67CONFIG = $DEFAULTCONFIG
68HOME = $SERVICEHOME
69HOSTNAME = localhost
70PORT = 4089
71UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock
72
73[statistics]
74ACCEPT_FROM6 = ::1;
75ACCEPT_FROM = 127.0.0.1;
76BINARY = gnunet-service-statistics
77CONFIG = $DEFAULTCONFIG
78HOME = $SERVICEHOME
79HOSTNAME = localhost
80PORT = 4088
81UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock
82
83[arm] 6[arm]
84DEFAULTSERVICES =
85ACCEPT_FROM6 = ::1;
86ACCEPT_FROM = 127.0.0.1;
87BINARY = gnunet-service-arm
88CONFIG = $DEFAULTCONFIG
89HOME = $SERVICEHOME
90HOSTNAME = localhost
91PORT = 4087 7PORT = 4087
92UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock 8UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock
93 9
94[TESTING] 10[statistics]
95WEAKRANDOM = YES 11PORT = 4088
96 12UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock
97[gnunetd]
98HOSTKEY = $SERVICEHOME/.hostkey
99
100
101[dht]
102AUTOSTART = NO
103
104[mesh]
105AUTOSTART = NO
106
107 13
108[dns] 14[resolver]
109AUTOSTART = NO 15PORT = 4089
16UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock
110 17
18[peerinfo]
19PORT = 4090
20UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock
111 21
22[transport]
23PORT = 4091
24PLUGINS = unix
25UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock
112 26
113[nse]
114AUTOSTART = NO
115 27
116 28
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 7f84b9087..86c6701ba 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -1,114 +1,29 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test_quota_compliance_peer2 3SERVICEHOME = /tmp/test_quota_compliance_peer2
3DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf 4DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
4 5
5[transport-unix]
6PORT = 3368
7[fs]
8AUTOSTART = NO
9
10[datastore]
11AUTOSTART = NO
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[core]
33AUTOSTART = NO
34
35[transport]
36plugins = unix
37#DEBUG = YES
38PREFIX =
39ACCEPT_FROM6 = ::1;
40ACCEPT_FROM = 127.0.0.1;
41NEIGHBOUR_LIMIT = 50
42BINARY = gnunet-service-transport
43CONFIG = $DEFAULTCONFIG
44HOME = $SERVICEHOME
45HOSTNAME = localhost
46PORT = 3091
47UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 3090
59UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock
60
61[resolver]
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 3089
69UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock
70
71[statistics]
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 3088
79UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock
80
81[arm] 6[arm]
82DEFAULTSERVICES =
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 3087 7PORT = 3087
90UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock 8UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock
91 9
92[TESTING] 10[statistics]
93WEAKRANDOM = YES 11PORT = 3088
94 12UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock
95[gnunetd]
96HOSTKEY = $SERVICEHOME/.hostkey
97
98
99[dht]
100AUTOSTART = NO
101
102[mesh]
103AUTOSTART = NO
104
105
106[dns]
107AUTOSTART = NO
108 13
14[resolver]
15PORT = 3089
16UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock
109 17
18[peerinfo]
19PORT = 3090
20UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock
110 21
111[nse] 22[transport]
112AUTOSTART = NO 23PORT = 3091
24PLUGINS = unix
25UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock
113 26
27[transport-unix]
28PORT = 3368
114 29
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf
index a4c253e28..39552462a 100644
--- a/src/transport/test_transport_api_data.conf
+++ b/src/transport/test_transport_api_data.conf
@@ -1,114 +1,12 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-transport-api/
3DEFAULTCONFIG = test_transport_api_data.conf 3DEFAULTCONFIG = test_transport_api_data.conf
4 4
5[transport-udp]
6PORT = 2094
7
8[fs]
9AUTOSTART = NO
10
11[datastore]
12AUTOSTART = NO
13
14[hostlist]
15HTTP-PROXY =
16SERVERS = http://gnunet.org:8080/
17OPTIONS = -b
18BINARY = gnunet-daemon-hostlist
19CONFIG = $DEFAULTCONFIG
20HOME = $SERVICEHOME
21HOSTNAME = localhost
22HTTPPORT = 8080
23
24[topology]
25BINARY = gnunet-daemon-topology
26CONFIG = $DEFAULTCONFIG
27FRIENDS = $SERVICEHOME/friends
28TARGET-CONNECTION-COUNT = 16
29AUTOCONNECT = YES
30FRIENDS-ONLY = NO
31MINIMUM-FRIENDS = 0
32
33[core]
34AUTOSTART = NO
35
36[transport]
37#plugins = udp
38#DEBUG = YES
39PREFIX =
40ACCEPT_FROM6 = ::1;
41ACCEPT_FROM = 127.0.0.1;
42NEIGHBOUR_LIMIT = 50
43BINARY = gnunet-service-transport
44CONFIG = $DEFAULTCONFIG
45HOME = $SERVICEHOME
46HOSTNAME = localhost
47PORT = 2091
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 2090
59
60[resolver]
61ACCEPT_FROM6 = ::1;
62ACCEPT_FROM = 127.0.0.1;
63BINARY = gnunet-service-resolver
64CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME
66HOSTNAME = localhost
67PORT = 2089
68
69[statistics]
70ACCEPT_FROM6 = ::1;
71ACCEPT_FROM = 127.0.0.1;
72BINARY = gnunet-service-statistics
73CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME
75HOSTNAME = localhost
76PORT = 2088
77
78[arm]
79DEFAULTSERVICES =
80ACCEPT_FROM6 = ::1;
81ACCEPT_FROM = 127.0.0.1;
82BINARY = gnunet-service-arm
83CONFIG = $DEFAULTCONFIG
84HOME = $SERVICEHOME
85HOSTNAME = localhost
86PORT = 2087
87
88[transport-tcp] 5[transport-tcp]
89TIMEOUT = 300000
90PORT = 2094 6PORT = 2094
91 7
92[TESTING] 8[transport-udp]
93WEAKRANDOM = NO 9PORT = 2094
94
95[gnunetd]
96HOSTKEY = $SERVICEHOME/.hostkey
97
98
99[dht]
100AUTOSTART = NO
101
102[mesh]
103AUTOSTART = NO
104
105
106[dns]
107AUTOSTART = NO
108
109
110 10
111[nse]
112AUTOSTART = NO
113 11
114 12
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index 9366b4ef4..09a45e5e9 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,122 +1,33 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_http_peer1.conf
5
1[transport-http] 6[transport-http]
2PORT = 12080 7PORT = 12080
3DEBUG = NO 8DEBUG = NO
4USE_IPv6 = YES 9USE_IPv6 = YES
5USE_IPv4 = YES 10USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8USE_LOCALADDR = YES
9
10[hostlist]
11HTTP-PROXY =
12SERVERS = http://gnunet.org:8080/
13OPTIONS = -b
14BINARY = gnunet-daemon-hostlist
15CONFIG = $DEFAULTCONFIG
16HOME = $SERVICEHOME
17HOSTNAME = localhost
18HTTPPORT = 8080
19
20[topology]
21BINARY = gnunet-daemon-topology
22CONFIG = $DEFAULTCONFIG
23FRIENDS = $SERVICEHOME/friends
24TARGET-CONNECTION-COUNT = 16
25AUTOCONNECT = YES
26FRIENDS-ONLY = NO
27MINIMUM-FRIENDS = 0
28
29[transport]
30PLUGINS = http
31#DEBUG = YES
32ACCEPT_FROM6 = ::1;
33ACCEPT_FROM = 127.0.0.1;
34NEIGHBOUR_LIMIT = 50
35BINARY = gnunet-service-transport
36CONFIG = $DEFAULTCONFIG
37HOME = $SERVICEHOME
38HOSTNAME = localhost
39PORT = 12081
40UNIXPATH = /tmp/gnunet-p1-service-transport.sock
41#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
42#PREFIX = valgrind --leak-check=full
43#PREFIX = valgrind --tool=massif
44
45[peerinfo]
46TRUST = $SERVICEHOME/data/credit/
47HOSTS = $SERVICEHOME/data/hosts/
48ACCEPT_FROM6 = ::1;
49ACCEPT_FROM = 127.0.0.1;
50BINARY = gnunet-service-peerinfo
51CONFIG = $DEFAULTCONFIG
52HOME = $SERVICEHOME
53HOSTNAME = localhost
54PORT = 12082
55UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
56
57[resolver]
58ACCEPT_FROM6 = ::1;
59ACCEPT_FROM = 127.0.0.1;
60BINARY = gnunet-service-resolver
61CONFIG = $DEFAULTCONFIG
62HOME = $SERVICEHOME
63HOSTNAME = localhost
64PORT = 12083
65UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
66
67[statistics]
68ACCEPT_FROM6 = ::1;
69ACCEPT_FROM = 127.0.0.1;
70BINARY = gnunet-service-statistics
71CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME
73HOSTNAME = localhost
74PORT = 12084
75UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
76 11
77[arm] 12[arm]
78DEFAULTSERVICES =
79ACCEPT_FROM6 = ::1;
80ACCEPT_FROM = 127.0.0.1;
81BINARY = gnunet-service-arm
82CONFIG = $DEFAULTCONFIG
83HOME = $SERVICEHOME
84HOSTNAME = localhost
85PORT = 12085 13PORT = 12085
86UNIXPATH = /tmp/gnunet-p1-service-arm.sock 14UNIXPATH = /tmp/gnunet-p1-service-arm.sock
87 15
16[statistics]
17PORT = 12084
18UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
88 19
89[TESTING] 20[resolver]
90WEAKRANDOM = YES 21PORT = 12083
91 22UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
92[gnunetd]
93HOSTKEY = $SERVICEHOME/.hostkey
94
95[PATHS]
96SERVICEHOME = /tmp/test-transport/api-http-p1/
97
98[fs]
99AUTOSTART = NO
100
101[datastore]
102AUTOSTART = NO
103
104[core]
105AUTOSTART = NO
106
107[dht]
108AUTOSTART = NO
109
110[mesh]
111AUTOSTART = NO
112
113
114[dns]
115AUTOSTART = NO
116
117 23
24[peerinfo]
25PORT = 12082
26UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
118 27
119[nse] 28[transport]
120AUTOSTART = NO 29PORT = 12081
30PLUGINS = http
31UNIXPATH = /tmp/gnunet-p1-service-transport.sock
121 32
122 33
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index b3d21578a..3c3b269bb 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,122 +1,33 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_http_peer2.conf
5
1[transport-http] 6[transport-http]
2PORT = 12090 7PORT = 12090
3DEBUG = NO
4USE_IPv6 = YES 8USE_IPv6 = YES
5USE_IPv4 = YES 9USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8USE_LOCALADDR = YES 10USE_LOCALADDR = YES
9 11
10[hostlist]
11HTTP-PROXY =
12SERVERS = http://gnunet.org:8080/
13OPTIONS = -b
14BINARY = gnunet-daemon-hostlist
15CONFIG = $DEFAULTCONFIG
16HOME = $SERVICEHOME
17HOSTNAME = localhost
18HTTPPORT = 8080
19
20[topology]
21BINARY = gnunet-daemon-topology
22CONFIG = $DEFAULTCONFIG
23FRIENDS = $SERVICEHOME/friends
24TARGET-CONNECTION-COUNT = 16
25AUTOCONNECT = YES
26FRIENDS-ONLY = NO
27MINIMUM-FRIENDS = 0
28
29[transport]
30PLUGINS = http
31#DEBUG = YES
32ACCEPT_FROM6 = ::1;
33ACCEPT_FROM = 127.0.0.1;
34NEIGHBOUR_LIMIT = 50
35BINARY = gnunet-service-transport
36CONFIG = $DEFAULTCONFIG
37HOME = $SERVICEHOME
38HOSTNAME = localhost
39PORT = 12091
40UNIXPATH = /tmp/gnunet-p2-service-transport.sock
41#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
42#PREFIX = valgrind --leak-check=full
43#PREFIX = valgrind --tool=massif
44
45[peerinfo]
46TRUST = $SERVICEHOME/data/credit/
47HOSTS = $SERVICEHOME/data/hosts/
48ACCEPT_FROM6 = ::1;
49ACCEPT_FROM = 127.0.0.1;
50BINARY = gnunet-service-peerinfo
51CONFIG = $DEFAULTCONFIG
52HOME = $SERVICEHOME
53HOSTNAME = localhost
54PORT = 12092
55UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
56
57[resolver]
58ACCEPT_FROM6 = ::1;
59ACCEPT_FROM = 127.0.0.1;
60BINARY = gnunet-service-resolver
61CONFIG = $DEFAULTCONFIG
62HOME = $SERVICEHOME
63HOSTNAME = localhost
64PORT = 12093
65UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
66
67[statistics]
68ACCEPT_FROM6 = ::1;
69ACCEPT_FROM = 127.0.0.1;
70BINARY = gnunet-service-statistics
71CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME
73HOSTNAME = localhost
74PORT = 12094
75UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
76
77
78[arm] 12[arm]
79DEFAULTSERVICES =
80ACCEPT_FROM6 = ::1;
81ACCEPT_FROM = 127.0.0.1;
82BINARY = gnunet-service-arm
83CONFIG = $DEFAULTCONFIG
84HOME = $SERVICEHOME
85HOSTNAME = localhost
86PORT = 12095 13PORT = 12095
87UNIXPATH = /tmp/gnunet-p2-service-arm.sock 14UNIXPATH = /tmp/gnunet-p2-service-arm.sock
88 15
89[TESTING] 16[statistics]
90WEAKRANDOM = YES 17PORT = 12094
91 18UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
92[gnunetd]
93HOSTKEY = $SERVICEHOME/.hostkey
94
95[PATHS]
96SERVICEHOME = /tmp/test-transport/api-http-p2/
97
98[fs]
99AUTOSTART = NO
100
101[datastore]
102AUTOSTART = NO
103
104[core]
105AUTOSTART = NO
106
107[dht]
108AUTOSTART = NO
109
110[mesh]
111AUTOSTART = NO
112
113
114[dns]
115AUTOSTART = NO
116 19
20[resolver]
21PORT = 12093
22UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
117 23
24[peerinfo]
25PORT = 12092
26UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
118 27
119[nse] 28[transport]
120AUTOSTART = NO 29PORT = 12091
30PLUGINS = http
31UNIXPATH = /tmp/gnunet-p2-service-transport.sock
121 32
122 33
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index 719d9dd20..7a3a225f0 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,126 +1,35 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_https_peer1.conf
5
1[transport-https] 6[transport-https]
2PORT = 12100 7PORT = 12100
3DEBUG = NO 8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
4USE_IPv6 = YES
5USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8KEY_FILE = $SERVICEHOME/https_key_p1.key 9KEY_FILE = $SERVICEHOME/https_key_p1.key
9CERT_FILE = $SERVICEHOME/https_cert_p1.crt 10CERT_FILE = $SERVICEHOME/https_cert_p1.crt
10CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL 11USE_IPv6 = YES
11#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL 12USE_IPv4 = YES
12#CRYPTO_INIT = PERFORMANCE
13USE_LOCALADDR = YES
14
15[fs]
16AUTOSTART = NO
17
18[datastore]
19AUTOSTART = NO
20
21[core]
22AUTOSTART = NO
23
24[hostlist]
25HTTP-PROXY =
26SERVERS = http://gnunet.org:8080/
27OPTIONS = -b
28BINARY = gnunet-daemon-hostlist
29CONFIG = $DEFAULTCONFIG
30HOME = $SERVICEHOME
31HOSTNAME = localhost
32HTTPPORT = 8080
33
34[topology]
35BINARY = gnunet-daemon-topology
36CONFIG = $DEFAULTCONFIG
37FRIENDS = $SERVICEHOME/friends
38TARGET-CONNECTION-COUNT = 16
39AUTOCONNECT = YES
40FRIENDS-ONLY = NO
41MINIMUM-FRIENDS = 0
42
43[transport]
44PLUGINS = https
45DEBUG = NO
46ACCEPT_FROM6 = ::1;
47ACCEPT_FROM = 127.0.0.1;
48NEIGHBOUR_LIMIT = 50
49BINARY = gnunet-service-transport
50CONFIG = $DEFAULTCONFIG
51HOME = $SERVICEHOME
52HOSTNAME = localhost
53PORT = 12101
54UNIXPATH = /tmp/gnunet-p1-service-transport.sock
55#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
56#PREFIX = valgrind --leak-check=full
57#PREFIX = valgrind --tool=massif
58
59[peerinfo]
60TRUST = $SERVICEHOME/data/credit/
61HOSTS = $SERVICEHOME/data/hosts/
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-peerinfo
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12102
69UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
70 13
71[resolver] 14[arm]
72ACCEPT_FROM6 = ::1; 15PORT = 12105
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-resolver
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12103
79UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
80 16
81[statistics] 17[statistics]
82ACCEPT_FROM6 = ::1;
83ACCEPT_FROM = 127.0.0.1;
84BINARY = gnunet-service-statistics
85CONFIG = $DEFAULTCONFIG
86HOME = $SERVICEHOME
87HOSTNAME = localhost
88PORT = 12104 18PORT = 12104
89UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 19UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
90 20
91[arm] 21[resolver]
92DEFAULTSERVICES = 22PORT = 12103
93ACCEPT_FROM6 = ::1; 23UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
94ACCEPT_FROM = 127.0.0.1;
95BINARY = gnunet-service-arm
96CONFIG = $DEFAULTCONFIG
97HOME = $SERVICEHOME
98HOSTNAME = localhost
99PORT = 12105
100
101[TESTING]
102WEAKRANDOM = YES
103
104[gnunetd]
105HOSTKEY = $SERVICEHOME/.hostkey
106
107[PATHS]
108SERVICEHOME = /tmp/test-transport/api-https-p1/
109
110
111[dht]
112AUTOSTART = NO
113
114[mesh]
115AUTOSTART = NO
116
117
118[dns]
119AUTOSTART = NO
120
121 24
25[peerinfo]
26PORT = 12102
27UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
122 28
123[nse] 29[transport]
124AUTOSTART = NO 30PORT = 12101
31PLUGINS = https
32UNIXPATH = /tmp/gnunet-p1-service-transport.sock
33DEBUG = NO
125 34
126 35
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index 82206003a..2c45b27f7 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -1,128 +1,36 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_https_peer2.conf
5
1[transport-https] 6[transport-https]
2PORT = 12110 7PORT = 12110
3DEBUG = NO 8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
4USE_IPv6 = YES
5USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8KEY_FILE = $SERVICEHOME/https_key_p2.key 9KEY_FILE = $SERVICEHOME/https_key_p2.key
9CERT_FILE = $SERVICEHOME/https_cert_p2.crt 10CERT_FILE = $SERVICEHOME/https_cert_p2.crt
10CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL 11USE_IPv6 = YES
11#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL 12USE_IPv4 = YES
12#CRYPTO_INIT = PERFORMANCE
13USE_LOCALADDR = YES
14
15[fs]
16AUTOSTART = NO
17
18[datastore]
19AUTOSTART = NO
20
21[core]
22AUTOSTART = NO
23
24[hostlist]
25HTTP-PROXY =
26SERVERS = http://gnunet.org:8080/
27OPTIONS = -b
28BINARY = gnunet-daemon-hostlist
29CONFIG = $DEFAULTCONFIG
30HOME = $SERVICEHOME
31HOSTNAME = localhost
32HTTPPORT = 8080
33
34[topology]
35BINARY = gnunet-daemon-topology
36CONFIG = $DEFAULTCONFIG
37FRIENDS = $SERVICEHOME/friends
38TARGET-CONNECTION-COUNT = 16
39AUTOCONNECT = YES
40FRIENDS-ONLY = NO
41MINIMUM-FRIENDS = 0
42
43[transport]
44PLUGINS = https
45#PLUGINS = tcp http
46DEBUG = NO
47ACCEPT_FROM6 = ::1;
48ACCEPT_FROM = 127.0.0.1;
49NEIGHBOUR_LIMIT = 50
50BINARY = gnunet-service-transport
51CONFIG = $DEFAULTCONFIG
52HOME = $SERVICEHOME
53HOSTNAME = localhost
54PORT = 12111
55UNIXPATH = /tmp/gnunet-p2-service-transport.sock
56#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
57#PREFIX = valgrind --leak-check=full
58#PREFIX = valgrind --tool=massif
59
60[peerinfo]
61TRUST = $SERVICEHOME/data/credit/
62HOSTS = $SERVICEHOME/data/hosts/
63ACCEPT_FROM6 = ::1;
64ACCEPT_FROM = 127.0.0.1;
65BINARY = gnunet-service-peerinfo
66CONFIG = $DEFAULTCONFIG
67HOME = $SERVICEHOME
68HOSTNAME = localhost
69PORT = 12112
70UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
71
72[resolver]
73ACCEPT_FROM6 = ::1;
74ACCEPT_FROM = 127.0.0.1;
75BINARY = gnunet-service-resolver
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12113
80UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
81
82[statistics]
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-statistics
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 12114
90UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
91
92 13
93[arm] 14[arm]
94DEFAULTSERVICES =
95ACCEPT_FROM6 = ::1;
96ACCEPT_FROM = 127.0.0.1;
97BINARY = gnunet-service-arm
98CONFIG = $DEFAULTCONFIG
99HOME = $SERVICEHOME
100HOSTNAME = localhost
101PORT = 12115 15PORT = 12115
102UNIXPATH = /tmp/gnunet-p2-service-arm.sock 16UNIXPATH = /tmp/gnunet-p2-service-arm.sock
103 17
104[TESTING] 18[statistics]
105WEAKRANDOM = YES 19PORT = 12114
106 20UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
107[gnunetd]
108HOSTKEY = $SERVICEHOME/.hostkey
109
110[PATHS]
111SERVICEHOME = /tmp/test-transport/api-https-p2/
112
113[dht]
114AUTOSTART = NO
115
116[mesh]
117AUTOSTART = NO
118
119
120[dns]
121AUTOSTART = NO
122 21
22[resolver]
23PORT = 12113
24UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
123 25
26[peerinfo]
27PORT = 12112
28UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
124 29
125[nse] 30[transport]
126AUTOSTART = NO 31PORT = 12111
32PLUGINS = https
33UNIXPATH = /tmp/gnunet-p2-service-transport.sock
34DEBUG = NO
127 35
128 36
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index a3e315001..f3ee31bb1 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,152 +1,47 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-multi-p1/
4DEFAULTCONFIG = test_transport_api_multi_peer1.conf
5
1[transport-tcp] 6[transport-tcp]
2PORT = 12140 7PORT = 12140
3#BINDTO = 127.0.0.1 8TIMEOUT = 5000
4USE_LOCALADDR = YES
5
6[nat]
7DISABLEV6 = YES
8BEHIND_NAT = NO
9#ALLOW_NAT = NO
10ENABLE_UPNP = NO
11INTERNAL_ADDRESS = 127.0.0.1
12EXTERNAL_ADDRESS = 127.0.0.1
13 9
14[transport-udp] 10[transport-udp]
15PORT = 12141 11PORT = 12141
16USE_LOCALADDR = YES
17 12
18[transport-http] 13[transport-http]
19PORT = 12142 14PORT = 12142
20DEBUG = NO
21USE_IPv6 = YES 15USE_IPv6 = YES
22USE_IPv4 = YES 16USE_IPv4 = YES
23#BINDTO4 = 127.0.0.1
24#BINDTO6 = ::1
25USE_LOCALADDR = YES
26 17
27[transport-https] 18[transport-https]
28PORT = 12143 19PORT = 12143
29DEBUG = NO
30USE_IPv6 = YES 20USE_IPv6 = YES
31USE_IPv4 = YES 21USE_IPv4 = YES
32#BINDTO4 = 127.0.0.1
33#BINDTO6 = ::1
34USE_LOCALADDR = YES
35
36[transport-unix]
37PORT = 12144
38
39[fs]
40AUTOSTART = NO
41
42[datastore]
43AUTOSTART = NO
44
45[core]
46AUTOSTART = NO
47
48[hostlist]
49HTTP-PROXY =
50SERVERS = http://gnunet.org:8080/
51OPTIONS = -b
52BINARY = gnunet-daemon-hostlist
53CONFIG = $DEFAULTCONFIG
54HOME = $SERVICEHOME
55HOSTNAME = localhost
56HTTPPORT = 8080
57
58[topology]
59BINARY = gnunet-daemon-topology
60CONFIG = $DEFAULTCONFIG
61FRIENDS = $SERVICEHOME/friends
62TARGET-CONNECTION-COUNT = 16
63AUTOCONNECT = YES
64FRIENDS-ONLY = NO
65MINIMUM-FRIENDS = 0
66
67[transport]
68PLUGINS = tcp udp unix
69#DEBUG = YES
70#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
71#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74NEIGHBOUR_LIMIT = 50
75BINARY = gnunet-service-transport
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12145
80UNIXPATH = /tmp/gnunet-p1-service-transport.sock
81
82[peerinfo]
83TRUST = $SERVICEHOME/data/credit/
84HOSTS = $SERVICEHOME/data/hosts/
85ACCEPT_FROM6 = ::1;
86ACCEPT_FROM = 127.0.0.1;
87BINARY = gnunet-service-peerinfo
88CONFIG = $DEFAULTCONFIG
89HOME = $SERVICEHOME
90HOSTNAME = localhost
91PORT = 12146
92UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
93
94[resolver]
95ACCEPT_FROM6 = ::1;
96ACCEPT_FROM = 127.0.0.1;
97BINARY = gnunet-service-resolver
98CONFIG = $DEFAULTCONFIG
99HOME = $SERVICEHOME
100HOSTNAME = localhost
101PORT = 12147
102UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
103
104[statistics]
105AUTOSTART = YES
106ACCEPT_FROM6 = ::1;
107ACCEPT_FROM = 127.0.0.1;
108BINARY = gnunet-service-statistics
109CONFIG = $DEFAULTCONFIG
110HOME = $SERVICEHOME
111HOSTNAME = localhost
112PORT = 12148
113UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
114 22
115[arm] 23[arm]
116DEFAULTSERVICES = transport
117ACCEPT_FROM6 = ::1;
118ACCEPT_FROM = 127.0.0.1;
119BINARY = gnunet-service-arm
120CONFIG = $DEFAULTCONFIG
121HOME = $SERVICEHOME
122HOSTNAME = localhost
123PORT = 12149 24PORT = 12149
25DEFAULTSERVICES = transport
124UNIXPATH = /tmp/gnunet-p1-service-arm.sock 26UNIXPATH = /tmp/gnunet-p1-service-arm.sock
125 27
126[TESTING] 28[statistics]
127WEAKRANDOM = YES 29PORT = 12148
128 30UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
129[gnunetd]
130HOSTKEY = $SERVICEHOME/.hostkey
131
132[PATHS]
133DEFAULTCONFIG = test_transport_api_multi_peer1.conf
134SERVICEHOME = /tmp/test-transport/api-multi-p1/
135
136
137[dht]
138AUTOSTART = NO
139
140[mesh]
141AUTOSTART = NO
142
143
144[dns]
145AUTOSTART = NO
146 31
32[resolver]
33PORT = 12147
34UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
147 35
36[peerinfo]
37PORT = 12146
38UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
148 39
149[nse] 40[transport]
150AUTOSTART = NO 41PORT = 12145
42PLUGINS = tcp udp unix
43UNIXPATH = /tmp/gnunet-p1-service-transport.sock
151 44
45[transport-unix]
46PORT = 12144
152 47
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index 222f165f0..889145fc3 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,154 +1,50 @@
1[transport-tcp] 1@INLINE@ test_transport_defaults.conf
2PORT = 12150 2[PATHS]
3USE_LOCALADDR = YES 3SERVICEHOME = /tmp/test-transport/api-multi-p2/
4DEFAULTCONFIG = test_transport_api_multi_peer2.conf
4 5
5[nat] 6[nat]
6BINDTO = 127.0.0.1
7DISABLEV6 = YES
8BEHIND_NAT = NO
9ALLOW_NAT = NO 7ALLOW_NAT = NO
10ENABLE_UPNP = NO 8
11EXTERNAL_ADDRESS = 127.0.0.1 9[transport-tcp]
12INTERNAL_ADDRESS = 127.0.0.1 10PORT = 12150
11TIMEOUT = 5000
13 12
14[transport-udp] 13[transport-udp]
15PORT = 12151 14PORT = 12151
16USE_LOCALADDR = YES
17 15
18[transport-http] 16[transport-http]
19PORT = 12152 17PORT = 12152
20DEBUG = NO
21USE_IPv6 = YES 18USE_IPv6 = YES
22USE_IPv4 = YES 19USE_IPv4 = YES
23#BINDTO4 = 127.0.0.1
24#BINDTO6 = ::1
25USE_LOCALADDR = YES
26 20
27[transport-https] 21[transport-https]
28PORT = 12153 22PORT = 12153
29DEBUG = NO
30USE_IPv6 = YES 23USE_IPv6 = YES
31USE_IPv4 = YES 24USE_IPv4 = YES
32#BINDTO4 = 127.0.0.1
33#BINDTO6 = ::1
34USE_LOCALADDR = YES
35
36[transport-unix]
37PORT = 12154
38
39[core]
40AUTOSTART = NO
41
42[fs]
43AUTOSTART = NO
44
45[datastore]
46AUTOSTART = NO
47
48[hostlist]
49HTTP-PROXY =
50SERVERS = http://gnunet.org:8080/
51OPTIONS = -b
52BINARY = gnunet-daemon-hostlist
53CONFIG = $DEFAULTCONFIG
54HOME = $SERVICEHOME
55HOSTNAME = localhost
56HTTPPORT = 8080
57
58[topology]
59BINARY = gnunet-daemon-topology
60CONFIG = $DEFAULTCONFIG
61FRIENDS = $SERVICEHOME/friends
62TARGET-CONNECTION-COUNT = 16
63AUTOCONNECT = YES
64FRIENDS-ONLY = NO
65MINIMUM-FRIENDS = 0
66
67[transport]
68PLUGINS = tcp udp unix
69#DEBUG = YES
70ACCEPT_FROM6 = ::1;
71ACCEPT_FROM = 127.0.0.1;
72NEIGHBOUR_LIMIT = 50
73#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
74BINARY = gnunet-service-transport
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12155
79UNIXPATH = /tmp/gnunet-p2-service-transport.sock
80#PREFIX = valgrind --tool=callgrind
81#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
82#PREFIX = valgrind --leak-check=full
83
84[peerinfo]
85TRUST = $SERVICEHOME/data/credit/
86HOSTS = $SERVICEHOME/data/hosts/
87ACCEPT_FROM6 = ::1;
88ACCEPT_FROM = 127.0.0.1;
89BINARY = gnunet-service-peerinfo
90CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME
92HOSTNAME = localhost
93PORT = 12156
94UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
95
96[resolver]
97ACCEPT_FROM6 = ::1;
98ACCEPT_FROM = 127.0.0.1;
99BINARY = gnunet-service-resolver
100CONFIG = $DEFAULTCONFIG
101HOME = $SERVICEHOME
102HOSTNAME = localhost
103PORT = 12157
104UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
105
106[statistics]
107AUTOSTART = YES
108ACCEPT_FROM6 = ::1;
109ACCEPT_FROM = 127.0.0.1;
110BINARY = gnunet-service-statistics
111CONFIG = $DEFAULTCONFIG
112HOME = $SERVICEHOME
113HOSTNAME = localhost
114PORT = 12158
115UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
116 25
117[arm] 26[arm]
118DEFAULTSERVICES = transport
119ACCEPT_FROM6 = ::1;
120ACCEPT_FROM = 127.0.0.1;
121BINARY = gnunet-service-arm
122CONFIG = $DEFAULTCONFIG
123HOME = $SERVICEHOME
124HOSTNAME = localhost
125PORT = 12159 27PORT = 12159
28DEFAULTSERVICES = transport
126UNIXPATH = /tmp/gnunet-p2-service-arm.sock 29UNIXPATH = /tmp/gnunet-p2-service-arm.sock
127 30
128[TESTING] 31[statistics]
129WEAKRANDOM = YES 32PORT = 12158
130 33UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
131[gnunetd]
132HOSTKEY = $SERVICEHOME/.hostkey
133
134[PATHS]
135DEFAULTCONFIG = test_transport_api_multi_peer2.conf
136SERVICEHOME = /tmp/test-transport/api-multi-p2/
137
138
139[dht]
140AUTOSTART = NO
141
142[mesh]
143AUTOSTART = NO
144
145
146[dns]
147AUTOSTART = NO
148 34
35[resolver]
36PORT = 12157
37UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
149 38
39[peerinfo]
40PORT = 12156
41UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
150 42
151[nse] 43[transport]
152AUTOSTART = NO 44PORT = 12155
45PLUGINS = tcp udp unix
46UNIXPATH = /tmp/gnunet-p2-service-transport.sock
153 47
48[transport-unix]
49PORT = 12154
154 50
diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf b/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
index 2172a5e01..974481fde 100644
--- a/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
+++ b/src/transport/test_transport_api_multiaddress_tcp_peer1.conf
@@ -1,23 +1,33 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = template_cfg_peer1.conf
5
1[transport-tcp] 6[transport-tcp]
2PORT = 12000 7PORT = 12000
8TIMEOUT = 5000
3BINDTO = 127.0.0.1 9BINDTO = 127.0.0.1
4 10
5[nat] 11[arm]
6DISABLEV6 = YES 12PORT = 12005
7BEHIND_NAT = NO 13DEFAULTSERVICES = transport
8#ALLOW_NAT = NO 14UNIXPATH = /tmp/gnunet-p1-service-arm.sock
9ENABLE_UPNP = NO
10#INTERNAL_ADDRESS = 127.0.0.1
11#EXTERNAL_ADDRESS = 127.0.0.1
12USE_LOCALADDR = YES
13 15
14[transport] 16[statistics]
15DEBUG = NO 17PORT = 12004
16#PREFIX = valgrind --leak-check=full 18UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
17 19
18@INLINE@ template_cfg_peer1.conf 20[resolver]
21PORT = 12003
22UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
19 23
20[nse] 24[peerinfo]
21AUTOSTART = NO 25PORT = 12002
26UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
27
28[transport]
29PORT = 12001
30UNIXPATH = /tmp/gnunet-p1-service-transport.sock
31DEBUG = NO
22 32
23 33
diff --git a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf b/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
index f166790a8..0d4869f77 100644
--- a/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
+++ b/src/transport/test_transport_api_multiaddress_tcp_peer2.conf
@@ -1,23 +1,36 @@
1[transport-tcp] 1@INLINE@ test_transport_defaults.conf
2PORT = 12200 2[PATHS]
3BINDTO = 127.0.0.1 3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = template_cfg_peer2.conf
4 5
5[nat] 6[nat]
6DISABLEV6 = YES
7BEHIND_NAT = NO
8ALLOW_NAT = NO 7ALLOW_NAT = NO
9ENABLE_UPNP = NO
10#EXTERNAL_ADDRESS = 127.0.0.1
11#INTERNAL_ADDRESS = 127.0.0.1
12USE_LOCALADDR = YES
13 8
14[transport] 9[transport-tcp]
15DEBUG = NO 10PORT = 0
16#PREFIX = valgrind --leak-check=full 11TIMEOUT = 5000
12BINDTO = 127.0.0.1
17 13
18@INLINE@ template_cfg_peer2.conf 14[arm]
15PORT = 12014
16DEFAULTSERVICES = transport
17UNIXPATH = /tmp/gnunet-p2-service-arm.sock
19 18
20[nse] 19[statistics]
21AUTOSTART = NO 20PORT = 12013
21UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
22
23[resolver]
24PORT = 12012
25UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
26
27[peerinfo]
28PORT = 12011
29UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
30
31[transport]
32PORT = 12010
33UNIXPATH = /tmp/gnunet-p2-service-transport.sock
34DEBUG = NO
22 35
23 36
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf
index b497f585d..bea885f6b 100644
--- a/src/transport/test_transport_api_rel_http_peer1.conf
+++ b/src/transport/test_transport_api_rel_http_peer1.conf
@@ -1,123 +1,36 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p1/
4DEFAULTCONFIG = test_transport_api_rel_http_peer1.conf
5
6[transport-tcp]
7TIMEOUT = 5000
8
1[transport-http] 9[transport-http]
2PORT = 12180 10PORT = 12180
3DEBUG = NO
4USE_IPv4 = YES 11USE_IPv4 = YES
5USE_IPv6 = NO 12USE_IPv6 = NO
6BINDTO4 = 127.0.0.1 13BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8USE_LOCALADDR = YES
9
10[hostlist]
11HTTP-PROXY =
12SERVERS = http://gnunet.org:8080/
13OPTIONS = -b
14BINARY = gnunet-daemon-hostlist
15CONFIG = $DEFAULTCONFIG
16HOME = $SERVICEHOME
17HOSTNAME = localhost
18HTTPPORT = 8080
19
20[topology]
21BINARY = gnunet-daemon-topology
22CONFIG = $DEFAULTCONFIG
23FRIENDS = $SERVICEHOME/friends
24TARGET-CONNECTION-COUNT = 16
25AUTOCONNECT = YES
26FRIENDS-ONLY = NO
27MINIMUM-FRIENDS = 0
28
29[transport]
30PLUGINS = http
31#DEBUG = YES
32ACCEPT_FROM6 = ::1;
33ACCEPT_FROM = 127.0.0.1;
34NEIGHBOUR_LIMIT = 50
35BINARY = gnunet-service-transport
36CONFIG = $DEFAULTCONFIG
37HOME = $SERVICEHOME
38HOSTNAME = localhost
39PORT = 12181
40UNIXPATH = /tmp/gnunet-p1-service-transport.sock
41#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
42#PREFIX = valgrind --leak-check=full
43#PREFIX = valgrind --tool=callgrind --callgrind-out-file=http_rel_peer1.out
44#PREFIX = strace -c -o strace_peer1.txt
45
46[peerinfo]
47TRUST = $SERVICEHOME/data/credit/
48HOSTS = $SERVICEHOME/data/hosts/
49ACCEPT_FROM6 = ::1;
50ACCEPT_FROM = 127.0.0.1;
51BINARY = gnunet-service-peerinfo
52CONFIG = $DEFAULTCONFIG
53HOME = $SERVICEHOME
54HOSTNAME = localhost
55PORT = 12182
56UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
57
58[resolver]
59ACCEPT_FROM6 = ::1;
60ACCEPT_FROM = 127.0.0.1;
61BINARY = gnunet-service-resolver
62CONFIG = $DEFAULTCONFIG
63HOME = $SERVICEHOME
64HOSTNAME = localhost
65PORT = 12183
66UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
67
68[statistics]
69ACCEPT_FROM6 = ::1;
70ACCEPT_FROM = 127.0.0.1;
71BINARY = gnunet-service-statistics
72CONFIG = $DEFAULTCONFIG
73HOME = $SERVICEHOME
74HOSTNAME = localhost
75PORT = 12184
76UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
77 14
78[arm] 15[arm]
79DEFAULTSERVICES =
80ACCEPT_FROM6 = ::1;
81ACCEPT_FROM = 127.0.0.1;
82BINARY = gnunet-service-arm
83CONFIG = $DEFAULTCONFIG
84HOME = $SERVICEHOME
85HOSTNAME = localhost
86PORT = 12185 16PORT = 12185
87UNIXPATH = /tmp/gnunet-p1-service-arm.sock 17UNIXPATH = /tmp/gnunet-p1-service-arm.sock
88 18
89[TESTING] 19[statistics]
90WEAKRANDOM = YES 20PORT = 12184
91 21UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
92[gnunetd]
93HOSTKEY = $SERVICEHOME/.hostkey
94
95[PATHS]
96SERVICEHOME = /tmp/test-transport/api-http-p1/
97
98
99[fs]
100AUTOSTART = NO
101
102[datastore]
103AUTOSTART = NO
104
105[core]
106AUTOSTART = NO
107
108[dht]
109AUTOSTART = NO
110
111[mesh]
112AUTOSTART = NO
113
114
115[dns]
116AUTOSTART = NO
117 22
23[resolver]
24PORT = 12183
25UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
118 26
27[peerinfo]
28PORT = 12182
29UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
119 30
120[nse] 31[transport]
121AUTOSTART = NO 32PORT = 12181
33PLUGINS = http
34UNIXPATH = /tmp/gnunet-p1-service-transport.sock
122 35
123 36
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 192d9d8ae..cb8ce89b5 100644
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -1,124 +1,33 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-http-p2/
4DEFAULTCONFIG = test_transport_api_rel_http_peer2.conf
5
1[transport-http] 6[transport-http]
2PORT = 12190 7PORT = 12190
3DEBUG = NO
4USE_IPv4 = YES 8USE_IPv4 = YES
5USE_IPv6 = NO 9USE_IPv6 = NO
6BINDTO4 = 127.0.0.1 10BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8USE_LOCALADDR = YES
9[fs]
10AUTOSTART = NO
11
12[datastore]
13AUTOSTART = NO
14
15[core]
16AUTOSTART = NO
17
18[hostlist]
19HTTP-PROXY =
20SERVERS = http://gnunet.org:8080/
21OPTIONS = -b
22BINARY = gnunet-daemon-hostlist
23CONFIG = $DEFAULTCONFIG
24HOME = $SERVICEHOME
25HOSTNAME = localhost
26HTTPPORT = 8080
27
28[topology]
29BINARY = gnunet-daemon-topology
30CONFIG = $DEFAULTCONFIG
31FRIENDS = $SERVICEHOME/friends
32TARGET-CONNECTION-COUNT = 16
33AUTOCONNECT = YES
34FRIENDS-ONLY = NO
35MINIMUM-FRIENDS = 0
36
37[transport]
38PLUGINS = http
39#DEBUG = YES
40ACCEPT_FROM6 = ::1;
41ACCEPT_FROM = 127.0.0.1;
42NEIGHBOUR_LIMIT = 50
43BINARY = gnunet-service-transport
44CONFIG = $DEFAULTCONFIG
45HOME = $SERVICEHOME
46HOSTNAME = localhost
47PORT = 12191
48UNIXPATH = /tmp/gnunet-p2-service-transport.sock
49#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
50#PREFIX = valgrind --leak-check=full
51#PREFIX = valgrind --tool=massif
52#PREFIX = valgrind --tool=callgrind --callgrind-out-file=http_rel_peer2.out
53#PREFIX = strace -c -o strace_peer2.txt
54
55[peerinfo]
56TRUST = $SERVICEHOME/data/credit/
57HOSTS = $SERVICEHOME/data/hosts/
58ACCEPT_FROM6 = ::1;
59ACCEPT_FROM = 127.0.0.1;
60BINARY = gnunet-service-peerinfo
61CONFIG = $DEFAULTCONFIG
62HOME = $SERVICEHOME
63HOSTNAME = localhost
64PORT = 12192
65UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
66
67[resolver]
68ACCEPT_FROM6 = ::1;
69ACCEPT_FROM = 127.0.0.1;
70BINARY = gnunet-service-resolver
71CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME
73HOSTNAME = localhost
74PORT = 12193
75UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
76
77[statistics]
78ACCEPT_FROM6 = ::1;
79ACCEPT_FROM = 127.0.0.1;
80BINARY = gnunet-service-statistics
81CONFIG = $DEFAULTCONFIG
82HOME = $SERVICEHOME
83HOSTNAME = localhost
84PORT = 12194
85UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
86
87 11
88[arm] 12[arm]
89DEFAULTSERVICES =
90ACCEPT_FROM6 = ::1;
91ACCEPT_FROM = 127.0.0.1;
92BINARY = gnunet-service-arm
93CONFIG = $DEFAULTCONFIG
94HOME = $SERVICEHOME
95HOSTNAME = localhost
96PORT = 12195 13PORT = 12195
97UNIXPATH = /tmp/gnunet-p2-service-arm.sock 14UNIXPATH = /tmp/gnunet-p2-service-arm.sock
98 15
99[TESTING] 16[statistics]
100WEAKRANDOM = YES 17PORT = 12194
101 18UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
102[gnunetd]
103HOSTKEY = $SERVICEHOME/.hostkey
104
105[PATHS]
106SERVICEHOME = /tmp/test-transport/api-http-p2/
107
108
109[dht]
110AUTOSTART = NO
111
112[mesh]
113AUTOSTART = NO
114
115
116[dns]
117AUTOSTART = NO
118 19
20[resolver]
21PORT = 12193
22UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
119 23
24[peerinfo]
25PORT = 12192
26UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
120 27
121[nse] 28[transport]
122AUTOSTART = NO 29PORT = 12191
30PLUGINS = http
31UNIXPATH = /tmp/gnunet-p2-service-transport.sock
123 32
124 33
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf
index c54c3a784..c872b8549 100644
--- a/src/transport/test_transport_api_rel_https_peer1.conf
+++ b/src/transport/test_transport_api_rel_https_peer1.conf
@@ -1,124 +1,35 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p1/
4DEFAULTCONFIG = test_transport_api_rel_https_peer1.conf
5
1[transport-https] 6[transport-https]
2PORT = 12300 7PORT = 12300
8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
9KEY_FILE = $SERVICEHOME/https_key_p1.key
10CERT_FILE = $SERVICEHOME/https_cert_p1.crt
3USE_IPv4 = YES 11USE_IPv4 = YES
4USE_IPv6 = NO 12USE_IPv6 = NO
5BINDTO4 = 127.0.0.1 13BINDTO4 = 127.0.0.1
6#BINDTO6 = ::1
7USE_LOCALADDR = YES
8KEY_FILE = $SERVICEHOME/https_key_p1.key
9CERT_FILE = $SERVICEHOME/https_cert_p1.crt
10CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
11#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
12#CRYPTO_INIT = PERFORMANCE
13
14[hostlist]
15HTTP-PROXY =
16SERVERS = http://gnunet.org:8080/
17OPTIONS = -b
18BINARY = gnunet-daemon-hostlist
19CONFIG = $DEFAULTCONFIG
20HOME = $SERVICEHOME
21HOSTNAME = localhost
22HTTPPORT = 8080
23
24[topology]
25BINARY = gnunet-daemon-topology
26CONFIG = $DEFAULTCONFIG
27FRIENDS = $SERVICEHOME/friends
28TARGET-CONNECTION-COUNT = 16
29AUTOCONNECT = YES
30FRIENDS-ONLY = NO
31MINIMUM-FRIENDS = 0
32
33[transport]
34PLUGINS = https
35#DEBUG = YES
36ACCEPT_FROM6 = ::1;
37ACCEPT_FROM = 127.0.0.1;
38NEIGHBOUR_LIMIT = 50
39BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME
42HOSTNAME = localhost
43PORT = 12301
44UNIXPATH = /tmp/gnunet-p1-service-transport.sock
45#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
46#PREFIX = valgrind --leak-check=full
47#PREFIX = valgrind --tool=massif
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 12302
59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
60
61[resolver]
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12303
69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
70
71[statistics]
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12304
79UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
80 14
81[arm] 15[arm]
82DEFAULTSERVICES =
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 12305 16PORT = 12305
90UNIXPATH = /tmp/gnunet-p1-service-arm.sock 17UNIXPATH = /tmp/gnunet-p1-service-arm.sock
91 18
92[TESTING] 19[statistics]
93WEAKRANDOM = YES 20PORT = 12304
94 21UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
95[gnunetd]
96HOSTKEY = $SERVICEHOME/.hostkey
97
98[PATHS]
99SERVICEHOME = /tmp/test-transport/api-https-p1/
100
101[fs]
102AUTOSTART = NO
103
104[datastore]
105AUTOSTART = NO
106
107[core]
108AUTOSTART = NO
109
110[dht]
111AUTOSTART = NO
112
113[mesh]
114AUTOSTART = NO
115
116[dns]
117AUTOSTART = NO
118
119 22
23[resolver]
24PORT = 12303
25UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
120 26
121[nse] 27[peerinfo]
122AUTOSTART = NO 28PORT = 12302
29UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
123 30
31[transport]
32PORT = 12301
33PLUGINS = https
34UNIXPATH = /tmp/gnunet-p1-service-transport.sock
124 35
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf
index 8ab1cfcf4..fac1590bb 100644
--- a/src/transport/test_transport_api_rel_https_peer2.conf
+++ b/src/transport/test_transport_api_rel_https_peer2.conf
@@ -1,127 +1,36 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-https-p2/
4DEFAULTCONFIG = test_transport_api_rel_https_peer2.conf
5
1[transport-https] 6[transport-https]
2PORT = 12310 7PORT = 12310
3DEBUG = NO 8CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
9KEY_FILE = $SERVICEHOME/https_key_p2.key
10CERT_FILE = $SERVICEHOME/https_cert_p2.crt
4USE_IPv4 = YES 11USE_IPv4 = YES
5USE_IPv6 = NO 12USE_IPv6 = NO
6BINDTO4 = 127.0.0.1 13BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8KEY_FILE = $SERVICEHOME/https_key_p2.key
9CERT_FILE = $SERVICEHOME/https_cert_p2.crt
10CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
11#CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+MD5:+RSA:+COMP-NULL
12#CRYPTO_INIT = PERFORMANCE
13USE_LOCALADDR = YES
14
15[hostlist]
16HTTP-PROXY =
17SERVERS = http://gnunet.org:8080/
18OPTIONS = -b
19BINARY = gnunet-daemon-hostlist
20CONFIG = $DEFAULTCONFIG
21HOME = $SERVICEHOME
22HOSTNAME = localhost
23HTTPPORT = 8080
24
25[topology]
26BINARY = gnunet-daemon-topology
27CONFIG = $DEFAULTCONFIG
28FRIENDS = $SERVICEHOME/friends
29TARGET-CONNECTION-COUNT = 16
30AUTOCONNECT = YES
31FRIENDS-ONLY = NO
32MINIMUM-FRIENDS = 0
33
34[transport]
35PLUGINS = https
36#DEBUG = YES
37ACCEPT_FROM6 = ::1;
38ACCEPT_FROM = 127.0.0.1;
39NEIGHBOUR_LIMIT = 50
40BINARY = gnunet-service-transport
41CONFIG = $DEFAULTCONFIG
42HOME = $SERVICEHOME
43HOSTNAME = localhost
44PORT = 12311
45UNIXPATH = /tmp/gnunet-p2-service-transport.sock
46#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full
48#PREFIX = valgrind --tool=massif
49
50[peerinfo]
51TRUST = $SERVICEHOME/data/credit/
52HOSTS = $SERVICEHOME/data/hosts/
53ACCEPT_FROM6 = ::1;
54ACCEPT_FROM = 127.0.0.1;
55BINARY = gnunet-service-peerinfo
56CONFIG = $DEFAULTCONFIG
57HOME = $SERVICEHOME
58HOSTNAME = localhost
59PORT = 12312
60UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
61
62[resolver]
63ACCEPT_FROM6 = ::1;
64ACCEPT_FROM = 127.0.0.1;
65BINARY = gnunet-service-resolver
66CONFIG = $DEFAULTCONFIG
67HOME = $SERVICEHOME
68HOSTNAME = localhost
69PORT = 12313
70UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
71
72[statistics]
73ACCEPT_FROM6 = ::1;
74ACCEPT_FROM = 127.0.0.1;
75BINARY = gnunet-service-statistics
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12314
80UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
81
82 14
83[arm] 15[arm]
84DEFAULTSERVICES =
85ACCEPT_FROM6 = ::1;
86ACCEPT_FROM = 127.0.0.1;
87BINARY = gnunet-service-arm
88CONFIG = $DEFAULTCONFIG
89HOME = $SERVICEHOME
90HOSTNAME = localhost
91PORT = 12315 16PORT = 12315
92UNIXPATH = /tmp/gnunet-p2-service-arm.sock 17UNIXPATH = /tmp/gnunet-p2-service-arm.sock
93 18
94[TESTING] 19[statistics]
95WEAKRANDOM = YES 20PORT = 12314
96 21UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
97[gnunetd]
98HOSTKEY = $SERVICEHOME/.hostkey
99
100[PATHS]
101SERVICEHOME = /tmp/test-transport/api-https-p2/
102
103[fs]
104AUTOSTART = NO
105
106[datastore]
107AUTOSTART = NO
108
109[core]
110AUTOSTART = NO
111
112[dht]
113AUTOSTART = NO
114
115[mesh]
116AUTOSTART = NO
117
118
119[dns]
120AUTOSTART = NO
121 22
23[resolver]
24PORT = 12313
25UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
122 26
27[peerinfo]
28PORT = 12312
29UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
123 30
124[nse] 31[transport]
125AUTOSTART = NO 32PORT = 12311
33PLUGINS = https
34UNIXPATH = /tmp/gnunet-p2-service-transport.sock
126 35
127 36
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 935d96780..77cf34f6c 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,125 +1,36 @@
1[transport-tcp] 1@INLINE@ test_transport_defaults.conf
2PORT = 12020 2[PATHS]
3USE_LOCALADDR = YES 3SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
4DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
4 5
5[nat] 6[nat]
6DISABLEV6 = YES
7BINDTO = 127.0.0.1
8BEHIND_NAT = YES 7BEHIND_NAT = YES
9ENABLE_NAT_SERVER = YES 8ENABLE_NAT_SERVER = YES
10#NAT_PUNCHED = YES 9DISABLEV6 = YES
11INTERNAL_ADDRESS = 127.0.0.1
12EXTERNAL_ADDRESS = 127.0.0.1
13
14[hostlist]
15HTTP-PROXY =
16SERVERS = http://gnunet.org:8080/
17OPTIONS = -b
18BINARY = gnunet-daemon-hostlist
19CONFIG = $DEFAULTCONFIG
20HOME = $SERVICEHOME
21HOSTNAME = localhost
22HTTPPORT = 8080
23
24[topology]
25BINARY = gnunet-daemon-topology
26CONFIG = $DEFAULTCONFIG
27FRIENDS = $SERVICEHOME/friends
28TARGET-CONNECTION-COUNT = 16
29AUTOCONNECT = YES
30FRIENDS-ONLY = NO
31MINIMUM-FRIENDS = 0
32
33[transport]
34PLUGINS = tcp
35#DEBUG = YES
36#PREFIX = xterm -T transport2 --args
37#PREFIX = valgrind --leak-check=full
38ACCEPT_FROM6 = ::1;
39ACCEPT_FROM = 127.0.0.1;
40NEIGHBOUR_LIMIT = 50
41BINARY = gnunet-service-transport
42#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
43CONFIG = $DEFAULTCONFIG
44HOME = $SERVICEHOME
45HOSTNAME = localhost
46PORT = 29542
47UNIXPATH = /tmp/gnunet-p1-service-transport.sock
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 12021
59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
60
61[resolver]
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12022
69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
70 10
71[statistics] 11[transport-tcp]
72AUTOSTART = YES 12PORT = 12020
73ACCEPT_FROM6 = ::1; 13TIMEOUT = 5000
74ACCEPT_FROM = 127.0.0.1;
75BINARY = gnunet-service-statistics
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12023
80UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
81 14
82[arm] 15[arm]
83DEFAULTSERVICES = transport
84ACCEPT_FROM6 = ::1;
85ACCEPT_FROM = 127.0.0.1;
86BINARY = gnunet-service-arm
87CONFIG = $DEFAULTCONFIG
88HOME = $SERVICEHOME
89HOSTNAME = localhost
90PORT = 1204 16PORT = 1204
17DEFAULTSERVICES = transport
91UNIXPATH = /tmp/gnunet-p1-service-arm.sock 18UNIXPATH = /tmp/gnunet-p1-service-arm.sock
92 19
93[TESTING] 20[statistics]
94WEAKRANDOM = YES 21PORT = 12023
95 22UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
96[gnunetd]
97DISABLEV6 = YES
98HOSTKEY = $SERVICEHOME/.hostkey
99
100[PATHS]
101DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
102SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
103
104[fs]
105AUTOSTART = NO
106
107[datastore]
108AUTOSTART = NO
109
110[core]
111AUTOSTART = NO
112
113
114[dht]
115AUTOSTART = NO
116
117[dns]
118AUTOSTART = NO
119 23
24[resolver]
25PORT = 12022
26UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
120 27
28[peerinfo]
29PORT = 12021
30UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
121 31
122[nse] 32[transport]
123AUTOSTART = NO 33PORT = 29542
34UNIXPATH = /tmp/gnunet-p1-service-transport.sock
124 35
125 36
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index 3040a0f8f..1b5586c4f 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,126 +1,35 @@
1[transport-tcp] 1@INLINE@ test_transport_defaults.conf
2PORT = 12030 2[PATHS]
3USE_LOCALADDR = YES 3SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
4DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
4 5
5[nat] 6[nat]
6BINDTO = 127.0.0.1
7DISABLEV6 = YES 7DISABLEV6 = YES
8BEHIND_NAT = NO
9ENABLE_NAT_CLIENT = YES 8ENABLE_NAT_CLIENT = YES
10EXTERNAL_ADDRESS = 127.0.0.1
11INTERNAL_ADDRESS = 127.0.0.1
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31 9
32[transport] 10[transport-tcp]
33PLUGINS = tcp 11PORT = 12030
34#DEBUG = YES 12TIMEOUT = 5000
35ACCEPT_FROM6 = ::1;
36ACCEPT_FROM = 127.0.0.1;
37NEIGHBOUR_LIMIT = 50
38#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
39BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME
42HOSTNAME = localhost
43PORT = 45923
44UNIXPATH = /tmp/gnunet-p2-service-transport.sock
45#PREFIX = xterm -T transport2 -e gdb --args
46#PREFIX = valgrind --leak-check=full
47
48[peerinfo]
49TRUST = $SERVICEHOME/data/credit/
50HOSTS = $SERVICEHOME/data/hosts/
51ACCEPT_FROM6 = ::1;
52ACCEPT_FROM = 127.0.0.1;
53BINARY = gnunet-service-peerinfo
54CONFIG = $DEFAULTCONFIG
55HOME = $SERVICEHOME
56HOSTNAME = localhost
57PORT = 12031
58UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
59
60[resolver]
61ACCEPT_FROM6 = ::1;
62ACCEPT_FROM = 127.0.0.1;
63BINARY = gnunet-service-resolver
64CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME
66HOSTNAME = localhost
67PORT = 12032
68UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
69
70[statistics]
71AUTOSTART = YES
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12033
79UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
80 13
81[arm] 14[arm]
82DEFAULTSERVICES = transport
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 12034 15PORT = 12034
16DEFAULTSERVICES = transport
90UNIXPATH = /tmp/gnunet-p2-service-arm.sock 17UNIXPATH = /tmp/gnunet-p2-service-arm.sock
91 18
92[TESTING] 19[statistics]
93WEAKRANDOM = YES 20PORT = 12033
94 21UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
95[gnunetd]
96DISABLEV6 = YES
97HOSTKEY = $SERVICEHOME/.hostkey
98
99[PATHS]
100DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
101SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
102
103[core]
104AUTOSTART = NO
105
106[fs]
107AUTOSTART = NO
108
109[datastore]
110AUTOSTART = NO
111
112[dht]
113AUTOSTART = NO
114
115[mesh]
116AUTOSTART = NO
117
118[dns]
119AUTOSTART = NO
120 22
23[resolver]
24PORT = 12032
25UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
121 26
27[peerinfo]
28PORT = 12031
29UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
122 30
123[nse] 31[transport]
124AUTOSTART = NO 32PORT = 45923
33UNIXPATH = /tmp/gnunet-p2-service-transport.sock
125 34
126 35
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index 36c148f98..1c770dd4f 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,126 +1,31 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p1/
4DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
5
1[transport-tcp] 6[transport-tcp]
2PORT = 12000 7PORT = 12000
3 8TIMEOUT = 5000
4[nat]
5DISABLEV6 = YES
6BINDTO = 127.0.0.1
7BEHIND_NAT = NO
8#ALLOW_NAT = NO
9ENABLE_UPNP = NO
10INTERNAL_ADDRESS = 127.0.0.1
11EXTERNAL_ADDRESS = 127.0.0.1
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[transport]
33PLUGINS = tcp
34#DEBUG = YES
35#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
36#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg
37ACCEPT_FROM6 = ::1;
38ACCEPT_FROM = 127.0.0.1;
39NEIGHBOUR_LIMIT = 50
40#BINARY = gnunet-service-transport
41#BINARY = /home/grothoff/bin/gnunet-service-transport
42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME
44HOSTNAME = localhost
45PORT = 12001
46UNIXPATH = /tmp/gnunet-p1-service-transport.sock
47
48[peerinfo]
49TRUST = $SERVICEHOME/data/credit/
50HOSTS = $SERVICEHOME/data/hosts/
51ACCEPT_FROM6 = ::1;
52ACCEPT_FROM = 127.0.0.1;
53BINARY = gnunet-service-peerinfo
54CONFIG = $DEFAULTCONFIG
55HOME = $SERVICEHOME
56HOSTNAME = localhost
57PORT = 12002
58UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
59
60[resolver]
61ACCEPT_FROM6 = ::1;
62ACCEPT_FROM = 127.0.0.1;
63BINARY = gnunet-service-resolver
64CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME
66HOSTNAME = localhost
67PORT = 12003
68UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
69
70[statistics]
71AUTOSTART = YES
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12004
79UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
80 9
81[arm] 10[arm]
82DEFAULTSERVICES = transport
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 12005 11PORT = 12005
12DEFAULTSERVICES = transport
90UNIXPATH = /tmp/gnunet-p1-service-arm.sock 13UNIXPATH = /tmp/gnunet-p1-service-arm.sock
91 14
92[TESTING] 15[statistics]
93WEAKRANDOM = YES 16PORT = 12004
94 17UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
95[gnunetd]
96HOSTKEY = $SERVICEHOME/.hostkey
97
98[PATHS]
99#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
100SERVICEHOME = /tmp/test-transport/api-tcp-p1/
101
102[fs]
103AUTOSTART = NO
104
105[datastore]
106AUTOSTART = NO
107
108[core]
109AUTOSTART = NO
110
111[dht]
112AUTOSTART = NO
113
114[mesh]
115AUTOSTART = NO
116
117
118[dns]
119AUTOSTART = NO
120 18
19[resolver]
20PORT = 12003
21UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
121 22
23[peerinfo]
24PORT = 12002
25UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
122 26
123[nse] 27[transport]
124AUTOSTART = NO 28PORT = 12001
29UNIXPATH = /tmp/gnunet-p1-service-transport.sock
125 30
126 31
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index c862a3556..f849dcaaa 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -1,126 +1,30 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-tcp-p2/
4DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
5
1[transport-tcp] 6[transport-tcp]
2PORT = 0 7PORT = 0
3 8TIMEOUT = 5000
4[nat]
5DISABLEV6 = YES
6BINDTO = 127.0.0.1
7BEHIND_NAT = NO
8#ALLOW_NAT = NO
9ENABLE_UPNP = NO
10EXTERNAL_ADDRESS = 127.0.0.1
11INTERNAL_ADDRESS = 127.0.0.1
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[transport]
33PLUGINS = tcp
34#DEBUG = YES
35ACCEPT_FROM6 = ::1;
36ACCEPT_FROM = 127.0.0.1;
37NEIGHBOUR_LIMIT = 50
38#BINARY = /home/grothoff/bin/gnunet-service-transport
39#BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME
42HOSTNAME = localhost
43PORT = 12010
44UNIXPATH = /tmp/gnunet-p2-service-transport.sock
45#PREFIX = valgrind --tool=memcheck --leak-check=full --log-file=transport%p.vg
46#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 12011
59UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
60
61[resolver]
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12012
69UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
70
71[statistics]
72AUTOSTART = YES
73ACCEPT_FROM6 = ::1;
74ACCEPT_FROM = 127.0.0.1;
75BINARY = gnunet-service-statistics
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12013
80UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
81 9
82[arm] 10[arm]
83DEFAULTSERVICES = transport
84ACCEPT_FROM6 = ::1;
85ACCEPT_FROM = 127.0.0.1;
86BINARY = gnunet-service-arm
87CONFIG = $DEFAULTCONFIG
88HOME = $SERVICEHOME
89HOSTNAME = localhost
90PORT = 12014 11PORT = 12014
12DEFAULTSERVICES = transport
91UNIXPATH = /tmp/gnunet-p2-service-arm.sock 13UNIXPATH = /tmp/gnunet-p2-service-arm.sock
92 14
93[TESTING] 15[statistics]
94WEAKRANDOM = YES 16PORT = 12013
95 17UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
96[gnunetd]
97HOSTKEY = $SERVICEHOME/.hostkey
98
99[PATHS]
100#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
101SERVICEHOME = /tmp/test-transport/api-tcp-p2/
102
103[core]
104AUTOSTART = NO
105
106[fs]
107AUTOSTART = NO
108
109[datastore]
110AUTOSTART = NO
111
112[dht]
113AUTOSTART = NO
114
115[mesh]
116AUTOSTART = NO
117
118[dns]
119AUTOSTART = NO
120
121 18
19[resolver]
20PORT = 12012
21UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
122 22
123[nse] 23[peerinfo]
124AUTOSTART = NO 24PORT = 12011
25UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
125 26
27[transport]
28PORT = 12010
29UNIXPATH = /tmp/gnunet-p2-service-transport.sock
126 30
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 36a6056e9..562e9bb1d 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,123 +1,37 @@
1[transport-udp] 1@INLINE@ test_transport_defaults.conf
2PORT = 12060 2[PATHS]
3USE_LOCALADDR = YES 3SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
4DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
4 5
5[nat] 6[nat]
6BEHIND_NAT = YES 7BEHIND_NAT = YES
7BINDTO = 127.0.0.1
8ALLOW_NAT = NO 8ALLOW_NAT = NO
9ONLY_NAT_ADDRESSES = YES 9ONLY_NAT_ADDRESSES = YES
10INTERNAL_ADDRESS = 127.0.0.1
11EXTERNAL_ADDRESS = 127.0.0.1
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31 10
32[transport] 11[transport-udp]
33PLUGINS = udp 12PORT = 12060
34DEBUG = NO
35ACCEPT_FROM6 = ::1;
36ACCEPT_FROM = 127.0.0.1;
37NEIGHBOUR_LIMIT = 50
38BINARY = gnunet-service-transport
39CONFIG = $DEFAULTCONFIG
40HOME = $SERVICEHOME
41HOSTNAME = localhost
42PORT = 12061
43UNIXPATH = /tmp/gnunet-p1-service-transport.sock
44#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
45#PREFIX = xterm -e xterm -T transport -e gdb --args
46
47[peerinfo]
48TRUST = $SERVICEHOME/data/credit/
49HOSTS = $SERVICEHOME/data/hosts/
50ACCEPT_FROM6 = ::1;
51ACCEPT_FROM = 127.0.0.1;
52BINARY = gnunet-service-peerinfo
53CONFIG = $DEFAULTCONFIG
54HOME = $SERVICEHOME
55HOSTNAME = localhost
56PORT = 12062
57UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
58
59[resolver]
60ACCEPT_FROM6 = ::1;
61ACCEPT_FROM = 127.0.0.1;
62BINARY = gnunet-service-resolver
63CONFIG = $DEFAULTCONFIG
64HOME = $SERVICEHOME
65HOSTNAME = localhost
66PORT = 12063
67UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
68
69[statistics]
70ACCEPT_FROM6 = ::1;
71ACCEPT_FROM = 127.0.0.1;
72BINARY = gnunet-service-statistics
73CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME
75HOSTNAME = localhost
76PORT = 12064
77UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
78 13
79[arm] 14[arm]
80DEFAULTSERVICES = transport
81ACCEPT_FROM6 = ::1;
82ACCEPT_FROM = 127.0.0.1;
83BINARY = gnunet-service-arm
84CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME
86HOSTNAME = localhost
87PORT = 12065 15PORT = 12065
16DEFAULTSERVICES = transport
88UNIXPATH = /tmp/gnunet-p1-service-arm.sock 17UNIXPATH = /tmp/gnunet-p1-service-arm.sock
89 18
90[TESTING] 19[statistics]
91WEAKRANDOM = YES 20PORT = 12064
92 21UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
93[gnunetd]
94HOSTKEY = $SERVICEHOME/.hostkey
95
96[PATHS]
97DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
98SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
99
100[mesh]
101AUTOSTART = NO
102
103[fs]
104AUTOSTART = NO
105
106[datastore-sqlite]
107FILENAME = $SERVICEHOME/datastore/sqlite.db
108
109[datastore]
110AUTOSTART = NO
111
112[dns]
113AUTOSTART = NO
114
115[core]
116AUTOSTART = NO
117 22
23[resolver]
24PORT = 12063
25UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
118 26
27[peerinfo]
28PORT = 12062
29UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
119 30
120[nse] 31[transport]
121AUTOSTART = NO 32PORT = 12061
33PLUGINS = udp
34UNIXPATH = /tmp/gnunet-p1-service-transport.sock
35DEBUG = NO
122 36
123 37
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index a5ef89ae5..2eb82f4bf 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,123 +1,35 @@
1[transport-udp] 1@INLINE@ test_transport_defaults.conf
2PORT = 12070 2[PATHS]
3USE_LOCALADDR = YES 3SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
4DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
4 5
5[nat] 6[nat]
6BINDTO = 127.0.0.1
7BEHIND_NAT = NO
8ALLOW_NAT = YES 7ALLOW_NAT = YES
9EXTERNAL_ADDRESS = 127.0.0.1
10INTERNAL_ADDRESS = 127.0.0.1
11
12[hostlist]
13HTTP-PROXY =
14SERVERS = http://gnunet.org:8080/
15OPTIONS = -b
16BINARY = gnunet-daemon-hostlist
17CONFIG = $DEFAULTCONFIG
18HOME = $SERVICEHOME
19HOSTNAME = localhost
20HTTPPORT = 8080
21
22[topology]
23BINARY = gnunet-daemon-topology
24CONFIG = $DEFAULTCONFIG
25FRIENDS = $SERVICEHOME/friends
26TARGET-CONNECTION-COUNT = 16
27AUTOCONNECT = YES
28FRIENDS-ONLY = NO
29MINIMUM-FRIENDS = 0
30
31[core]
32AUTOSTART = NO
33
34[transport]
35PLUGINS = udp
36DEBUG = NO
37PREFIX =
38ACCEPT_FROM6 = ::1;
39ACCEPT_FROM = 127.0.0.1;
40NEIGHBOUR_LIMIT = 50
41BINARY = gnunet-service-transport
42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME
44HOSTNAME = localhost
45PORT = 12071
46UNIXPATH = /tmp/gnunet-p2-service-transport.sock
47#PREFIX = xterm -e xterm -T transport -e gdb --args
48#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
49 8
50[peerinfo] 9[transport-udp]
51TRUST = $SERVICEHOME/data/credit/ 10PORT = 12070
52HOSTS = $SERVICEHOME/data/hosts/
53ACCEPT_FROM6 = ::1;
54ACCEPT_FROM = 127.0.0.1;
55BINARY = gnunet-service-peerinfo
56CONFIG = $DEFAULTCONFIG
57HOME = $SERVICEHOME
58HOSTNAME = localhost
59PORT = 12072
60UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
61
62[resolver]
63ACCEPT_FROM6 = ::1;
64ACCEPT_FROM = 127.0.0.1;
65BINARY = gnunet-service-resolver
66CONFIG = $DEFAULTCONFIG
67HOME = $SERVICEHOME
68HOSTNAME = localhost
69PORT = 12073
70UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
71
72[statistics]
73ACCEPT_FROM6 = ::1;
74ACCEPT_FROM = 127.0.0.1;
75BINARY = gnunet-service-statistics
76CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME
78HOSTNAME = localhost
79PORT = 12074
80UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
81 11
82[arm] 12[arm]
83DEFAULTSERVICES = transport
84ACCEPT_FROM6 = ::1;
85ACCEPT_FROM = 127.0.0.1;
86BINARY = gnunet-service-arm
87CONFIG = $DEFAULTCONFIG
88HOME = $SERVICEHOME
89HOSTNAME = localhost
90PORT = 12075 13PORT = 12075
14DEFAULTSERVICES = transport
91UNIXPATH = /tmp/gnunet-p2-service-arm.sock 15UNIXPATH = /tmp/gnunet-p2-service-arm.sock
92 16
93[TESTING] 17[statistics]
94WEAKRANDOM = YES 18PORT = 12074
95 19UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
96[gnunetd]
97HOSTKEY = $SERVICEHOME/.hostkey
98
99[PATHS]
100DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
101SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
102
103[fs]
104AUTOSTART = NO
105
106[datastore]
107AUTOSTART = NO
108
109[dht]
110AUTOSTART = NO
111
112[mesh]
113AUTOSTART = NO
114
115[dns]
116AUTOSTART = NO
117 20
21[resolver]
22PORT = 12073
23UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
118 24
25[peerinfo]
26PORT = 12072
27UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
119 28
120[nse] 29[transport]
121AUTOSTART = NO 30PORT = 12071
31PLUGINS = udp
32UNIXPATH = /tmp/gnunet-p2-service-transport.sock
33DEBUG = NO
122 34
123 35
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index d6dc381b5..b57bdee53 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -1,124 +1,31 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p1/
4DEFAULTCONFIG = test_transport_api_udp_peer1.conf
5
1[transport-udp] 6[transport-udp]
2PORT = 12040 7PORT = 12040
3MAX_BPS = 50000000 8MAX_BPS = 50000000
4 9
5[fs]
6AUTOSTART = NO
7
8[nat]
9# Are we behind NAT?
10BEHIND_NAT = NO
11
12[datastore]
13AUTOSTART = NO
14
15[core]
16AUTOSTART = NO
17
18[hostlist]
19HTTP-PROXY =
20SERVERS = http://gnunet.org:8080/
21OPTIONS = -b
22BINARY = gnunet-daemon-hostlist
23CONFIG = $DEFAULTCONFIG
24HOME = $SERVICEHOME
25HOSTNAME = localhost
26HTTPPORT = 8080
27
28[topology]
29BINARY = gnunet-daemon-topology
30CONFIG = $DEFAULTCONFIG
31FRIENDS = $SERVICEHOME/friends
32TARGET-CONNECTION-COUNT = 16
33AUTOCONNECT = YES
34FRIENDS-ONLY = NO
35MINIMUM-FRIENDS = 0
36
37[core]
38AUTOSTART = NO
39
40[transport]
41PLUGINS = udp
42#DEBUG = YES
43ACCEPT_FROM6 = ::1;
44ACCEPT_FROM = 127.0.0.1;
45NEIGHBOUR_LIMIT = 50
46BINARY = gnunet-service-transport
47CONFIG = $DEFAULTCONFIG
48HOME = $SERVICEHOME
49HOSTNAME = localhost
50PORT = 12041
51UNIXPATH = /tmp/gnunet-p1-service-transport.sock
52#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
53#PREFIX = xterm -e xterm -T transport -e gdb --args
54
55[peerinfo]
56TRUST = $SERVICEHOME/data/credit/
57HOSTS = $SERVICEHOME/data/hosts/
58ACCEPT_FROM6 = ::1;
59ACCEPT_FROM = 127.0.0.1;
60BINARY = gnunet-service-peerinfo
61CONFIG = $DEFAULTCONFIG
62HOME = $SERVICEHOME
63HOSTNAME = localhost
64PORT = 12042
65UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
66
67[resolver]
68ACCEPT_FROM6 = ::1;
69ACCEPT_FROM = 127.0.0.1;
70BINARY = gnunet-service-resolver
71CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME
73HOSTNAME = localhost
74PORT = 12043
75UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
76
77[statistics]
78ACCEPT_FROM6 = ::1;
79ACCEPT_FROM = 127.0.0.1;
80BINARY = gnunet-service-statistics
81CONFIG = $DEFAULTCONFIG
82HOME = $SERVICEHOME
83HOSTNAME = localhost
84PORT = 12044
85UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
86
87[arm] 10[arm]
88DEFAULTSERVICES =
89ACCEPT_FROM6 = ::1;
90ACCEPT_FROM = 127.0.0.1;
91BINARY = gnunet-service-arm
92CONFIG = $DEFAULTCONFIG
93HOME = $SERVICEHOME
94HOSTNAME = localhost
95PORT = 12045 11PORT = 12045
96UNIXPATH = /tmp/gnunet-p1-service-arm.sock 12UNIXPATH = /tmp/gnunet-p1-service-arm.sock
97 13
98[TESTING] 14[statistics]
99WEAKRANDOM = YES 15PORT = 12044
100 16UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
101[gnunetd]
102HOSTKEY = $SERVICEHOME/.hostkey
103
104[PATHS]
105DEFAULTCONFIG = test_transport_api_udp_peer1.conf
106SERVICEHOME = /tmp/test-transport/api-udp-p1/
107
108
109[dht]
110AUTOSTART = NO
111
112[mesh]
113AUTOSTART = NO
114
115
116[dns]
117AUTOSTART = NO
118 17
18[resolver]
19PORT = 12043
20UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
119 21
22[peerinfo]
23PORT = 12042
24UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
120 25
121[nse] 26[transport]
122AUTOSTART = NO 27PORT = 12041
28PLUGINS = udp
29UNIXPATH = /tmp/gnunet-p1-service-transport.sock
123 30
124 31
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index c4dfde28c..cf54000e6 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -1,120 +1,31 @@
1@INLINE@ test_transport_defaults.conf
2[PATHS]
3SERVICEHOME = /tmp/test-transport/api-udp-p2/
4DEFAULTCONFIG = test_transport_api_udp_peer2.conf
5
1[transport-udp] 6[transport-udp]
2PORT = 12050 7PORT = 12050
3MAX_BPS = 50000000 8MAX_BPS = 50000000
4 9
5[nat]
6# Are we behind NAT?
7BEHIND_NAT = NO
8
9[hostlist]
10HTTP-PROXY =
11SERVERS = http://gnunet.org:8080/
12OPTIONS = -b
13BINARY = gnunet-daemon-hostlist
14CONFIG = $DEFAULTCONFIG
15HOME = $SERVICEHOME
16HOSTNAME = localhost
17HTTPPORT = 8080
18
19[topology]
20BINARY = gnunet-daemon-topology
21CONFIG = $DEFAULTCONFIG
22FRIENDS = $SERVICEHOME/friends
23TARGET-CONNECTION-COUNT = 16
24AUTOCONNECT = YES
25FRIENDS-ONLY = NO
26MINIMUM-FRIENDS = 0
27
28[transport]
29PLUGINS = udp
30#DEBUG = YES
31PREFIX =
32ACCEPT_FROM6 = ::1;
33ACCEPT_FROM = 127.0.0.1;
34NEIGHBOUR_LIMIT = 50
35BINARY = gnunet-service-transport
36CONFIG = $DEFAULTCONFIG
37HOME = $SERVICEHOME
38HOSTNAME = localhost
39PORT = 12051
40UNIXPATH = /tmp/gnunet-p2-service-transport.sock
41#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
42
43[peerinfo]
44TRUST = $SERVICEHOME/data/credit/
45HOSTS = $SERVICEHOME/data/hosts/
46ACCEPT_FROM6 = ::1;
47ACCEPT_FROM = 127.0.0.1;
48BINARY = gnunet-service-peerinfo
49CONFIG = $DEFAULTCONFIG
50HOME = $SERVICEHOME
51HOSTNAME = localhost
52PORT = 12052
53UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
54
55[resolver]
56ACCEPT_FROM6 = ::1;
57ACCEPT_FROM = 127.0.0.1;
58BINARY = gnunet-service-resolver
59CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME
61HOSTNAME = localhost
62PORT = 12053
63UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
64
65[statistics]
66ACCEPT_FROM6 = ::1;
67ACCEPT_FROM = 127.0.0.1;
68BINARY = gnunet-service-statistics
69CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME
71HOSTNAME = localhost
72PORT = 12054
73UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
74
75[arm] 10[arm]
76DEFAULTSERVICES =
77ACCEPT_FROM6 = ::1;
78ACCEPT_FROM = 127.0.0.1;
79BINARY = gnunet-service-arm
80CONFIG = $DEFAULTCONFIG
81HOME = $SERVICEHOME
82HOSTNAME = localhost
83PORT = 12055 11PORT = 12055
84UNIXPATH = /tmp/gnunet-p2-service-arm.sock 12UNIXPATH = /tmp/gnunet-p2-service-arm.sock
85 13
86[TESTING] 14[statistics]
87WEAKRANDOM = YES 15PORT = 12054
88 16UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
89[gnunetd]
90HOSTKEY = $SERVICEHOME/.hostkey
91
92[PATHS]
93DEFAULTCONFIG = test_transport_api_udp_peer2.conf
94SERVICEHOME = /tmp/test-transport/api-udp-p2/
95
96
97[fs]
98AUTOSTART = NO
99
100[datastore]
101AUTOSTART = NO
102
103[core]
104AUTOSTART = NO
105
106[dht]
107AUTOSTART = NO
108
109[mesh]
110AUTOSTART = NO
111
112[dns]
113AUTOSTART = NO
114 17
18[resolver]
19PORT = 12053
20UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
115 21
22[peerinfo]
23PORT = 12052
24UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
116 25
117[nse] 26[transport]
118AUTOSTART = NO 27PORT = 12051
28PLUGINS = udp
29UNIXPATH = /tmp/gnunet-p2-service-transport.sock
119 30
120 31
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index f98e3b290..c6b2d2a68 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -1,117 +1,29 @@
1[transport-unix] 1@INLINE@ test_transport_defaults.conf
2PORT = 12120 2[PATHS]
3 3SERVICEHOME = /tmp/test-transport/api-unix-p1/
4[fs] 4DEFAULTCONFIG = test_transport_api_unix_peer1.conf
5AUTOSTART = NO
6
7[datastore]
8AUTOSTART = NO
9
10[core]
11AUTOSTART = NO
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[core]
33AUTOSTART = NO
34
35[transport]
36PLUGINS = unix
37#DEBUG = YES
38ACCEPT_FROM6 = ::1;
39ACCEPT_FROM = 127.0.0.1;
40NEIGHBOUR_LIMIT = 50
41BINARY = gnunet-service-transport
42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME
44HOSTNAME = localhost
45PORT = 12121
46UNIXPATH = /tmp/gnunet-p1-service-transport.sock
47
48
49[peerinfo]
50TRUST = $SERVICEHOME/data/credit/
51HOSTS = $SERVICEHOME/data/hosts/
52ACCEPT_FROM6 = ::1;
53ACCEPT_FROM = 127.0.0.1;
54BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME
57HOSTNAME = localhost
58PORT = 12122
59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
60
61[resolver]
62ACCEPT_FROM6 = ::1;
63ACCEPT_FROM = 127.0.0.1;
64BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME
67HOSTNAME = localhost
68PORT = 12123
69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
70
71[statistics]
72ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1;
74BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME
77HOSTNAME = localhost
78PORT = 12124
79UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
80 5
81[arm] 6[arm]
82DEFAULTSERVICES =
83ACCEPT_FROM6 = ::1;
84ACCEPT_FROM = 127.0.0.1;
85BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME
88HOSTNAME = localhost
89PORT = 12125 7PORT = 12125
90UNIXPATH = /tmp/gnunet-p1-service-arm.sock 8UNIXPATH = /tmp/gnunet-p1-service-arm.sock
91 9
92[TESTING] 10[statistics]
93WEAKRANDOM = YES 11PORT = 12124
94 12UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
95[gnunetd]
96HOSTKEY = $SERVICEHOME/.hostkey
97
98[PATHS]
99DEFAULTCONFIG = test_transport_api_unix_peer1.conf
100SERVICEHOME = /tmp/test-transport/api-unix-p1/
101
102[dht]
103AUTOSTART = NO
104
105[mesh]
106AUTOSTART = NO
107
108
109[dns]
110AUTOSTART = NO
111 13
14[resolver]
15PORT = 12123
16UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
112 17
18[peerinfo]
19PORT = 12122
20UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
113 21
114[nse] 22[transport]
115AUTOSTART = NO 23PORT = 12121
24PLUGINS = unix
25UNIXPATH = /tmp/gnunet-p1-service-transport.sock
116 26
27[transport-unix]
28PORT = 12120
117 29
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index 3714981b9..bed415b65 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -1,116 +1,29 @@
1[transport-unix] 1@INLINE@ test_transport_defaults.conf
2PORT = 12130 2[PATHS]
3 3SERVICEHOME = /tmp/test-transport/api-unix-p2/
4[fs] 4DEFAULTCONFIG = test_transport_api_unix_peer2.conf
5AUTOSTART = NO
6
7[datastore]
8AUTOSTART = NO
9
10[core]
11AUTOSTART = NO
12
13[hostlist]
14HTTP-PROXY =
15SERVERS = http://gnunet.org:8080/
16OPTIONS = -b
17BINARY = gnunet-daemon-hostlist
18CONFIG = $DEFAULTCONFIG
19HOME = $SERVICEHOME
20HOSTNAME = localhost
21HTTPPORT = 8080
22
23[topology]
24BINARY = gnunet-daemon-topology
25CONFIG = $DEFAULTCONFIG
26FRIENDS = $SERVICEHOME/friends
27TARGET-CONNECTION-COUNT = 16
28AUTOCONNECT = YES
29FRIENDS-ONLY = NO
30MINIMUM-FRIENDS = 0
31
32[transport]
33PLUGINS = unix
34#DEBUG = YES
35PREFIX =
36ACCEPT_FROM6 = ::1;
37ACCEPT_FROM = 127.0.0.1;
38NEIGHBOUR_LIMIT = 50
39BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME
42HOSTNAME = localhost
43PORT = 12131
44UNIXPATH = /tmp/gnunet-p2-service-transport.sock
45#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
46
47[peerinfo]
48TRUST = $SERVICEHOME/data/credit/
49HOSTS = $SERVICEHOME/data/hosts/
50ACCEPT_FROM6 = ::1;
51ACCEPT_FROM = 127.0.0.1;
52BINARY = gnunet-service-peerinfo
53CONFIG = $DEFAULTCONFIG
54HOME = $SERVICEHOME
55HOSTNAME = localhost
56PORT = 12132
57UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
58
59[resolver]
60ACCEPT_FROM6 = ::1;
61ACCEPT_FROM = 127.0.0.1;
62BINARY = gnunet-service-resolver
63CONFIG = $DEFAULTCONFIG
64HOME = $SERVICEHOME
65HOSTNAME = localhost
66PORT = 12133
67UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
68
69[statistics]
70ACCEPT_FROM6 = ::1;
71ACCEPT_FROM = 127.0.0.1;
72BINARY = gnunet-service-statistics
73CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME
75HOSTNAME = localhost
76PORT = 12134
77UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
78 5
79[arm] 6[arm]
80DEFAULTSERVICES =
81ACCEPT_FROM6 = ::1;
82ACCEPT_FROM = 127.0.0.1;
83BINARY = gnunet-service-arm
84CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME
86HOSTNAME = localhost
87PORT = 12135 7PORT = 12135
88UNIXPATH = /tmp/gnunet-p2-service-arm.sock 8UNIXPATH = /tmp/gnunet-p2-service-arm.sock
89 9
90[TESTING] 10[statistics]
91WEAKRANDOM = YES 11PORT = 12134
92 12UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
93[gnunetd]
94HOSTKEY = $SERVICEHOME/.hostkey
95
96[PATHS]
97DEFAULTCONFIG = test_transport_api_unix_peer2.conf
98SERVICEHOME = /tmp/test-transport/api-unix-p2/
99
100
101[dht]
102AUTOSTART = NO
103
104[mesh]
105AUTOSTART = NO
106
107
108[dns]
109AUTOSTART = NO
110 13
14[resolver]
15PORT = 12133
16UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
111 17
18[peerinfo]
19PORT = 12132
20UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
112 21
113[nse] 22[transport]
114AUTOSTART = NO 23PORT = 12131
24PLUGINS = unix
25UNIXPATH = /tmp/gnunet-p2-service-transport.sock
115 26
27[transport-unix]
28PORT = 12131
116 29
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 2bcaa6cd8..704fd55b1 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,121 +1,30 @@
1[fs] 1@INLINE@ test_transport_defaults.conf
2AUTOSTART = NO 2[PATHS]
3 3SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4[datastore] 4DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5AUTOSTART = NO
6
7[core]
8AUTOSTART = NO
9 5
10[transport-wlan] 6[transport-wlan]
11INTERFACE = mon0
12TESTMODE = 1 7TESTMODE = 1
13#PREFIX = gdbserver :2345
14
15[hostlist]
16HTTP-PROXY =
17SERVERS = http://gnunet.org:8080/
18OPTIONS = -b
19BINARY = gnunet-daemon-hostlist
20CONFIG = $DEFAULTCONFIG
21HOME = $SERVICEHOME
22HOSTNAME = localhost
23HTTPPORT = 8080
24
25[topology]
26BINARY = gnunet-daemon-topology
27CONFIG = $DEFAULTCONFIG
28FRIENDS = $SERVICEHOME/friends
29TARGET-CONNECTION-COUNT = 16
30AUTOCONNECT = YES
31FRIENDS-ONLY = NO
32MINIMUM-FRIENDS = 0
33
34[transport]
35PLUGINS = wlan
36#DEBUG=YES
37ACCEPT_FROM6 = ::1;
38ACCEPT_FROM = 127.0.0.1;
39NEIGHBOUR_LIMIT = 50
40BINARY = gnunet-service-transport
41CONFIG = $DEFAULTCONFIG
42HOME = $SERVICEHOME
43HOSTNAME = localhost
44PORT = 12160
45UNIXPATH = /tmp/gnunet-p1-service-transport.sock
46#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
48#PREFIX = valgrind --leak-check=full --show-reachable=yes
49#PREFIX = valgrind --leak-check=full
50#PREFIX = valgrind --tool=massif
51#PREFIX = gdbserver :2345
52
53[peerinfo]
54TRUST = $SERVICEHOME/data/credit/
55HOSTS = $SERVICEHOME/data/hosts/
56ACCEPT_FROM6 = ::1;
57ACCEPT_FROM = 127.0.0.1;
58BINARY = gnunet-service-peerinfo
59CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME
61HOSTNAME = localhost
62PORT = 12161
63UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
64
65[resolver]
66ACCEPT_FROM6 = ::1;
67ACCEPT_FROM = 127.0.0.1;
68BINARY = gnunet-service-resolver
69CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME
71HOSTNAME = localhost
72PORT = 12162
73UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
74
75[statistics]
76ACCEPT_FROM6 = ::1;
77ACCEPT_FROM = 127.0.0.1;
78BINARY = gnunet-service-statistics
79CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME
81HOSTNAME = localhost
82PORT = 12163
83UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
84 8
85[arm] 9[arm]
86DEFAULTSERVICES =
87ACCEPT_FROM6 = ::1;
88ACCEPT_FROM = 127.0.0.1;
89BINARY = gnunet-service-arm
90#CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME
92HOSTNAME = localhost
93PORT = 12164 10PORT = 12164
94UNIXPATH = /tmp/gnunet-p1-service-arm.sock 11UNIXPATH = /tmp/gnunet-p1-service-arm.sock
95 12
96[TESTING] 13[statistics]
97WEAKRANDOM = YES 14PORT = 12163
98 15UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
99[gnunetd]
100HOSTKEY = $SERVICEHOME/.hostkey
101
102[PATHS]
103SERVICEHOME = /tmp/test-transport/api-wlan-p1/
104
105
106[dht]
107AUTOSTART = NO
108
109[mesh]
110AUTOSTART = NO
111
112
113[dns]
114AUTOSTART = NO
115 16
17[resolver]
18PORT = 12162
19UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
116 20
21[peerinfo]
22PORT = 12161
23UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
117 24
118[nse] 25[transport]
119AUTOSTART = NO 26PORT = 12160
27PLUGINS = wlan
28UNIXPATH = /tmp/gnunet-p1-service-transport.sock
120 29
121 30
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf
index 3230f898c..2ab9811ea 100644
--- a/src/transport/test_transport_api_wlan_peer2.conf
+++ b/src/transport/test_transport_api_wlan_peer2.conf
@@ -1,120 +1,30 @@
1[fs] 1@INLINE@ test_transport_defaults.conf
2AUTOSTART = NO 2[PATHS]
3 3SERVICEHOME = /tmp/test-transport/api-wlan-p2/
4[datastore] 4DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
5AUTOSTART = NO
6
7[core]
8AUTOSTART = NO
9 5
10[transport-wlan] 6[transport-wlan]
11INTERFACE = mon1 7INTERFACE = mon1
12TESTMODE = 2 8TESTMODE = 2
13#PREFIX = gdbserver :2346
14
15[hostlist]
16HTTP-PROXY =
17SERVERS = http://gnunet.org:8080/
18OPTIONS = -b
19BINARY = gnunet-daemon-hostlist
20CONFIG = $DEFAULTCONFIG
21HOME = $SERVICEHOME
22HOSTNAME = localhost
23HTTPPORT = 8080
24
25[topology]
26BINARY = gnunet-daemon-topology
27CONFIG = $DEFAULTCONFIG
28FRIENDS = $SERVICEHOME/friends
29TARGET-CONNECTION-COUNT = 16
30AUTOCONNECT = YES
31FRIENDS-ONLY = NO
32MINIMUM-FRIENDS = 0
33
34[transport]
35PLUGINS = wlan
36#DEBUG = YES
37ACCEPT_FROM6 = ::1;
38ACCEPT_FROM = 127.0.0.1;
39NEIGHBOUR_LIMIT = 50
40BINARY = gnunet-service-transport
41CONFIG = $DEFAULTCONFIG
42HOME = $SERVICEHOME
43HOSTNAME = localhost
44PORT = 12170
45UNIXPATH = /tmp/gnunet-p2-service-transport.sock
46#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
47#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
48#PREFIX = valgrind --leak-check=full --show-reachable=yes
49#PREFIX = valgrind --leak-check=full
50#PREFIX = valgrind --tool=massif
51#PREFIX = gdbserver :2346
52
53[peerinfo]
54TRUST = $SERVICEHOME/data/credit/
55HOSTS = $SERVICEHOME/data/hosts/
56ACCEPT_FROM6 = ::1;
57ACCEPT_FROM = 127.0.0.1;
58BINARY = gnunet-service-peerinfo
59CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME
61HOSTNAME = localhost
62PORT = 12171
63UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
64
65[resolver]
66ACCEPT_FROM6 = ::1;
67ACCEPT_FROM = 127.0.0.1;
68BINARY = gnunet-service-resolver
69CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME
71HOSTNAME = localhost
72PORT = 12172
73UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
74
75[statistics]
76ACCEPT_FROM6 = ::1;
77ACCEPT_FROM = 127.0.0.1;
78BINARY = gnunet-service-statistics
79CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME
81HOSTNAME = localhost
82PORT = 12173
83UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
84 9
85[arm] 10[arm]
86DEFAULTSERVICES =
87ACCEPT_FROM6 = ::1;
88ACCEPT_FROM = 127.0.0.1;
89BINARY = gnunet-service-arm
90CONFIG = $DEFAULTCONFIG
91HOME = $SERVICEHOME
92HOSTNAME = localhost
93PORT = 12174 11PORT = 12174
94UNIXPATH = /tmp/gnunet-p2-service-arm.sock 12UNIXPATH = /tmp/gnunet-p2-service-arm.sock
95 13
96[TESTING] 14[statistics]
97WEAKRANDOM = YES 15PORT = 12173
98 16UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
99[gnunetd]
100HOSTKEY = $SERVICEHOME/.hostkey
101
102[PATHS]
103SERVICEHOME = /tmp/test-transport/api-wlan-p2/
104
105[dht]
106AUTOSTART = NO
107
108[mesh]
109AUTOSTART = NO
110
111
112[dns]
113AUTOSTART = NO
114
115 17
18[resolver]
19PORT = 12172
20UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
116 21
117[nse] 22[peerinfo]
118AUTOSTART = NO 23PORT = 12171
24UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
119 25
26[transport]
27PORT = 12170
28PLUGINS = wlan
29UNIXPATH = /tmp/gnunet-p2-service-transport.sock
120 30
diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf
index 480ccf0f3..ab6e9cb5a 100644
--- a/src/transport/test_transport_ats_1addr.conf
+++ b/src/transport/test_transport_ats_1addr.conf
@@ -1,26 +1,13 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/ 3SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data.conf 4DEFAULTCONFIG = test_testing_data.conf
4 5
5[resolver] 6[TESTING]
6PORT = 2564 7HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
7 8
8[transport] 9[nat]
9PORT = 2565 10ALLOW_NAT = NO
10PLUGINS = unix
11#DEBUG = YES
12#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#WAN_BW_LIMIT_DOWN = 100
15#WAN_BW_LIMIT_UP = 1000000
16#LAN_BW_LIMIT_DOWN = 100
17#LAN_BW_LIMIT_UP = 100000000
18#WLAN_ENERGY_DOWN_LIMIT = 0
19#WLAN_ENERGY_UP_LIMIT = 30
20#DUMP_MLP = YES
21#DUMP_SOLUTION = YES
22ATS_MIN_INTERVAL = 100
23ATS_EXEC_INTERVAL = 250
24 11
25[arm] 12[arm]
26PORT = 2566 13PORT = 2566
@@ -29,53 +16,22 @@ DEFAULTSERVICES = core
29[statistics] 16[statistics]
30PORT = 2567 17PORT = 2567
31 18
32 19[resolver]
33[nat] 20PORT = 2564
34DISABLEV6 = YES
35BINDTO = 127.0.0.1
36BEHIND_NAT = NO
37ALLOW_NAT = NO
38ENABLE_UPNP = NO
39EXTERNAL_ADDRESS = 127.0.0.1
40INTERNAL_ADDRESS = 127.0.0.1
41
42[transport-unix]
43PORT = 2572
44
45
46[transport-udp]
47PORT = 2571
48USE_LOCALADDR = YES
49 21
50[peerinfo] 22[peerinfo]
51PORT = 2569 23PORT = 2569
52 24
25[transport]
26PORT = 2565
27PLUGINS = unix
28ATS_MIN_INTERVAL = 100
29ATS_EXEC_INTERVAL = 250
30
53[core] 31[core]
32AUTOSTART = YES
54PORT = 2570 33PORT = 2570
55 34
56[testing] 35[transport-unix]
57WEAKRANDOM = YES 36PORT = 2572
58HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
59
60[fs]
61AUTOSTART = NO
62
63[datastore]
64AUTOSTART = NO
65
66[dht]
67AUTOSTART = NO
68
69[mesh]
70AUTOSTART = NO
71
72
73[dns]
74AUTOSTART = NO
75
76
77
78[nse]
79AUTOSTART = NO
80
81 37
diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf
index 264a6b566..3b5a6a87a 100644
--- a/src/transport/test_transport_ats_2addr.conf
+++ b/src/transport/test_transport_ats_2addr.conf
@@ -1,26 +1,13 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/ 3SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data.conf 4DEFAULTCONFIG = test_testing_data.conf
4 5
5[resolver] 6[TESTING]
6PORT = 2564 7HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
7 8
8[transport] 9[transport-udp]
9PORT = 2565 10PORT = 2571
10PLUGINS = udp unix
11#DEBUG = YES
12#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
13#PREFIX = valgrind --tool=memcheck --log-file=logs%p
14#WAN_BW_LIMIT_DOWN = 100
15#WAN_BW_LIMIT_UP = 1000000
16#LAN_BW_LIMIT_DOWN = 100
17#LAN_BW_LIMIT_UP = 100000000
18#WLAN_ENERGY_DOWN_LIMIT = 0
19#WLAN_ENERGY_UP_LIMIT = 30
20#DUMP_MLP = YES
21#DUMP_SOLUTION = YES
22ATS_MIN_INTERVAL = 100
23ATS_EXEC_INTERVAL = 250
24 11
25[arm] 12[arm]
26PORT = 2566 13PORT = 2566
@@ -29,54 +16,22 @@ DEFAULTSERVICES = core
29[statistics] 16[statistics]
30PORT = 2567 17PORT = 2567
31 18
32[transport-tcp] 19[resolver]
33USE_LOCALADDR = YES 20PORT = 2564
34
35[nat]
36BINDTO = 127.0.0.1
37#BEHIND_NAT = NO
38#ALLOW_NAT = NO
39#ENABLE_UPNP = NO
40#EXTERNAL_ADDRESS = 127.0.0.1
41#INTERNAL_ADDRESS = 127.0.0.1
42
43[transport-unix]
44PORT = 2572
45
46
47[transport-udp]
48PORT = 2571
49USE_LOCALADDR = YES
50 21
51[peerinfo] 22[peerinfo]
52PORT = 2569 23PORT = 2569
53 24
25[transport]
26PORT = 2565
27PLUGINS = udp unix
28ATS_MIN_INTERVAL = 100
29ATS_EXEC_INTERVAL = 250
30
54[core] 31[core]
32AUTOSTART = YES
55PORT = 2570 33PORT = 2570
56 34
57[testing] 35[transport-unix]
58WEAKRANDOM = YES 36PORT = 2572
59HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
60
61[fs]
62AUTOSTART = NO
63
64[datastore]
65AUTOSTART = NO
66
67[dht]
68AUTOSTART = NO
69
70[mesh]
71AUTOSTART = NO
72
73
74[dns]
75AUTOSTART = NO
76
77
78
79[nse]
80AUTOSTART = NO
81
82 37
diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf
index d71ad2b14..2fb476ced 100644
--- a/src/transport/test_transport_ats_4addr.conf
+++ b/src/transport/test_transport_ats_4addr.conf
@@ -1,29 +1,19 @@
1@INLINE@ test_transport_defaults.conf
1[PATHS] 2[PATHS]
2SERVICEHOME = /tmp/test-gnunet-testing/ 3SERVICEHOME = /tmp/test-gnunet-testing/
3DEFAULTCONFIG = test_testing_data.conf 4DEFAULTCONFIG = test_testing_data.conf
4 5
5[resolver] 6[TESTING]
6PORT = 2564 7HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
7 8
8[transport] 9[nat]
9PORT = 2565 10ALLOW_NAT = NO
10PLUGINS = tcp 11
11#DEBUG = YES 12[transport-tcp]
12#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args 13TIMEOUT = 5000
13#PREFIX = valgrind --tool=memcheck --log-file=multiple_peers/logs%p 14
14#WAN_BW_LIMIT_DOWN = 100 15[transport-udp]
15#WAN_BW_LIMIT_UP = 1000000 16PORT = 2571
16#LAN_BW_LIMIT_DOWN = 100
17#LAN_BW_LIMIT_UP = 100000000
18#WLAN_ENERGY_DOWN_LIMIT = 0
19#WLAN_ENERGY_UP_LIMIT = 30
20#DUMP_MLP = YES
21#DUMP_OVERWRITE = YES
22#DUMP_MIN_PEERS = 500
23#DUMP_MIN_ADDRS = 2000
24#DUMP_SOLUTION = YES
25ATS_MIN_INTERVAL = 100
26ATS_EXEC_INTERVAL = 250
27 17
28[arm] 18[arm]
29PORT = 2566 19PORT = 2566
@@ -32,55 +22,21 @@ DEFAULTSERVICES = core
32[statistics] 22[statistics]
33PORT = 2567 23PORT = 2567
34 24
35[transport-tcp] 25[resolver]
36USE_LOCALADDR = YES 26PORT = 2564
37
38[nat]
39DISABLEV6 = YES
40BINDTO = 127.0.0.1
41BEHIND_NAT = NO
42ALLOW_NAT = NO
43ENABLE_UPNP = NO
44EXTERNAL_ADDRESS = 127.0.0.1
45INTERNAL_ADDRESS = 127.0.0.1
46
47[transport-unix]
48PORT = 2572
49
50
51[transport-udp]
52PORT = 2571
53USE_LOCALADDR = YES
54 27
55[peerinfo] 28[peerinfo]
56PORT = 2569 29PORT = 2569
57 30
31[transport]
32PORT = 2565
33ATS_MIN_INTERVAL = 100
34ATS_EXEC_INTERVAL = 250
35
58[core] 36[core]
37AUTOSTART = YES
59PORT = 2570 38PORT = 2570
60 39
61[testing] 40[transport-unix]
62WEAKRANDOM = YES 41PORT = 2572
63HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
64
65[fs]
66AUTOSTART = NO
67
68[datastore]
69AUTOSTART = NO
70
71[dht]
72AUTOSTART = NO
73
74[mesh]
75AUTOSTART = NO
76
77
78[dns]
79AUTOSTART = NO
80
81
82
83[nse]
84AUTOSTART = NO
85
86 42
diff --git a/src/transport/test_transport_defaults.conf b/src/transport/test_transport_defaults.conf
new file mode 100644
index 000000000..6daf49857
--- /dev/null
+++ b/src/transport/test_transport_defaults.conf
@@ -0,0 +1,46 @@
1[PATHS]
2SERVICEHOME = /tmp/test-transport-api/
3DEFAULTCONFIG = test_transport_defaults.conf
4
5[transport-tcp]
6TIMEOUT = 300000
7
8[arm]
9DEFAULTSERVICES = topology hostlist
10
11[transport]
12PREFIX =
13
14[core]
15AUTOSTART = NO
16
17[hostlist]
18SERVERS = http://localhost:8080/
19HOSTNAME = localhost
20
21[datastore]
22AUTOSTART = NO
23
24[fs]
25AUTOSTART = NO
26
27[dht]
28AUTOSTART = NO
29
30[mesh]
31AUTOSTART = NO
32
33[nse]
34AUTOSTART = NO
35
36[dns]
37AUTOSTART = NO
38
39[nat]
40DISABLEV6 = YES
41BINDTO = 127.0.0.1
42INTERNAL_ADDRESS = 127.0.0.1
43EXTERNAL_ADDRESS = 127.0.0.1
44
45[TESTING]
46WEAKRANDOM = YES