aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/test_transport_api_http_peer1.conf44
-rw-r--r--src/transport/test_transport_api_http_peer2.conf49
-rw-r--r--src/transport/test_transport_api_https_peer1.conf40
-rw-r--r--src/transport/test_transport_api_https_peer2.conf32
-rw-r--r--src/transport/test_transport_api_multi_peer1.conf23
-rw-r--r--src/transport/test_transport_api_multi_peer2.conf35
-rw-r--r--src/transport/test_transport_api_rel_http_peer2.conf32
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer1.conf43
-rw-r--r--src/transport/test_transport_api_tcp_nat_peer2.conf30
-rw-r--r--src/transport/test_transport_api_tcp_peer1.conf31
-rw-r--r--src/transport/test_transport_api_tcp_peer2.conf30
-rw-r--r--src/transport/test_transport_api_udp_nat_peer1.conf42
-rw-r--r--src/transport/test_transport_api_udp_nat_peer2.conf44
-rw-r--r--src/transport/test_transport_api_udp_peer1.conf18
-rw-r--r--src/transport/test_transport_api_udp_peer2.conf50
-rw-r--r--src/transport/test_transport_api_unix_peer1.conf18
-rw-r--r--src/transport/test_transport_api_unix_peer2.conf18
17 files changed, 199 insertions, 380 deletions
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf
index e4e972c8c..d9ab3c5e0 100644
--- a/src/transport/test_transport_api_http_peer1.conf
+++ b/src/transport/test_transport_api_http_peer1.conf
@@ -1,5 +1,5 @@
1[transport-http] 1[transport-http]
2PORT = 12389 2PORT = 12080
3DEBUG = NO 3DEBUG = NO
4USE_IPv6 = YES 4USE_IPv6 = YES
5USE_IPv4 = YES 5USE_IPv4 = YES
@@ -7,23 +7,6 @@ USE_IPv4 = YES
7#BINDTO6 = ::1 7#BINDTO6 = ::1
8USE_LOCALADDR = YES 8USE_LOCALADDR = YES
9 9
10[transport-https]
11PORT = 42389
12DEBUG = NO
13USE_IPv6 = YES
14USE_IPv4 = YES
15#BINDTO4 = 127.0.0.1
16#BINDTO6 = ::1
17
18[fs]
19AUTOSTART = NO
20
21[datastore]
22AUTOSTART = NO
23
24[core]
25AUTOSTART = NO
26
27[hostlist] 10[hostlist]
28HTTP-PROXY = 11HTTP-PROXY =
29SERVERS = http://gnunet.org:8080/ 12SERVERS = http://gnunet.org:8080/
@@ -45,7 +28,6 @@ MINIMUM-FRIENDS = 0
45 28
46[transport] 29[transport]
47PLUGINS = http 30PLUGINS = http
48#PLUGINS = tcp http
49#DEBUG = YES 31#DEBUG = YES
50ACCEPT_FROM6 = ::1; 32ACCEPT_FROM6 = ::1;
51ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
@@ -54,7 +36,7 @@ BINARY = gnunet-service-transport
54CONFIG = $DEFAULTCONFIG 36CONFIG = $DEFAULTCONFIG
55HOME = $SERVICEHOME 37HOME = $SERVICEHOME
56HOSTNAME = localhost 38HOSTNAME = localhost
57PORT = 12365 39PORT = 12081
58UNIXPATH = /tmp/gnunet-p1-service-transport.sock 40UNIXPATH = /tmp/gnunet-p1-service-transport.sock
59#PREFIX = xterm -T transport2 -e gdb --command=cmd --args 41#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
60#PREFIX = valgrind --leak-check=full 42#PREFIX = valgrind --leak-check=full
@@ -69,7 +51,7 @@ BINARY = gnunet-service-peerinfo
69CONFIG = $DEFAULTCONFIG 51CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME 52HOME = $SERVICEHOME
71HOSTNAME = localhost 53HOSTNAME = localhost
72PORT = 12369 54PORT = 12082
73UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 55UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
74 56
75[resolver] 57[resolver]
@@ -79,7 +61,7 @@ BINARY = gnunet-service-resolver
79CONFIG = $DEFAULTCONFIG 61CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME 62HOME = $SERVICEHOME
81HOSTNAME = localhost 63HOSTNAME = localhost
82PORT = 12364 64PORT = 12083
83UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 65UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
84 66
85[statistics] 67[statistics]
@@ -89,7 +71,7 @@ BINARY = gnunet-service-statistics
89CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
90HOME = $SERVICEHOME 72HOME = $SERVICEHOME
91HOSTNAME = localhost 73HOSTNAME = localhost
92PORT = 12367 74PORT = 12084
93UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 75UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
94 76
95[arm] 77[arm]
@@ -100,13 +82,9 @@ BINARY = gnunet-service-arm
100CONFIG = $DEFAULTCONFIG 82CONFIG = $DEFAULTCONFIG
101HOME = $SERVICEHOME 83HOME = $SERVICEHOME
102HOSTNAME = localhost 84HOSTNAME = localhost
103PORT = 12366 85PORT = 12085
104UNIXPATH = /tmp/gnunet-p1-service-arm.sock 86UNIXPATH = /tmp/gnunet-p1-service-arm.sock
105 87
106[transport-tcp]
107PORT = 12399
108#DEBUG = YES
109
110 88
111[TESTING] 89[TESTING]
112WEAKRANDOM = YES 90WEAKRANDOM = YES
@@ -115,8 +93,16 @@ WEAKRANDOM = YES
115HOSTKEY = $SERVICEHOME/.hostkey 93HOSTKEY = $SERVICEHOME/.hostkey
116 94
117[PATHS] 95[PATHS]
118SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 96SERVICEHOME = /tmp/test-transport/api-http-p1/
97
98[fs]
99AUTOSTART = NO
100
101[datastore]
102AUTOSTART = NO
119 103
104[core]
105AUTOSTART = NO
120 106
121[dht] 107[dht]
122AUTOSTART = NO 108AUTOSTART = NO
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf
index a8833c7a4..a4b7b8bf0 100644
--- a/src/transport/test_transport_api_http_peer2.conf
+++ b/src/transport/test_transport_api_http_peer2.conf
@@ -1,5 +1,5 @@
1[transport-http] 1[transport-http]
2PORT = 22368 2PORT = 12090
3DEBUG = NO 3DEBUG = NO
4USE_IPv6 = YES 4USE_IPv6 = YES
5USE_IPv4 = YES 5USE_IPv4 = YES
@@ -7,23 +7,6 @@ USE_IPv4 = YES
7#BINDTO6 = ::1 7#BINDTO6 = ::1
8USE_LOCALADDR = YES 8USE_LOCALADDR = YES
9 9
10[transport-https]
11PORT = 42388
12DEBUG = NO
13USE_IPv6 = YES
14USE_IPv4 = YES
15#BINDTO4 = 127.0.0.1
16#BINDTO6 = ::1
17
18[fs]
19AUTOSTART = NO
20
21[datastore]
22AUTOSTART = NO
23
24[core]
25AUTOSTART = NO
26
27[hostlist] 10[hostlist]
28HTTP-PROXY = 11HTTP-PROXY =
29SERVERS = http://gnunet.org:8080/ 12SERVERS = http://gnunet.org:8080/
@@ -45,7 +28,6 @@ MINIMUM-FRIENDS = 0
45 28
46[transport] 29[transport]
47PLUGINS = http 30PLUGINS = http
48#PLUGINS = tcp http
49#DEBUG = YES 31#DEBUG = YES
50ACCEPT_FROM6 = ::1; 32ACCEPT_FROM6 = ::1;
51ACCEPT_FROM = 127.0.0.1; 33ACCEPT_FROM = 127.0.0.1;
@@ -54,7 +36,7 @@ BINARY = gnunet-service-transport
54CONFIG = $DEFAULTCONFIG 36CONFIG = $DEFAULTCONFIG
55HOME = $SERVICEHOME 37HOME = $SERVICEHOME
56HOSTNAME = localhost 38HOSTNAME = localhost
57PORT = 22365 39PORT = 12091
58UNIXPATH = /tmp/gnunet-p2-service-transport.sock 40UNIXPATH = /tmp/gnunet-p2-service-transport.sock
59#PREFIX = xterm -T transport1 -e gdb --command=cmd --args 41#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
60#PREFIX = valgrind --leak-check=full 42#PREFIX = valgrind --leak-check=full
@@ -69,7 +51,7 @@ BINARY = gnunet-service-peerinfo
69CONFIG = $DEFAULTCONFIG 51CONFIG = $DEFAULTCONFIG
70HOME = $SERVICEHOME 52HOME = $SERVICEHOME
71HOSTNAME = localhost 53HOSTNAME = localhost
72PORT = 22369 54PORT = 12092
73UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 55UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
74 56
75[resolver] 57[resolver]
@@ -79,7 +61,7 @@ BINARY = gnunet-service-resolver
79CONFIG = $DEFAULTCONFIG 61CONFIG = $DEFAULTCONFIG
80HOME = $SERVICEHOME 62HOME = $SERVICEHOME
81HOSTNAME = localhost 63HOSTNAME = localhost
82PORT = 22364 64PORT = 12093
83UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 65UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
84 66
85[statistics] 67[statistics]
@@ -89,7 +71,7 @@ BINARY = gnunet-service-statistics
89CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
90HOME = $SERVICEHOME 72HOME = $SERVICEHOME
91HOSTNAME = localhost 73HOSTNAME = localhost
92PORT = 22367 74PORT = 12094
93UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 75UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
94 76
95 77
@@ -101,18 +83,9 @@ BINARY = gnunet-service-arm
101CONFIG = $DEFAULTCONFIG 83CONFIG = $DEFAULTCONFIG
102HOME = $SERVICEHOME 84HOME = $SERVICEHOME
103HOSTNAME = localhost 85HOSTNAME = localhost
104PORT = 22366 86PORT = 12095
105UNIXPATH = /tmp/gnunet-p2-service-arm.sock 87UNIXPATH = /tmp/gnunet-p2-service-arm.sock
106 88
107
108[transport-http]
109PORT = 22389
110DEBUG = NO
111
112[transport-tcp]
113PORT = 22399
114#DEBUG = YES
115
116[TESTING] 89[TESTING]
117WEAKRANDOM = YES 90WEAKRANDOM = YES
118 91
@@ -120,8 +93,16 @@ WEAKRANDOM = YES
120HOSTKEY = $SERVICEHOME/.hostkey 93HOSTKEY = $SERVICEHOME/.hostkey
121 94
122[PATHS] 95[PATHS]
123SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 96SERVICEHOME = /tmp/test-transport/api-http-p2/
97
98[fs]
99AUTOSTART = NO
124 100
101[datastore]
102AUTOSTART = NO
103
104[core]
105AUTOSTART = NO
125 106
126[dht] 107[dht]
127AUTOSTART = NO 108AUTOSTART = NO
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf
index a2decb6fb..e441bfc2b 100644
--- a/src/transport/test_transport_api_https_peer1.conf
+++ b/src/transport/test_transport_api_https_peer1.conf
@@ -1,13 +1,5 @@
1[transport-http]
2PORT = 12389
3DEBUG = NO
4USE_IPv6 = YES
5USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8
9[transport-https] 1[transport-https]
10PORT = 42389 2PORT = 12100
11DEBUG = NO 3DEBUG = NO
12USE_IPv6 = YES 4USE_IPv6 = YES
13USE_IPv4 = YES 5USE_IPv4 = YES
@@ -50,7 +42,6 @@ MINIMUM-FRIENDS = 0
50 42
51[transport] 43[transport]
52PLUGINS = https 44PLUGINS = https
53#PLUGINS = tcp http
54DEBUG = NO 45DEBUG = NO
55ACCEPT_FROM6 = ::1; 46ACCEPT_FROM6 = ::1;
56ACCEPT_FROM = 127.0.0.1; 47ACCEPT_FROM = 127.0.0.1;
@@ -59,7 +50,7 @@ BINARY = gnunet-service-transport
59CONFIG = $DEFAULTCONFIG 50CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME 51HOME = $SERVICEHOME
61HOSTNAME = localhost 52HOSTNAME = localhost
62PORT = 12365 53PORT = 12101
63UNIXPATH = /tmp/gnunet-p1-service-transport.sock 54UNIXPATH = /tmp/gnunet-p1-service-transport.sock
64#PREFIX = xterm -T transport2 -e gdb --command=cmd --args 55#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
65#PREFIX = valgrind --leak-check=full 56#PREFIX = valgrind --leak-check=full
@@ -74,7 +65,7 @@ BINARY = gnunet-service-peerinfo
74CONFIG = $DEFAULTCONFIG 65CONFIG = $DEFAULTCONFIG
75HOME = $SERVICEHOME 66HOME = $SERVICEHOME
76HOSTNAME = localhost 67HOSTNAME = localhost
77PORT = 12369 68PORT = 12102
78UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 69UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
79 70
80[resolver] 71[resolver]
@@ -84,7 +75,7 @@ BINARY = gnunet-service-resolver
84CONFIG = $DEFAULTCONFIG 75CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME 76HOME = $SERVICEHOME
86HOSTNAME = localhost 77HOSTNAME = localhost
87PORT = 12364 78PORT = 12103
88UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 79UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
89 80
90[statistics] 81[statistics]
@@ -94,7 +85,7 @@ BINARY = gnunet-service-statistics
94CONFIG = $DEFAULTCONFIG 85CONFIG = $DEFAULTCONFIG
95HOME = $SERVICEHOME 86HOME = $SERVICEHOME
96HOSTNAME = localhost 87HOSTNAME = localhost
97PORT = 12367 88PORT = 12104
98UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 89UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
99 90
100[arm] 91[arm]
@@ -105,24 +96,7 @@ BINARY = gnunet-service-arm
105CONFIG = $DEFAULTCONFIG 96CONFIG = $DEFAULTCONFIG
106HOME = $SERVICEHOME 97HOME = $SERVICEHOME
107HOSTNAME = localhost 98HOSTNAME = localhost
108PORT = 12366[mesh] 99PORT = 12105
109AUTOSTART = YES
110PORT = 10512
111HOSTNAME = localhost
112HOME = $SERVICEHOME
113CONFIG = $DEFAULTCONFIG
114BINARY = gnunet-service-mesh
115ACCEPT_FROM = 127.0.0.1;
116ACCEPT_FROM6 = ::1;
117UNIXPATH = /tmp/gnunet-service-mesh2.sock
118UNIX_MATCH_UID = YES
119UNIX_MATCH_GID = YES
120UNIXPATH = /tmp/gnunet-p1-service-arm.sock
121
122[transport-tcp]
123PORT = 12399
124DEBUG = YES
125
126 100
127[TESTING] 101[TESTING]
128WEAKRANDOM = YES 102WEAKRANDOM = YES
@@ -131,7 +105,7 @@ WEAKRANDOM = YES
131HOSTKEY = $SERVICEHOME/.hostkey 105HOSTKEY = $SERVICEHOME/.hostkey
132 106
133[PATHS] 107[PATHS]
134SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 108SERVICEHOME = /tmp/test-transport/api-https-p1/
135 109
136 110
137[dht] 111[dht]
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf
index 07495835c..cf0c5c915 100644
--- a/src/transport/test_transport_api_https_peer2.conf
+++ b/src/transport/test_transport_api_https_peer2.conf
@@ -1,13 +1,5 @@
1[transport-http]
2PORT = 22368
3DEBUG = NO
4USE_IPv6 = YES
5USE_IPv4 = YES
6#BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8
9[transport-https] 1[transport-https]
10PORT = 42388 2PORT = 12110
11DEBUG = NO 3DEBUG = NO
12USE_IPv6 = YES 4USE_IPv6 = YES
13USE_IPv4 = YES 5USE_IPv4 = YES
@@ -59,7 +51,7 @@ BINARY = gnunet-service-transport
59CONFIG = $DEFAULTCONFIG 51CONFIG = $DEFAULTCONFIG
60HOME = $SERVICEHOME 52HOME = $SERVICEHOME
61HOSTNAME = localhost 53HOSTNAME = localhost
62PORT = 22365 54PORT = 12111
63UNIXPATH = /tmp/gnunet-p2-service-transport.sock 55UNIXPATH = /tmp/gnunet-p2-service-transport.sock
64#PREFIX = xterm -T transport1 -e gdb --command=cmd --args 56#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
65#PREFIX = valgrind --leak-check=full 57#PREFIX = valgrind --leak-check=full
@@ -74,7 +66,7 @@ BINARY = gnunet-service-peerinfo
74CONFIG = $DEFAULTCONFIG 66CONFIG = $DEFAULTCONFIG
75HOME = $SERVICEHOME 67HOME = $SERVICEHOME
76HOSTNAME = localhost 68HOSTNAME = localhost
77PORT = 22369 69PORT = 12112
78UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 70UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
79 71
80[resolver] 72[resolver]
@@ -84,7 +76,7 @@ BINARY = gnunet-service-resolver
84CONFIG = $DEFAULTCONFIG 76CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME 77HOME = $SERVICEHOME
86HOSTNAME = localhost 78HOSTNAME = localhost
87PORT = 22364 79PORT = 12113
88UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 80UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
89 81
90[statistics] 82[statistics]
@@ -94,7 +86,7 @@ BINARY = gnunet-service-statistics
94CONFIG = $DEFAULTCONFIG 86CONFIG = $DEFAULTCONFIG
95HOME = $SERVICEHOME 87HOME = $SERVICEHOME
96HOSTNAME = localhost 88HOSTNAME = localhost
97PORT = 22367 89PORT = 12114
98UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 90UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
99 91
100 92
@@ -106,18 +98,9 @@ BINARY = gnunet-service-arm
106CONFIG = $DEFAULTCONFIG 98CONFIG = $DEFAULTCONFIG
107HOME = $SERVICEHOME 99HOME = $SERVICEHOME
108HOSTNAME = localhost 100HOSTNAME = localhost
109PORT = 22366 101PORT = 12115
110UNIXPATH = /tmp/gnunet-p2-service-arm.sock 102UNIXPATH = /tmp/gnunet-p2-service-arm.sock
111 103
112
113[transport-http]
114PORT = 22389
115DEBUG = NO
116
117[transport-tcp]
118PORT = 22399
119DEBUG = YES
120
121[TESTING] 104[TESTING]
122WEAKRANDOM = YES 105WEAKRANDOM = YES
123 106
@@ -125,8 +108,7 @@ WEAKRANDOM = YES
125HOSTKEY = $SERVICEHOME/.hostkey 108HOSTKEY = $SERVICEHOME/.hostkey
126 109
127[PATHS] 110[PATHS]
128SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 111SERVICEHOME = /tmp/test-transport/api-https-p2/
129
130 112
131[dht] 113[dht]
132AUTOSTART = NO 114AUTOSTART = NO
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf
index 959388391..003491323 100644
--- a/src/transport/test_transport_api_multi_peer1.conf
+++ b/src/transport/test_transport_api_multi_peer1.conf
@@ -1,5 +1,5 @@
1[transport-tcp] 1[transport-tcp]
2PORT = 30001 2PORT = 12140
3BINDTO = 127.0.0.1 3BINDTO = 127.0.0.1
4USE_LOCALADDR = YES 4USE_LOCALADDR = YES
5 5
@@ -12,11 +12,11 @@ INTERNAL_ADDRESS = 127.0.0.1
12EXTERNAL_ADDRESS = 127.0.0.1 12EXTERNAL_ADDRESS = 127.0.0.1
13 13
14[transport-udp] 14[transport-udp]
15PORT = 30001 15PORT = 12141
16USE_LOCALADDR = YES 16USE_LOCALADDR = YES
17 17
18[transport-http] 18[transport-http]
19PORT = 30002 19PORT = 12142
20DEBUG = NO 20DEBUG = NO
21USE_IPv6 = YES 21USE_IPv6 = YES
22USE_IPv4 = YES 22USE_IPv4 = YES
@@ -25,7 +25,7 @@ USE_IPv4 = YES
25USE_LOCALADDR = YES 25USE_LOCALADDR = YES
26 26
27[transport-https] 27[transport-https]
28PORT = 30003 28PORT = 12143
29DEBUG = NO 29DEBUG = NO
30USE_IPv6 = YES 30USE_IPv6 = YES
31USE_IPv4 = YES 31USE_IPv4 = YES
@@ -34,7 +34,7 @@ USE_IPv4 = YES
34USE_LOCALADDR = YES 34USE_LOCALADDR = YES
35 35
36[transport-unix] 36[transport-unix]
37PORT = 30004 37PORT = 12144
38 38
39[fs] 39[fs]
40AUTOSTART = NO 40AUTOSTART = NO
@@ -73,11 +73,10 @@ ACCEPT_FROM6 = ::1;
73ACCEPT_FROM = 127.0.0.1; 73ACCEPT_FROM = 127.0.0.1;
74NEIGHBOUR_LIMIT = 50 74NEIGHBOUR_LIMIT = 50
75BINARY = gnunet-service-transport 75BINARY = gnunet-service-transport
76#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
77CONFIG = $DEFAULTCONFIG 76CONFIG = $DEFAULTCONFIG
78HOME = $SERVICEHOME 77HOME = $SERVICEHOME
79HOSTNAME = localhost 78HOSTNAME = localhost
80PORT = 12365 79PORT = 12145
81UNIXPATH = /tmp/gnunet-p1-service-transport.sock 80UNIXPATH = /tmp/gnunet-p1-service-transport.sock
82 81
83[peerinfo] 82[peerinfo]
@@ -89,7 +88,7 @@ BINARY = gnunet-service-peerinfo
89CONFIG = $DEFAULTCONFIG 88CONFIG = $DEFAULTCONFIG
90HOME = $SERVICEHOME 89HOME = $SERVICEHOME
91HOSTNAME = localhost 90HOSTNAME = localhost
92PORT = 12369 91PORT = 12146
93UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 92UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
94 93
95[resolver] 94[resolver]
@@ -99,7 +98,7 @@ BINARY = gnunet-service-resolver
99CONFIG = $DEFAULTCONFIG 98CONFIG = $DEFAULTCONFIG
100HOME = $SERVICEHOME 99HOME = $SERVICEHOME
101HOSTNAME = localhost 100HOSTNAME = localhost
102PORT = 1236 101PORT = 12147
103UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 102UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
104 103
105[statistics] 104[statistics]
@@ -110,7 +109,7 @@ BINARY = gnunet-service-statistics
110CONFIG = $DEFAULTCONFIG 109CONFIG = $DEFAULTCONFIG
111HOME = $SERVICEHOME 110HOME = $SERVICEHOME
112HOSTNAME = localhost 111HOSTNAME = localhost
113PORT = 12367 112PORT = 12148
114UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 113UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
115 114
116[arm] 115[arm]
@@ -121,7 +120,7 @@ BINARY = gnunet-service-arm
121CONFIG = $DEFAULTCONFIG 120CONFIG = $DEFAULTCONFIG
122HOME = $SERVICEHOME 121HOME = $SERVICEHOME
123HOSTNAME = localhost 122HOSTNAME = localhost
124PORT = 12366 123PORT = 12149
125UNIXPATH = /tmp/gnunet-p1-service-arm.sock 124UNIXPATH = /tmp/gnunet-p1-service-arm.sock
126 125
127[TESTING] 126[TESTING]
@@ -132,7 +131,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
132 131
133[PATHS] 132[PATHS]
134DEFAULTCONFIG = test_transport_api_multi_peer1.conf 133DEFAULTCONFIG = test_transport_api_multi_peer1.conf
135SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-1/ 134SERVICEHOME = /tmp/test-transport/api-multi-p1/
136 135
137 136
138[dht] 137[dht]
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf
index ca7a505c9..fcfc1db03 100644
--- a/src/transport/test_transport_api_multi_peer2.conf
+++ b/src/transport/test_transport_api_multi_peer2.conf
@@ -1,5 +1,5 @@
1[transport-tcp] 1[transport-tcp]
2PORT = 40001 2PORT = 12150
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[nat] 5[nat]
@@ -12,11 +12,11 @@ EXTERNAL_ADDRESS = 127.0.0.1
12INTERNAL_ADDRESS = 127.0.0.1 12INTERNAL_ADDRESS = 127.0.0.1
13 13
14[transport-udp] 14[transport-udp]
15PORT = 40002 15PORT = 12151
16USE_LOCALADDR = YES 16USE_LOCALADDR = YES
17 17
18[transport-http] 18[transport-http]
19PORT = 40003 19PORT = 12152
20DEBUG = NO 20DEBUG = NO
21USE_IPv6 = YES 21USE_IPv6 = YES
22USE_IPv4 = YES 22USE_IPv4 = YES
@@ -25,7 +25,7 @@ USE_IPv4 = YES
25USE_LOCALADDR = YES 25USE_LOCALADDR = YES
26 26
27[transport-https] 27[transport-https]
28PORT = 40004 28PORT = 12153
29DEBUG = NO 29DEBUG = NO
30USE_IPv6 = YES 30USE_IPv6 = YES
31USE_IPv4 = YES 31USE_IPv4 = YES
@@ -34,7 +34,7 @@ USE_IPv4 = YES
34USE_LOCALADDR = YES 34USE_LOCALADDR = YES
35 35
36[transport-unix] 36[transport-unix]
37PORT = 40005 37PORT = 12154
38 38
39[core] 39[core]
40AUTOSTART = NO 40AUTOSTART = NO
@@ -44,18 +44,7 @@ AUTOSTART = NO
44 44
45[datastore] 45[datastore]
46AUTOSTART = NO 46AUTOSTART = NO
47[mesh] 47
48AUTOSTART = YES
49PORT = 10512
50HOSTNAME = localhost
51HOME = $SERVICEHOME
52CONFIG = $DEFAULTCONFIG
53BINARY = gnunet-service-mesh
54ACCEPT_FROM = 127.0.0.1;
55ACCEPT_FROM6 = ::1;
56UNIXPATH = /tmp/gnunet-service-mesh2.sock
57UNIX_MATCH_UID = YES
58UNIX_MATCH_GID = YES
59[hostlist] 48[hostlist]
60HTTP-PROXY = 49HTTP-PROXY =
61SERVERS = http://gnunet.org:8080/ 50SERVERS = http://gnunet.org:8080/
@@ -86,7 +75,7 @@ BINARY = gnunet-service-transport
86CONFIG = $DEFAULTCONFIG 75CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME 76HOME = $SERVICEHOME
88HOSTNAME = localhost 77HOSTNAME = localhost
89PORT = 22365 78PORT = 12155
90UNIXPATH = /tmp/gnunet-p2-service-transport.sock 79UNIXPATH = /tmp/gnunet-p2-service-transport.sock
91#PREFIX = valgrind --tool=callgrind 80#PREFIX = valgrind --tool=callgrind
92#PREFIX = xterm -T transport2 -e gdb --command=cmd --args 81#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
@@ -101,7 +90,7 @@ BINARY = gnunet-service-peerinfo
101CONFIG = $DEFAULTCONFIG 90CONFIG = $DEFAULTCONFIG
102HOME = $SERVICEHOME 91HOME = $SERVICEHOME
103HOSTNAME = localhost 92HOSTNAME = localhost
104PORT = 22369 93PORT = 12156
105UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 94UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
106 95
107[resolver] 96[resolver]
@@ -111,7 +100,7 @@ BINARY = gnunet-service-resolver
111CONFIG = $DEFAULTCONFIG 100CONFIG = $DEFAULTCONFIG
112HOME = $SERVICEHOME 101HOME = $SERVICEHOME
113HOSTNAME = localhost 102HOSTNAME = localhost
114PORT = 22364 103PORT = 12157
115UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 104UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
116 105
117[statistics] 106[statistics]
@@ -122,7 +111,7 @@ BINARY = gnunet-service-statistics
122CONFIG = $DEFAULTCONFIG 111CONFIG = $DEFAULTCONFIG
123HOME = $SERVICEHOME 112HOME = $SERVICEHOME
124HOSTNAME = localhost 113HOSTNAME = localhost
125PORT = 22367 114PORT = 12158
126UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 115UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
127 116
128[arm] 117[arm]
@@ -133,7 +122,7 @@ BINARY = gnunet-service-arm
133CONFIG = $DEFAULTCONFIG 122CONFIG = $DEFAULTCONFIG
134HOME = $SERVICEHOME 123HOME = $SERVICEHOME
135HOSTNAME = localhost 124HOSTNAME = localhost
136PORT = 22366 125PORT = 12159
137UNIXPATH = /tmp/gnunet-p2-service-arm.sock 126UNIXPATH = /tmp/gnunet-p2-service-arm.sock
138 127
139[TESTING] 128[TESTING]
@@ -144,7 +133,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
144 133
145[PATHS] 134[PATHS]
146DEFAULTCONFIG = test_transport_api_multi_peer2.conf 135DEFAULTCONFIG = test_transport_api_multi_peer2.conf
147SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/ 136SERVICEHOME = /tmp/test-transport/api-multi-p2/
148 137
149 138
150[dht] 139[dht]
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf
index 8f7640f21..3c8621b39 100644
--- a/src/transport/test_transport_api_rel_http_peer2.conf
+++ b/src/transport/test_transport_api_rel_http_peer2.conf
@@ -1,14 +1,5 @@
1[transport-http]
2PORT = 22389
3DEBUG = NO
4USE_IPv4 = YES
5USE_IPv6 = NO
6BINDTO4 = 127.0.0.1
7#BINDTO6 = ::1
8USE_LOCALADDR = YES
9
10[transport-https] 1[transport-https]
11PORT = 42389 2PORT = 12090
12DEBUG = NO 3DEBUG = NO
13USE_IPv6 = YES 4USE_IPv6 = YES
14USE_IPv4 = YES 5USE_IPv4 = YES
@@ -56,7 +47,7 @@ BINARY = gnunet-service-transport
56CONFIG = $DEFAULTCONFIG 47CONFIG = $DEFAULTCONFIG
57HOME = $SERVICEHOME 48HOME = $SERVICEHOME
58HOSTNAME = localhost 49HOSTNAME = localhost
59PORT = 22365 50PORT = 12091
60UNIXPATH = /tmp/gnunet-p2-service-transport.sock 51UNIXPATH = /tmp/gnunet-p2-service-transport.sock
61#PREFIX = xterm -T transport1 -e gdb --command=cmd --args 52#PREFIX = xterm -T transport1 -e gdb --command=cmd --args
62#PREFIX = valgrind --leak-check=full 53#PREFIX = valgrind --leak-check=full
@@ -73,7 +64,7 @@ BINARY = gnunet-service-peerinfo
73CONFIG = $DEFAULTCONFIG 64CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME 65HOME = $SERVICEHOME
75HOSTNAME = localhost 66HOSTNAME = localhost
76PORT = 22369 67PORT = 12092
77UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 68UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
78 69
79[resolver] 70[resolver]
@@ -83,7 +74,7 @@ BINARY = gnunet-service-resolver
83CONFIG = $DEFAULTCONFIG 74CONFIG = $DEFAULTCONFIG
84HOME = $SERVICEHOME 75HOME = $SERVICEHOME
85HOSTNAME = localhost 76HOSTNAME = localhost
86PORT = 22364 77PORT = 12093
87UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 78UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
88 79
89[statistics] 80[statistics]
@@ -93,7 +84,7 @@ BINARY = gnunet-service-statistics
93CONFIG = $DEFAULTCONFIG 84CONFIG = $DEFAULTCONFIG
94HOME = $SERVICEHOME 85HOME = $SERVICEHOME
95HOSTNAME = localhost 86HOSTNAME = localhost
96PORT = 22367 87PORT = 12094
97UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 88UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
98 89
99 90
@@ -105,18 +96,9 @@ BINARY = gnunet-service-arm
105CONFIG = $DEFAULTCONFIG 96CONFIG = $DEFAULTCONFIG
106HOME = $SERVICEHOME 97HOME = $SERVICEHOME
107HOSTNAME = localhost 98HOSTNAME = localhost
108PORT = 22366 99PORT = 12095
109UNIXPATH = /tmp/gnunet-p2-service-arm.sock 100UNIXPATH = /tmp/gnunet-p2-service-arm.sock
110 101
111
112[transport-http]
113PORT = 22389
114#DEBUG = NO
115
116[transport-tcp]
117PORT = 22399
118#DEBUG = YES
119
120[TESTING] 102[TESTING]
121WEAKRANDOM = YES 103WEAKRANDOM = YES
122 104
@@ -124,7 +106,7 @@ WEAKRANDOM = YES
124HOSTKEY = $SERVICEHOME/.hostkey 106HOSTKEY = $SERVICEHOME/.hostkey
125 107
126[PATHS] 108[PATHS]
127SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 109SERVICEHOME = /tmp/test-transport/api-http-p2/
128 110
129 111
130[dht] 112[dht]
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf
index 2afe41210..e7724aa88 100644
--- a/src/transport/test_transport_api_tcp_nat_peer1.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer1.conf
@@ -1,5 +1,5 @@
1[transport-tcp] 1[transport-tcp]
2PORT = 12368 2PORT = 12020
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[nat] 5[nat]
@@ -11,15 +11,6 @@ ENABLE_NAT_SERVER = YES
11INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
12EXTERNAL_ADDRESS = 127.0.0.1 12EXTERNAL_ADDRESS = 127.0.0.1
13 13
14[fs]
15AUTOSTART = NO
16
17[datastore]
18AUTOSTART = NO
19
20[core]
21AUTOSTART = NO
22
23[hostlist] 14[hostlist]
24HTTP-PROXY = 15HTTP-PROXY =
25SERVERS = http://gnunet.org:8080/ 16SERVERS = http://gnunet.org:8080/
@@ -64,7 +55,7 @@ BINARY = gnunet-service-peerinfo
64CONFIG = $DEFAULTCONFIG 55CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME 56HOME = $SERVICEHOME
66HOSTNAME = localhost 57HOSTNAME = localhost
67PORT = 12369 58PORT = 12021
68UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
69 60
70[resolver] 61[resolver]
@@ -74,7 +65,7 @@ BINARY = gnunet-service-resolver
74CONFIG = $DEFAULTCONFIG 65CONFIG = $DEFAULTCONFIG
75HOME = $SERVICEHOME 66HOME = $SERVICEHOME
76HOSTNAME = localhost 67HOSTNAME = localhost
77PORT = 1236 68PORT = 12022
78UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
79 70
80[statistics] 71[statistics]
@@ -85,7 +76,7 @@ BINARY = gnunet-service-statistics
85CONFIG = $DEFAULTCONFIG 76CONFIG = $DEFAULTCONFIG
86HOME = $SERVICEHOME 77HOME = $SERVICEHOME
87HOSTNAME = localhost 78HOSTNAME = localhost
88PORT = 12367 79PORT = 12023
89UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 80UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
90 81
91[arm] 82[arm]
@@ -96,22 +87,9 @@ BINARY = gnunet-service-arm
96CONFIG = $DEFAULTCONFIG 87CONFIG = $DEFAULTCONFIG
97HOME = $SERVICEHOME 88HOME = $SERVICEHOME
98HOSTNAME = localhost 89HOSTNAME = localhost
99PORT = 12366 90PORT = 1204
100UNIXPATH = /tmp/gnunet-p1-service-arm.sock 91UNIXPATH = /tmp/gnunet-p1-service-arm.sock
101 92
102[mesh]
103AUTOSTART = NO
104PORT = 10511
105HOSTNAME = localhost
106HOME = $SERVICEHOME
107CONFIG = $DEFAULTCONFIG
108BINARY = gnunet-service-mesh
109ACCEPT_FROM = 127.0.0.1;
110ACCEPT_FROM6 = ::1;
111UNIXPATH = /tmp/gnunet-service-mesh.sock
112UNIX_MATCH_UID = YES
113UNIX_MATCH_GID = YES
114
115[TESTING] 93[TESTING]
116WEAKRANDOM = YES 94WEAKRANDOM = YES
117 95
@@ -121,16 +99,21 @@ HOSTKEY = $SERVICEHOME/.hostkey
121 99
122[PATHS] 100[PATHS]
123DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf 101DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
124SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 102SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
125 103
104[fs]
105AUTOSTART = NO
126 106
127[dht] 107[datastore]
128AUTOSTART = NO 108AUTOSTART = NO
129 109
130[mesh] 110[core]
131AUTOSTART = NO 111AUTOSTART = NO
132 112
133 113
114[dht]
115AUTOSTART = NO
116
134[dns] 117[dns]
135AUTOSTART = NO 118AUTOSTART = NO
136 119
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf
index b8e0906e2..1bc6a530d 100644
--- a/src/transport/test_transport_api_tcp_nat_peer2.conf
+++ b/src/transport/test_transport_api_tcp_nat_peer2.conf
@@ -1,5 +1,5 @@
1[transport-tcp] 1[transport-tcp]
2PORT = 23000 2PORT = 12030
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[nat] 5[nat]
@@ -10,15 +10,6 @@ ENABLE_NAT_CLIENT = YES
10EXTERNAL_ADDRESS = 127.0.0.1 10EXTERNAL_ADDRESS = 127.0.0.1
11INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
12 12
13[core]
14AUTOSTART = NO
15
16[fs]
17AUTOSTART = NO
18
19[datastore]
20AUTOSTART = NO
21
22[hostlist] 13[hostlist]
23HTTP-PROXY = 14HTTP-PROXY =
24SERVERS = http://gnunet.org:8080/ 15SERVERS = http://gnunet.org:8080/
@@ -63,7 +54,7 @@ BINARY = gnunet-service-peerinfo
63CONFIG = $DEFAULTCONFIG 54CONFIG = $DEFAULTCONFIG
64HOME = $SERVICEHOME 55HOME = $SERVICEHOME
65HOSTNAME = localhost 56HOSTNAME = localhost
66PORT = 22369 57PORT = 12031
67UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 58UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
68 59
69[resolver] 60[resolver]
@@ -73,7 +64,7 @@ BINARY = gnunet-service-resolver
73CONFIG = $DEFAULTCONFIG 64CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME 65HOME = $SERVICEHOME
75HOSTNAME = localhost 66HOSTNAME = localhost
76PORT = 22364 67PORT = 12032
77UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 68UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
78 69
79[statistics] 70[statistics]
@@ -84,7 +75,7 @@ BINARY = gnunet-service-statistics
84CONFIG = $DEFAULTCONFIG 75CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME 76HOME = $SERVICEHOME
86HOSTNAME = localhost 77HOSTNAME = localhost
87PORT = 22367 78PORT = 12033
88UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 79UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
89 80
90[arm] 81[arm]
@@ -95,7 +86,7 @@ BINARY = gnunet-service-arm
95CONFIG = $DEFAULTCONFIG 86CONFIG = $DEFAULTCONFIG
96HOME = $SERVICEHOME 87HOME = $SERVICEHOME
97HOSTNAME = localhost 88HOSTNAME = localhost
98PORT = 22366 89PORT = 12034
99UNIXPATH = /tmp/gnunet-p2-service-arm.sock 90UNIXPATH = /tmp/gnunet-p2-service-arm.sock
100 91
101[TESTING] 92[TESTING]
@@ -107,8 +98,16 @@ HOSTKEY = $SERVICEHOME/.hostkey
107 98
108[PATHS] 99[PATHS]
109DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf 100DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
110SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 101SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
111 102
103[core]
104AUTOSTART = NO
105
106[fs]
107AUTOSTART = NO
108
109[datastore]
110AUTOSTART = NO
112 111
113[dht] 112[dht]
114AUTOSTART = NO 113AUTOSTART = NO
@@ -116,7 +115,6 @@ AUTOSTART = NO
116[mesh] 115[mesh]
117AUTOSTART = NO 116AUTOSTART = NO
118 117
119
120[dns] 118[dns]
121AUTOSTART = NO 119AUTOSTART = NO
122 120
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf
index c4a27ea98..f677f9001 100644
--- a/src/transport/test_transport_api_tcp_peer1.conf
+++ b/src/transport/test_transport_api_tcp_peer1.conf
@@ -1,6 +1,6 @@
1[transport-tcp] 1[transport-tcp]
2USE_LOCALADDR = YES 2USE_LOCALADDR = YES
3PORT = 12368 3PORT = 12000
4 4
5[nat] 5[nat]
6DISABLEV6 = YES 6DISABLEV6 = YES
@@ -11,15 +11,6 @@ ENABLE_UPNP = NO
11INTERNAL_ADDRESS = 127.0.0.1 11INTERNAL_ADDRESS = 127.0.0.1
12EXTERNAL_ADDRESS = 127.0.0.1 12EXTERNAL_ADDRESS = 127.0.0.1
13 13
14[fs]
15AUTOSTART = NO
16
17[datastore]
18AUTOSTART = NO
19
20[core]
21AUTOSTART = NO
22
23[hostlist] 14[hostlist]
24HTTP-PROXY = 15HTTP-PROXY =
25SERVERS = http://gnunet.org:8080/ 16SERVERS = http://gnunet.org:8080/
@@ -52,7 +43,7 @@ BINARY = gnunet-service-transport
52CONFIG = $DEFAULTCONFIG 43CONFIG = $DEFAULTCONFIG
53HOME = $SERVICEHOME 44HOME = $SERVICEHOME
54HOSTNAME = localhost 45HOSTNAME = localhost
55PORT = 12365 46PORT = 12001
56UNIXPATH = /tmp/gnunet-p1-service-transport.sock 47UNIXPATH = /tmp/gnunet-p1-service-transport.sock
57 48
58[peerinfo] 49[peerinfo]
@@ -64,7 +55,7 @@ BINARY = gnunet-service-peerinfo
64CONFIG = $DEFAULTCONFIG 55CONFIG = $DEFAULTCONFIG
65HOME = $SERVICEHOME 56HOME = $SERVICEHOME
66HOSTNAME = localhost 57HOSTNAME = localhost
67PORT = 12369 58PORT = 12002
68UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
69 60
70[resolver] 61[resolver]
@@ -74,7 +65,7 @@ BINARY = gnunet-service-resolver
74CONFIG = $DEFAULTCONFIG 65CONFIG = $DEFAULTCONFIG
75HOME = $SERVICEHOME 66HOME = $SERVICEHOME
76HOSTNAME = localhost 67HOSTNAME = localhost
77PORT = 1236 68PORT = 12003
78UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
79 70
80[statistics] 71[statistics]
@@ -85,7 +76,7 @@ BINARY = gnunet-service-statistics
85CONFIG = $DEFAULTCONFIG 76CONFIG = $DEFAULTCONFIG
86HOME = $SERVICEHOME 77HOME = $SERVICEHOME
87HOSTNAME = localhost 78HOSTNAME = localhost
88PORT = 12367 79PORT = 12004
89UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 80UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
90 81
91[arm] 82[arm]
@@ -96,7 +87,7 @@ BINARY = gnunet-service-arm
96CONFIG = $DEFAULTCONFIG 87CONFIG = $DEFAULTCONFIG
97HOME = $SERVICEHOME 88HOME = $SERVICEHOME
98HOSTNAME = localhost 89HOSTNAME = localhost
99PORT = 12366 90PORT = 12005
100UNIXPATH = /tmp/gnunet-p1-service-arm.sock 91UNIXPATH = /tmp/gnunet-p1-service-arm.sock
101 92
102[TESTING] 93[TESTING]
@@ -107,8 +98,16 @@ HOSTKEY = $SERVICEHOME/.hostkey
107 98
108[PATHS] 99[PATHS]
109#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf 100#DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
110SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 101SERVICEHOME = /tmp/test-transport/api-tcp-p1/
111 102
103[fs]
104AUTOSTART = NO
105
106[datastore]
107AUTOSTART = NO
108
109[core]
110AUTOSTART = NO
112 111
113[dht] 112[dht]
114AUTOSTART = NO 113AUTOSTART = NO
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf
index 000e4c6fd..a0074f155 100644
--- a/src/transport/test_transport_api_tcp_peer2.conf
+++ b/src/transport/test_transport_api_tcp_peer2.conf
@@ -11,15 +11,6 @@ ENABLE_UPNP = NO
11EXTERNAL_ADDRESS = 127.0.0.1 11EXTERNAL_ADDRESS = 127.0.0.1
12INTERNAL_ADDRESS = 127.0.0.1 12INTERNAL_ADDRESS = 127.0.0.1
13 13
14[core]
15AUTOSTART = NO
16
17[fs]
18AUTOSTART = NO
19
20[datastore]
21AUTOSTART = NO
22
23[hostlist] 14[hostlist]
24HTTP-PROXY = 15HTTP-PROXY =
25SERVERS = http://gnunet.org:8080/ 16SERVERS = http://gnunet.org:8080/
@@ -50,7 +41,7 @@ BINARY = gnunet-service-transport
50CONFIG = $DEFAULTCONFIG 41CONFIG = $DEFAULTCONFIG
51HOME = $SERVICEHOME 42HOME = $SERVICEHOME
52HOSTNAME = localhost 43HOSTNAME = localhost
53PORT = 22365 44PORT = 12010
54UNIXPATH = /tmp/gnunet-p2-service-transport.sock 45UNIXPATH = /tmp/gnunet-p2-service-transport.sock
55#PREFIX = valgrind --tool=callgrind 46#PREFIX = valgrind --tool=callgrind
56#PREFIX = xterm -T transport2 -e gdb --command=cmd --args 47#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
@@ -65,7 +56,7 @@ BINARY = gnunet-service-peerinfo
65CONFIG = $DEFAULTCONFIG 56CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME 57HOME = $SERVICEHOME
67HOSTNAME = localhost 58HOSTNAME = localhost
68PORT = 22369 59PORT = 12011
69UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 60UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
70 61
71[resolver] 62[resolver]
@@ -75,7 +66,7 @@ BINARY = gnunet-service-resolver
75CONFIG = $DEFAULTCONFIG 66CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME 67HOME = $SERVICEHOME
77HOSTNAME = localhost 68HOSTNAME = localhost
78PORT = 22364 69PORT = 12012
79UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 70UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
80 71
81[statistics] 72[statistics]
@@ -86,7 +77,7 @@ BINARY = gnunet-service-statistics
86CONFIG = $DEFAULTCONFIG 77CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME 78HOME = $SERVICEHOME
88HOSTNAME = localhost 79HOSTNAME = localhost
89PORT = 22367 80PORT = 12013
90UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 81UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
91 82
92[arm] 83[arm]
@@ -97,7 +88,7 @@ BINARY = gnunet-service-arm
97CONFIG = $DEFAULTCONFIG 88CONFIG = $DEFAULTCONFIG
98HOME = $SERVICEHOME 89HOME = $SERVICEHOME
99HOSTNAME = localhost 90HOSTNAME = localhost
100PORT = 22366 91PORT = 12014
101UNIXPATH = /tmp/gnunet-p2-service-arm.sock 92UNIXPATH = /tmp/gnunet-p2-service-arm.sock
102 93
103[TESTING] 94[TESTING]
@@ -108,8 +99,16 @@ HOSTKEY = $SERVICEHOME/.hostkey
108 99
109[PATHS] 100[PATHS]
110#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf 101#DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
111SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 102SERVICEHOME = /tmp/test-transport/api-tcp-p2/
112 103
104[core]
105AUTOSTART = NO
106
107[fs]
108AUTOSTART = NO
109
110[datastore]
111AUTOSTART = NO
113 112
114[dht] 113[dht]
115AUTOSTART = NO 114AUTOSTART = NO
@@ -117,7 +116,6 @@ AUTOSTART = NO
117[mesh] 116[mesh]
118AUTOSTART = NO 117AUTOSTART = NO
119 118
120
121[dns] 119[dns]
122AUTOSTART = NO 120AUTOSTART = NO
123 121
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf
index 0dead9a63..12e1bafb5 100644
--- a/src/transport/test_transport_api_udp_nat_peer1.conf
+++ b/src/transport/test_transport_api_udp_nat_peer1.conf
@@ -1,5 +1,5 @@
1[transport-udp] 1[transport-udp]
2PORT = 12368 2PORT = 12060
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[nat] 5[nat]
@@ -10,15 +10,6 @@ ONLY_NAT_ADDRESSES = YES
10INTERNAL_ADDRESS = 127.0.0.1 10INTERNAL_ADDRESS = 127.0.0.1
11EXTERNAL_ADDRESS = 127.0.0.1 11EXTERNAL_ADDRESS = 127.0.0.1
12 12
13[fs]
14AUTOSTART = NO
15
16[datastore-sqlite]
17FILENAME = $SERVICEHOME/datastore/sqlite.db
18
19[datastore]
20AUTOSTART = NO
21
22[hostlist] 13[hostlist]
23HTTP-PROXY = 14HTTP-PROXY =
24SERVERS = http://gnunet.org:8080/ 15SERVERS = http://gnunet.org:8080/
@@ -38,21 +29,17 @@ AUTOCONNECT = YES
38FRIENDS-ONLY = NO 29FRIENDS-ONLY = NO
39MINIMUM-FRIENDS = 0 30MINIMUM-FRIENDS = 0
40 31
41[core]
42AUTOSTART = NO
43
44[transport] 32[transport]
45PLUGINS = udp 33PLUGINS = udp
46DEBUG = NO 34DEBUG = NO
47ACCEPT_FROM6 = ::1; 35ACCEPT_FROM6 = ::1;
48ACCEPT_FROM = 127.0.0.1; 36ACCEPT_FROM = 127.0.0.1;
49NEIGHBOUR_LIMIT = 50 37NEIGHBOUR_LIMIT = 50
50#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
51BINARY = gnunet-service-transport 38BINARY = gnunet-service-transport
52CONFIG = $DEFAULTCONFIG 39CONFIG = $DEFAULTCONFIG
53HOME = $SERVICEHOME 40HOME = $SERVICEHOME
54HOSTNAME = localhost 41HOSTNAME = localhost
55PORT = 12365 42PORT = 12061
56UNIXPATH = /tmp/gnunet-p1-service-transport.sock 43UNIXPATH = /tmp/gnunet-p1-service-transport.sock
57#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log 44#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log
58#PREFIX = xterm -e xterm -T transport -e gdb --args 45#PREFIX = xterm -e xterm -T transport -e gdb --args
@@ -66,7 +53,7 @@ BINARY = gnunet-service-peerinfo
66CONFIG = $DEFAULTCONFIG 53CONFIG = $DEFAULTCONFIG
67HOME = $SERVICEHOME 54HOME = $SERVICEHOME
68HOSTNAME = localhost 55HOSTNAME = localhost
69PORT = 12369 56PORT = 12062
70UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 57UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
71 58
72[resolver] 59[resolver]
@@ -76,7 +63,7 @@ BINARY = gnunet-service-resolver
76CONFIG = $DEFAULTCONFIG 63CONFIG = $DEFAULTCONFIG
77HOME = $SERVICEHOME 64HOME = $SERVICEHOME
78HOSTNAME = localhost 65HOSTNAME = localhost
79PORT = 12364 66PORT = 12063
80UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 67UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
81 68
82[statistics] 69[statistics]
@@ -86,7 +73,7 @@ BINARY = gnunet-service-statistics
86CONFIG = $DEFAULTCONFIG 73CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME 74HOME = $SERVICEHOME
88HOSTNAME = localhost 75HOSTNAME = localhost
89PORT = 12367 76PORT = 12064
90UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 77UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
91 78
92[arm] 79[arm]
@@ -97,13 +84,9 @@ BINARY = gnunet-service-arm
97CONFIG = $DEFAULTCONFIG 84CONFIG = $DEFAULTCONFIG
98HOME = $SERVICEHOME 85HOME = $SERVICEHOME
99HOSTNAME = localhost 86HOSTNAME = localhost
100PORT = 12366 87PORT = 12065
101UNIXPATH = /tmp/gnunet-p1-service-arm.sock 88UNIXPATH = /tmp/gnunet-p1-service-arm.sock
102 89
103[transport-tcp]
104TIMEOUT = 300000
105PORT = 12368
106
107[TESTING] 90[TESTING]
108WEAKRANDOM = YES 91WEAKRANDOM = YES
109 92
@@ -112,13 +95,24 @@ HOSTKEY = $SERVICEHOME/.hostkey
112 95
113[PATHS] 96[PATHS]
114DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf 97DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
115SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 98SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
116 99
117[mesh] 100[mesh]
118AUTOSTART = NO 101AUTOSTART = NO
119 102
103[fs]
104AUTOSTART = NO
105
106[datastore-sqlite]
107FILENAME = $SERVICEHOME/datastore/sqlite.db
108
109[datastore]
110AUTOSTART = NO
120 111
121[dns] 112[dns]
122AUTOSTART = NO 113AUTOSTART = NO
123 114
115[core]
116AUTOSTART = NO
117
124 118
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf
index c291e9e5a..3d2063854 100644
--- a/src/transport/test_transport_api_udp_nat_peer2.conf
+++ b/src/transport/test_transport_api_udp_nat_peer2.conf
@@ -1,5 +1,5 @@
1[transport-udp] 1[transport-udp]
2PORT = 22368 2PORT = 12070
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[nat] 5[nat]
@@ -9,12 +9,6 @@ ALLOW_NAT = YES
9EXTERNAL_ADDRESS = 127.0.0.1 9EXTERNAL_ADDRESS = 127.0.0.1
10INTERNAL_ADDRESS = 127.0.0.1 10INTERNAL_ADDRESS = 127.0.0.1
11 11
12[fs]
13AUTOSTART = NO
14
15[datastore]
16AUTOSTART = NO
17
18[hostlist] 12[hostlist]
19HTTP-PROXY = 13HTTP-PROXY =
20SERVERS = http://gnunet.org:8080/ 14SERVERS = http://gnunet.org:8080/
@@ -45,11 +39,10 @@ ACCEPT_FROM6 = ::1;
45ACCEPT_FROM = 127.0.0.1; 39ACCEPT_FROM = 127.0.0.1;
46NEIGHBOUR_LIMIT = 50 40NEIGHBOUR_LIMIT = 50
47BINARY = gnunet-service-transport 41BINARY = gnunet-service-transport
48#BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/transport/.libs/gnunet-service-transport
49CONFIG = $DEFAULTCONFIG 42CONFIG = $DEFAULTCONFIG
50HOME = $SERVICEHOME 43HOME = $SERVICEHOME
51HOSTNAME = localhost 44HOSTNAME = localhost
52PORT = 22365 45PORT = 12071
53UNIXPATH = /tmp/gnunet-p2-service-transport.sock 46UNIXPATH = /tmp/gnunet-p2-service-transport.sock
54#PREFIX = xterm -e xterm -T transport -e gdb --args 47#PREFIX = xterm -e xterm -T transport -e gdb --args
55#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log 48#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
@@ -63,7 +56,7 @@ BINARY = gnunet-service-peerinfo
63CONFIG = $DEFAULTCONFIG 56CONFIG = $DEFAULTCONFIG
64HOME = $SERVICEHOME 57HOME = $SERVICEHOME
65HOSTNAME = localhost 58HOSTNAME = localhost
66PORT = 22369 59PORT = 12072
67UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 60UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
68 61
69[resolver] 62[resolver]
@@ -73,7 +66,7 @@ BINARY = gnunet-service-resolver
73CONFIG = $DEFAULTCONFIG 66CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME 67HOME = $SERVICEHOME
75HOSTNAME = localhost 68HOSTNAME = localhost
76PORT = 22364 69PORT = 12073
77UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 70UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
78 71
79[statistics] 72[statistics]
@@ -83,7 +76,7 @@ BINARY = gnunet-service-statistics
83CONFIG = $DEFAULTCONFIG 76CONFIG = $DEFAULTCONFIG
84HOME = $SERVICEHOME 77HOME = $SERVICEHOME
85HOSTNAME = localhost 78HOSTNAME = localhost
86PORT = 22367 79PORT = 12074
87UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 80UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
88 81
89[arm] 82[arm]
@@ -94,25 +87,10 @@ BINARY = gnunet-service-arm
94CONFIG = $DEFAULTCONFIG 87CONFIG = $DEFAULTCONFIG
95HOME = $SERVICEHOME 88HOME = $SERVICEHOME
96HOSTNAME = localhost 89HOSTNAME = localhost
97PORT = 22366 90PORT = 12075
98UNIXPATH = /tmp/gnunet-p2-service-arm.sock 91UNIXPATH = /tmp/gnunet-p2-service-arm.sock
99 92
100[transport-tcp] 93[TESTING]
101TIMEOUT = 300000
102PORT = 22368
103
104[TESTING][mesh]
105AUTOSTART = YES
106PORT = 10512
107HOSTNAME = localhost
108HOME = $SERVICEHOME
109CONFIG = $DEFAULTCONFIG
110BINARY = gnunet-service-mesh
111ACCEPT_FROM = 127.0.0.1;
112ACCEPT_FROM6 = ::1;
113UNIXPATH = /tmp/gnunet-service-mesh2.sock
114UNIX_MATCH_UID = YES
115UNIX_MATCH_GID = YES
116WEAKRANDOM = YES 94WEAKRANDOM = YES
117 95
118[gnunetd] 96[gnunetd]
@@ -120,8 +98,13 @@ HOSTKEY = $SERVICEHOME/.hostkey
120 98
121[PATHS] 99[PATHS]
122DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf 100DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
123SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 101SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
124 102
103[fs]
104AUTOSTART = NO
105
106[datastore]
107AUTOSTART = NO
125 108
126[dht] 109[dht]
127AUTOSTART = NO 110AUTOSTART = NO
@@ -129,7 +112,6 @@ AUTOSTART = NO
129[mesh] 112[mesh]
130AUTOSTART = NO 113AUTOSTART = NO
131 114
132
133[dns] 115[dns]
134AUTOSTART = NO 116AUTOSTART = NO
135 117
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf
index dab597fbd..40986e0df 100644
--- a/src/transport/test_transport_api_udp_peer1.conf
+++ b/src/transport/test_transport_api_udp_peer1.conf
@@ -1,5 +1,5 @@
1[transport-udp] 1[transport-udp]
2PORT = 12368 2PORT = 12040
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[fs] 5[fs]
@@ -47,7 +47,7 @@ BINARY = gnunet-service-transport
47CONFIG = $DEFAULTCONFIG 47CONFIG = $DEFAULTCONFIG
48HOME = $SERVICEHOME 48HOME = $SERVICEHOME
49HOSTNAME = localhost 49HOSTNAME = localhost
50PORT = 12365 50PORT = 12041
51UNIXPATH = /tmp/gnunet-p1-service-transport.sock 51UNIXPATH = /tmp/gnunet-p1-service-transport.sock
52#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer1.log 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 53#PREFIX = xterm -e xterm -T transport -e gdb --args
@@ -61,7 +61,7 @@ BINARY = gnunet-service-peerinfo
61CONFIG = $DEFAULTCONFIG 61CONFIG = $DEFAULTCONFIG
62HOME = $SERVICEHOME 62HOME = $SERVICEHOME
63HOSTNAME = localhost 63HOSTNAME = localhost
64PORT = 12369 64PORT = 12042
65UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 65UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
66 66
67[resolver] 67[resolver]
@@ -71,7 +71,7 @@ BINARY = gnunet-service-resolver
71CONFIG = $DEFAULTCONFIG 71CONFIG = $DEFAULTCONFIG
72HOME = $SERVICEHOME 72HOME = $SERVICEHOME
73HOSTNAME = localhost 73HOSTNAME = localhost
74PORT = 12364 74PORT = 12043
75UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 75UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
76 76
77[statistics] 77[statistics]
@@ -81,7 +81,7 @@ BINARY = gnunet-service-statistics
81CONFIG = $DEFAULTCONFIG 81CONFIG = $DEFAULTCONFIG
82HOME = $SERVICEHOME 82HOME = $SERVICEHOME
83HOSTNAME = localhost 83HOSTNAME = localhost
84PORT = 12367 84PORT = 12044
85UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 85UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
86 86
87[arm] 87[arm]
@@ -92,13 +92,9 @@ BINARY = gnunet-service-arm
92CONFIG = $DEFAULTCONFIG 92CONFIG = $DEFAULTCONFIG
93HOME = $SERVICEHOME 93HOME = $SERVICEHOME
94HOSTNAME = localhost 94HOSTNAME = localhost
95PORT = 12366 95PORT = 12045
96UNIXPATH = /tmp/gnunet-p1-service-arm.sock 96UNIXPATH = /tmp/gnunet-p1-service-arm.sock
97 97
98[transport-tcp]
99TIMEOUT = 300000
100PORT = 12368
101
102[TESTING] 98[TESTING]
103WEAKRANDOM = YES 99WEAKRANDOM = YES
104 100
@@ -107,7 +103,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
107 103
108[PATHS] 104[PATHS]
109DEFAULTCONFIG = test_transport_api_udp_peer1.conf 105DEFAULTCONFIG = test_transport_api_udp_peer1.conf
110SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 106SERVICEHOME = /tmp/test-transport/api-udp-p1/
111 107
112 108
113[dht] 109[dht]
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf
index 2bdeaa6fb..62e21f866 100644
--- a/src/transport/test_transport_api_udp_peer2.conf
+++ b/src/transport/test_transport_api_udp_peer2.conf
@@ -1,20 +1,11 @@
1[transport-udp] 1[transport-udp]
2PORT = 22368 2PORT = 12050
3USE_LOCALADDR = YES 3USE_LOCALADDR = YES
4 4
5[fs]
6AUTOSTART = NO
7
8[nat] 5[nat]
9# Are we behind NAT? 6# Are we behind NAT?
10BEHIND_NAT = NO 7BEHIND_NAT = NO
11 8
12[datastore]
13AUTOSTART = NO
14
15[core]
16AUTOSTART = NO
17
18[hostlist] 9[hostlist]
19HTTP-PROXY = 10HTTP-PROXY =
20SERVERS = http://gnunet.org:8080/ 11SERVERS = http://gnunet.org:8080/
@@ -45,7 +36,7 @@ BINARY = gnunet-service-transport
45CONFIG = $DEFAULTCONFIG 36CONFIG = $DEFAULTCONFIG
46HOME = $SERVICEHOME 37HOME = $SERVICEHOME
47HOSTNAME = localhost 38HOSTNAME = localhost
48PORT = 22365 39PORT = 12051
49UNIXPATH = /tmp/gnunet-p2-service-transport.sock 40UNIXPATH = /tmp/gnunet-p2-service-transport.sock
50#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log 41#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
51 42
@@ -58,7 +49,7 @@ BINARY = gnunet-service-peerinfo
58CONFIG = $DEFAULTCONFIG 49CONFIG = $DEFAULTCONFIG
59HOME = $SERVICEHOME 50HOME = $SERVICEHOME
60HOSTNAME = localhost 51HOSTNAME = localhost
61PORT = 22369 52PORT = 12052
62UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 53UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
63 54
64[resolver] 55[resolver]
@@ -68,7 +59,7 @@ BINARY = gnunet-service-resolver
68CONFIG = $DEFAULTCONFIG 59CONFIG = $DEFAULTCONFIG
69HOME = $SERVICEHOME 60HOME = $SERVICEHOME
70HOSTNAME = localhost 61HOSTNAME = localhost
71PORT = 22364 62PORT = 12053
72UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 63UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
73 64
74[statistics] 65[statistics]
@@ -78,7 +69,7 @@ BINARY = gnunet-service-statistics
78CONFIG = $DEFAULTCONFIG 69CONFIG = $DEFAULTCONFIG
79HOME = $SERVICEHOME 70HOME = $SERVICEHOME
80HOSTNAME = localhost 71HOSTNAME = localhost
81PORT = 22367 72PORT = 12054
82UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 73UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
83 74
84[arm] 75[arm]
@@ -89,13 +80,9 @@ BINARY = gnunet-service-arm
89CONFIG = $DEFAULTCONFIG 80CONFIG = $DEFAULTCONFIG
90HOME = $SERVICEHOME 81HOME = $SERVICEHOME
91HOSTNAME = localhost 82HOSTNAME = localhost
92PORT = 22366 83PORT = 12055
93UNIXPATH = /tmp/gnunet-p2-service-arm.sock 84UNIXPATH = /tmp/gnunet-p2-service-arm.sock
94 85
95[transport-tcp]
96TIMEOUT = 300000
97PORT = 22368
98
99[TESTING] 86[TESTING]
100WEAKRANDOM = YES 87WEAKRANDOM = YES
101 88
@@ -104,19 +91,17 @@ HOSTKEY = $SERVICEHOME/.hostkey
104 91
105[PATHS] 92[PATHS]
106DEFAULTCONFIG = test_transport_api_udp_peer2.conf 93DEFAULTCONFIG = test_transport_api_udp_peer2.conf
107SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 94SERVICEHOME = /tmp/test-transport/api-udp-p2/
108[mesh] 95
109AUTOSTART = YES 96
110PORT = 10512 97[fs]
111HOSTNAME = localhost 98AUTOSTART = NO
112HOME = $SERVICEHOME 99
113CONFIG = $DEFAULTCONFIG 100[datastore]
114BINARY = gnunet-service-mesh 101AUTOSTART = NO
115ACCEPT_FROM = 127.0.0.1; 102
116ACCEPT_FROM6 = ::1; 103[core]
117UNIXPATH = /tmp/gnunet-service-mesh2.sock 104AUTOSTART = NO
118UNIX_MATCH_UID = YES
119UNIX_MATCH_GID = YES
120 105
121[dht] 106[dht]
122AUTOSTART = NO 107AUTOSTART = NO
@@ -124,7 +109,6 @@ AUTOSTART = NO
124[mesh] 109[mesh]
125AUTOSTART = NO 110AUTOSTART = NO
126 111
127
128[dns] 112[dns]
129AUTOSTART = NO 113AUTOSTART = NO
130 114
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf
index 04d198d62..b896bafa5 100644
--- a/src/transport/test_transport_api_unix_peer1.conf
+++ b/src/transport/test_transport_api_unix_peer1.conf
@@ -1,5 +1,5 @@
1[transport-unix] 1[transport-unix]
2PORT = 12368 2PORT = 12120
3 3
4[fs] 4[fs]
5AUTOSTART = NO 5AUTOSTART = NO
@@ -42,7 +42,7 @@ BINARY = gnunet-service-transport
42CONFIG = $DEFAULTCONFIG 42CONFIG = $DEFAULTCONFIG
43HOME = $SERVICEHOME 43HOME = $SERVICEHOME
44HOSTNAME = localhost 44HOSTNAME = localhost
45PORT = 12365 45PORT = 12121
46UNIXPATH = /tmp/gnunet-p1-service-transport.sock 46UNIXPATH = /tmp/gnunet-p1-service-transport.sock
47 47
48 48
@@ -55,7 +55,7 @@ BINARY = gnunet-service-peerinfo
55CONFIG = $DEFAULTCONFIG 55CONFIG = $DEFAULTCONFIG
56HOME = $SERVICEHOME 56HOME = $SERVICEHOME
57HOSTNAME = localhost 57HOSTNAME = localhost
58PORT = 12369 58PORT = 12122
59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock 59UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
60 60
61[resolver] 61[resolver]
@@ -65,7 +65,7 @@ BINARY = gnunet-service-resolver
65CONFIG = $DEFAULTCONFIG 65CONFIG = $DEFAULTCONFIG
66HOME = $SERVICEHOME 66HOME = $SERVICEHOME
67HOSTNAME = localhost 67HOSTNAME = localhost
68PORT = 12364 68PORT = 12123
69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock 69UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
70 70
71[statistics] 71[statistics]
@@ -75,7 +75,7 @@ BINARY = gnunet-service-statistics
75CONFIG = $DEFAULTCONFIG 75CONFIG = $DEFAULTCONFIG
76HOME = $SERVICEHOME 76HOME = $SERVICEHOME
77HOSTNAME = localhost 77HOSTNAME = localhost
78PORT = 12367 78PORT = 12124
79UNIXPATH = /tmp/gnunet-p1-service-statistics.sock 79UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
80 80
81[arm] 81[arm]
@@ -86,13 +86,9 @@ BINARY = gnunet-service-arm
86CONFIG = $DEFAULTCONFIG 86CONFIG = $DEFAULTCONFIG
87HOME = $SERVICEHOME 87HOME = $SERVICEHOME
88HOSTNAME = localhost 88HOSTNAME = localhost
89PORT = 12366 89PORT = 12125
90UNIXPATH = /tmp/gnunet-p1-service-arm.sock 90UNIXPATH = /tmp/gnunet-p1-service-arm.sock
91 91
92[transport-tcp]
93TIMEOUT = 300000
94PORT = 12368
95
96[TESTING] 92[TESTING]
97WEAKRANDOM = YES 93WEAKRANDOM = YES
98 94
@@ -101,7 +97,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
101 97
102[PATHS] 98[PATHS]
103DEFAULTCONFIG = test_transport_api_unix_peer1.conf 99DEFAULTCONFIG = test_transport_api_unix_peer1.conf
104SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ 100SERVICEHOME = /tmp/test-transport/api-unix-p1/
105 101
106[dht] 102[dht]
107AUTOSTART = NO 103AUTOSTART = NO
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf
index 50623fd93..fd5f5fa47 100644
--- a/src/transport/test_transport_api_unix_peer2.conf
+++ b/src/transport/test_transport_api_unix_peer2.conf
@@ -1,5 +1,5 @@
1[transport-unix] 1[transport-unix]
2PORT = 22368 2PORT = 12130
3 3
4[fs] 4[fs]
5AUTOSTART = NO 5AUTOSTART = NO
@@ -40,7 +40,7 @@ BINARY = gnunet-service-transport
40CONFIG = $DEFAULTCONFIG 40CONFIG = $DEFAULTCONFIG
41HOME = $SERVICEHOME 41HOME = $SERVICEHOME
42HOSTNAME = localhost 42HOSTNAME = localhost
43PORT = 22365 43PORT = 12131
44UNIXPATH = /tmp/gnunet-p2-service-transport.sock 44UNIXPATH = /tmp/gnunet-p2-service-transport.sock
45#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log 45#PREFIX = valgrind --track-origins=yes --leak-check=full --log-file=valgrind_udp_peer2.log
46 46
@@ -53,7 +53,7 @@ BINARY = gnunet-service-peerinfo
53CONFIG = $DEFAULTCONFIG 53CONFIG = $DEFAULTCONFIG
54HOME = $SERVICEHOME 54HOME = $SERVICEHOME
55HOSTNAME = localhost 55HOSTNAME = localhost
56PORT = 22369 56PORT = 12132
57UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock 57UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
58 58
59[resolver] 59[resolver]
@@ -63,7 +63,7 @@ BINARY = gnunet-service-resolver
63CONFIG = $DEFAULTCONFIG 63CONFIG = $DEFAULTCONFIG
64HOME = $SERVICEHOME 64HOME = $SERVICEHOME
65HOSTNAME = localhost 65HOSTNAME = localhost
66PORT = 22364 66PORT = 12133
67UNIXPATH = /tmp/gnunet-p2-service-resolver.sock 67UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
68 68
69[statistics] 69[statistics]
@@ -73,7 +73,7 @@ BINARY = gnunet-service-statistics
73CONFIG = $DEFAULTCONFIG 73CONFIG = $DEFAULTCONFIG
74HOME = $SERVICEHOME 74HOME = $SERVICEHOME
75HOSTNAME = localhost 75HOSTNAME = localhost
76PORT = 22367 76PORT = 12134
77UNIXPATH = /tmp/gnunet-p2-service-statistics.sock 77UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
78 78
79[arm] 79[arm]
@@ -84,13 +84,9 @@ BINARY = gnunet-service-arm
84CONFIG = $DEFAULTCONFIG 84CONFIG = $DEFAULTCONFIG
85HOME = $SERVICEHOME 85HOME = $SERVICEHOME
86HOSTNAME = localhost 86HOSTNAME = localhost
87PORT = 22366 87PORT = 12135
88UNIXPATH = /tmp/gnunet-p2-service-arm.sock 88UNIXPATH = /tmp/gnunet-p2-service-arm.sock
89 89
90[transport-tcp]
91TIMEOUT = 300000
92PORT = 22368
93
94[TESTING] 90[TESTING]
95WEAKRANDOM = YES 91WEAKRANDOM = YES
96 92
@@ -99,7 +95,7 @@ HOSTKEY = $SERVICEHOME/.hostkey
99 95
100[PATHS] 96[PATHS]
101DEFAULTCONFIG = test_transport_api_unix_peer2.conf 97DEFAULTCONFIG = test_transport_api_unix_peer2.conf
102SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ 98SERVICEHOME = /tmp/test-transport/api-unix-p2/
103 99
104 100
105[dht] 101[dht]