diff options
Diffstat (limited to 'src/transport')
40 files changed, 103 insertions, 187 deletions
diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index 88f590e56..260b220ea 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf | |||
@@ -26,4 +26,6 @@ WEAKRANDOM = YES | |||
26 | [dht] | 26 | [dht] |
27 | AUTOSTART = NO | 27 | AUTOSTART = NO |
28 | 28 | ||
29 | [mesh] | ||
30 | AUTOSTART = NO | ||
29 | 31 | ||
diff --git a/src/transport/test_plugin_transport_data_http.conf b/src/transport/test_plugin_transport_data_http.conf index 6e5e2d44c..c3261f60c 100644 --- a/src/transport/test_plugin_transport_data_http.conf +++ b/src/transport/test_plugin_transport_data_http.conf | |||
@@ -54,4 +54,5 @@ PORT = 12366 | |||
54 | [dht] | 54 | [dht] |
55 | AUTOSTART = NO | 55 | AUTOSTART = NO |
56 | 56 | ||
57 | 57 | [mesh] | |
58 | AUTOSTART = NO | ||
diff --git a/src/transport/test_plugin_transport_data_udp.conf b/src/transport/test_plugin_transport_data_udp.conf index 001f71d5b..66111bda2 100644 --- a/src/transport/test_plugin_transport_data_udp.conf +++ b/src/transport/test_plugin_transport_data_udp.conf | |||
@@ -26,4 +26,5 @@ WEAKRANDOM = YES | |||
26 | [dht] | 26 | [dht] |
27 | AUTOSTART = NO | 27 | AUTOSTART = NO |
28 | 28 | ||
29 | 29 | [mesh] | |
30 | AUTOSTART = NO | ||
diff --git a/src/transport/test_quota_compliance_data.conf b/src/transport/test_quota_compliance_data.conf index 88f590e56..cc9316534 100644 --- a/src/transport/test_quota_compliance_data.conf +++ b/src/transport/test_quota_compliance_data.conf | |||
@@ -26,4 +26,5 @@ WEAKRANDOM = YES | |||
26 | [dht] | 26 | [dht] |
27 | AUTOSTART = NO | 27 | AUTOSTART = NO |
28 | 28 | ||
29 | 29 | [mesh] | |
30 | AUTOSTART = NO | ||
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 8c356bf32..c645d3916 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf | |||
@@ -105,4 +105,5 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
105 | [dht] | 105 | [dht] |
106 | AUTOSTART = NO | 106 | AUTOSTART = NO |
107 | 107 | ||
108 | 108 | [mesh] | |
109 | AUTOSTART = NO | ||
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 710dbc881..0dd81dd92 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf | |||
@@ -106,14 +106,5 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
106 | AUTOSTART = NO | 106 | AUTOSTART = NO |
107 | 107 | ||
108 | [mesh] | 108 | [mesh] |
109 | AUTOSTART = YES | 109 | AUTOSTART = NO |
110 | PORT = 10512 | 110 | |
111 | HOSTNAME = localhost | ||
112 | HOME = $SERVICEHOME | ||
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-mesh | ||
115 | ACCEPT_FROM = 127.0.0.1; | ||
116 | ACCEPT_FROM6 = ::1; | ||
117 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
118 | UNIX_MATCH_UID = YES | ||
119 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 4350c2285..1eb9c0df1 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf | |||
@@ -111,3 +111,6 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
111 | 111 | ||
112 | [dht] | 112 | [dht] |
113 | AUTOSTART = NO | 113 | AUTOSTART = NO |
114 | |||
115 | [mesh] | ||
116 | AUTOSTART = NO | ||
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index bd2ffc319..692004b0f 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf | |||
@@ -114,14 +114,4 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
114 | AUTOSTART = NO | 114 | AUTOSTART = NO |
115 | 115 | ||
116 | [mesh] | 116 | [mesh] |
117 | AUTOSTART = YES | 117 | AUTOSTART = NO |
118 | PORT = 10512 | ||
119 | HOSTNAME = localhost | ||
120 | HOME = $SERVICEHOME | ||
121 | CONFIG = $DEFAULTCONFIG | ||
122 | BINARY = gnunet-service-mesh | ||
123 | ACCEPT_FROM = 127.0.0.1; | ||
124 | ACCEPT_FROM6 = ::1; | ||
125 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
126 | UNIX_MATCH_UID = YES | ||
127 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index fb3d91939..767423483 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf | |||
@@ -111,4 +111,5 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
111 | [dht] | 111 | [dht] |
112 | AUTOSTART = NO | 112 | AUTOSTART = NO |
113 | 113 | ||
114 | 114 | [mesh] | |
115 | AUTOSTART = NO \ No newline at end of file | ||
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 649a07e53..19b531f51 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf | |||
@@ -112,14 +112,5 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
112 | AUTOSTART = NO | 112 | AUTOSTART = NO |
113 | 113 | ||
114 | [mesh] | 114 | [mesh] |
115 | AUTOSTART = YES | 115 | AUTOSTART = NO |
116 | PORT = 10512 | 116 | |
117 | HOSTNAME = localhost | ||
118 | HOME = $SERVICEHOME | ||
119 | CONFIG = $DEFAULTCONFIG | ||
120 | BINARY = gnunet-service-mesh | ||
121 | ACCEPT_FROM = 127.0.0.1; | ||
122 | ACCEPT_FROM6 = ::1; | ||
123 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
124 | UNIX_MATCH_UID = YES | ||
125 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index ba7c8c0e2..8d8bfce0e 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf | |||
@@ -101,4 +101,6 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
101 | [dht] | 101 | [dht] |
102 | AUTOSTART = NO | 102 | AUTOSTART = NO |
103 | 103 | ||
104 | [mesh] | ||
105 | AUTOSTART = NO | ||
104 | 106 | ||
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index c473cbd10..1a2fb3844 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf | |||
@@ -100,14 +100,5 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
100 | AUTOSTART = NO | 100 | AUTOSTART = NO |
101 | 101 | ||
102 | [mesh] | 102 | [mesh] |
103 | AUTOSTART = YES | 103 | AUTOSTART = NO |
104 | PORT = 10512 | 104 | |
105 | HOSTNAME = localhost | ||
106 | HOME = $SERVICEHOME | ||
107 | CONFIG = $DEFAULTCONFIG | ||
108 | BINARY = gnunet-service-mesh | ||
109 | ACCEPT_FROM = 127.0.0.1; | ||
110 | ACCEPT_FROM6 = ::1; | ||
111 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
112 | UNIX_MATCH_UID = YES | ||
113 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index ff8ef0537..cd42ea838 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf | |||
@@ -101,4 +101,6 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
101 | [dht] | 101 | [dht] |
102 | AUTOSTART = NO | 102 | AUTOSTART = NO |
103 | 103 | ||
104 | [mesh] | ||
105 | AUTOSTART = NO | ||
104 | 106 | ||
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index c0fd3d54d..7f113df25 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf | |||
@@ -100,14 +100,5 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
100 | AUTOSTART = NO | 100 | AUTOSTART = NO |
101 | 101 | ||
102 | [mesh] | 102 | [mesh] |
103 | AUTOSTART = YES | 103 | AUTOSTART = NO |
104 | PORT = 10512 | 104 | |
105 | HOSTNAME = localhost | ||
106 | HOME = $SERVICEHOME | ||
107 | CONFIG = $DEFAULTCONFIG | ||
108 | BINARY = gnunet-service-mesh | ||
109 | ACCEPT_FROM = 127.0.0.1; | ||
110 | ACCEPT_FROM6 = ::1; | ||
111 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
112 | UNIX_MATCH_UID = YES | ||
113 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_data.conf b/src/transport/test_transport_api_data.conf index cb90a47a7..f306e4b0c 100644 --- a/src/transport/test_transport_api_data.conf +++ b/src/transport/test_transport_api_data.conf | |||
@@ -99,4 +99,6 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
99 | [dht] | 99 | [dht] |
100 | AUTOSTART = NO | 100 | AUTOSTART = NO |
101 | 101 | ||
102 | [mesh] | ||
103 | AUTOSTART = NO | ||
102 | 104 | ||
diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index e0e5aeea6..4f66c1138 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf | |||
@@ -120,4 +120,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
120 | [dht] | 120 | [dht] |
121 | AUTOSTART = NO | 121 | AUTOSTART = NO |
122 | 122 | ||
123 | [mesh] | ||
124 | AUTOSTART = NO | ||
123 | 125 | ||
diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index e971a7d33..39096dfa6 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -126,14 +126,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
126 | AUTOSTART = NO | 126 | AUTOSTART = NO |
127 | 127 | ||
128 | [mesh] | 128 | [mesh] |
129 | AUTOSTART = YES | 129 | AUTOSTART = NO |
130 | PORT = 10512 | 130 | |
131 | HOSTNAME = localhost | ||
132 | HOME = $SERVICEHOME | ||
133 | CONFIG = $DEFAULTCONFIG | ||
134 | BINARY = gnunet-service-mesh | ||
135 | ACCEPT_FROM = 127.0.0.1; | ||
136 | ACCEPT_FROM6 = ::1; | ||
137 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
138 | UNIX_MATCH_UID = YES | ||
139 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index 712cd970a..f2bb24374 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf | |||
@@ -104,7 +104,18 @@ BINARY = gnunet-service-arm | |||
104 | CONFIG = $DEFAULTCONFIG | 104 | CONFIG = $DEFAULTCONFIG |
105 | HOME = $SERVICEHOME | 105 | HOME = $SERVICEHOME |
106 | HOSTNAME = localhost | 106 | HOSTNAME = localhost |
107 | PORT = 12366 | 107 | PORT = 12366[mesh] |
108 | AUTOSTART = YES | ||
109 | PORT = 10512 | ||
110 | HOSTNAME = localhost | ||
111 | HOME = $SERVICEHOME | ||
112 | CONFIG = $DEFAULTCONFIG | ||
113 | BINARY = gnunet-service-mesh | ||
114 | ACCEPT_FROM = 127.0.0.1; | ||
115 | ACCEPT_FROM6 = ::1; | ||
116 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
117 | UNIX_MATCH_UID = YES | ||
118 | UNIX_MATCH_GID = YES | ||
108 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock | 119 | UNIXPATH = /tmp/gnunet-p1-service-arm.sock |
109 | 120 | ||
110 | [transport-tcp] | 121 | [transport-tcp] |
@@ -125,4 +136,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
125 | [dht] | 136 | [dht] |
126 | AUTOSTART = NO | 137 | AUTOSTART = NO |
127 | 138 | ||
139 | [mesh] | ||
140 | AUTOSTART = NO | ||
128 | 141 | ||
diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index c03e4f59b..442746c4b 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -131,14 +131,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
131 | AUTOSTART = NO | 131 | AUTOSTART = NO |
132 | 132 | ||
133 | [mesh] | 133 | [mesh] |
134 | AUTOSTART = YES | 134 | AUTOSTART = NO |
135 | PORT = 10512 | 135 | |
136 | HOSTNAME = localhost | ||
137 | HOME = $SERVICEHOME | ||
138 | CONFIG = $DEFAULTCONFIG | ||
139 | BINARY = gnunet-service-mesh | ||
140 | ACCEPT_FROM = 127.0.0.1; | ||
141 | ACCEPT_FROM6 = ::1; | ||
142 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
143 | UNIX_MATCH_UID = YES | ||
144 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 2e95a5bd8..595284fa6 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf | |||
@@ -132,4 +132,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-1/ | |||
132 | [dht] | 132 | [dht] |
133 | AUTOSTART = NO | 133 | AUTOSTART = NO |
134 | 134 | ||
135 | [mesh] | ||
136 | AUTOSTART = NO | ||
135 | 137 | ||
diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 53254123f..99ab5f8d5 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -145,14 +145,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/ | |||
145 | AUTOSTART = NO | 145 | AUTOSTART = NO |
146 | 146 | ||
147 | [mesh] | 147 | [mesh] |
148 | AUTOSTART = YES | 148 | AUTOSTART = NO |
149 | PORT = 10512 | 149 | |
150 | HOSTNAME = localhost | ||
151 | HOME = $SERVICEHOME | ||
152 | CONFIG = $DEFAULTCONFIG | ||
153 | BINARY = gnunet-service-mesh | ||
154 | ACCEPT_FROM = 127.0.0.1; | ||
155 | ACCEPT_FROM6 = ::1; | ||
156 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
157 | UNIX_MATCH_UID = YES | ||
158 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_rel_http_peer1.conf b/src/transport/test_transport_api_rel_http_peer1.conf index 05b7a2161..f7a6e8e5f 100644 --- a/src/transport/test_transport_api_rel_http_peer1.conf +++ b/src/transport/test_transport_api_rel_http_peer1.conf | |||
@@ -123,4 +123,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
123 | [dht] | 123 | [dht] |
124 | AUTOSTART = NO | 124 | AUTOSTART = NO |
125 | 125 | ||
126 | [mesh] | ||
127 | AUTOSTART = NO | ||
126 | 128 | ||
diff --git a/src/transport/test_transport_api_rel_http_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf index 0b3da5074..b8a6871ac 100644 --- a/src/transport/test_transport_api_rel_http_peer2.conf +++ b/src/transport/test_transport_api_rel_http_peer2.conf | |||
@@ -130,14 +130,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
130 | AUTOSTART = NO | 130 | AUTOSTART = NO |
131 | 131 | ||
132 | [mesh] | 132 | [mesh] |
133 | AUTOSTART = YES | 133 | AUTOSTART = NO |
134 | PORT = 10512 | 134 | |
135 | HOSTNAME = localhost | ||
136 | HOME = $SERVICEHOME | ||
137 | CONFIG = $DEFAULTCONFIG | ||
138 | BINARY = gnunet-service-mesh | ||
139 | ACCEPT_FROM = 127.0.0.1; | ||
140 | ACCEPT_FROM6 = ::1; | ||
141 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
142 | UNIX_MATCH_UID = YES | ||
143 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_rel_https_peer1.conf b/src/transport/test_transport_api_rel_https_peer1.conf index 3ac60d792..970bdd994 100644 --- a/src/transport/test_transport_api_rel_https_peer1.conf +++ b/src/transport/test_transport_api_rel_https_peer1.conf | |||
@@ -125,4 +125,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
125 | [dht] | 125 | [dht] |
126 | AUTOSTART = NO | 126 | AUTOSTART = NO |
127 | 127 | ||
128 | [mesh] | ||
129 | AUTOSTART = NO | ||
128 | 130 | ||
diff --git a/src/transport/test_transport_api_rel_https_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf index 534a13b47..9df2d0b53 100644 --- a/src/transport/test_transport_api_rel_https_peer2.conf +++ b/src/transport/test_transport_api_rel_https_peer2.conf | |||
@@ -131,14 +131,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
131 | AUTOSTART = NO | 131 | AUTOSTART = NO |
132 | 132 | ||
133 | [mesh] | 133 | [mesh] |
134 | AUTOSTART = YES | 134 | AUTOSTART = NO |
135 | PORT = 10512 | 135 | |
136 | HOSTNAME = localhost | ||
137 | HOME = $SERVICEHOME | ||
138 | CONFIG = $DEFAULTCONFIG | ||
139 | BINARY = gnunet-service-mesh | ||
140 | ACCEPT_FROM = 127.0.0.1; | ||
141 | ACCEPT_FROM6 = ::1; | ||
142 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
143 | UNIX_MATCH_UID = YES | ||
144 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index 714686231..682edf989 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf | |||
@@ -97,7 +97,18 @@ UNIXPATH = /tmp/gnunet-p1-service-arm.sock | |||
97 | 97 | ||
98 | [transport-tcp] | 98 | [transport-tcp] |
99 | TIMEOUT = 300000 | 99 | TIMEOUT = 300000 |
100 | PORT = 12368 | 100 | PORT = 12368[mesh] |
101 | AUTOSTART = NO | ||
102 | PORT = 10511 | ||
103 | HOSTNAME = localhost | ||
104 | HOME = $SERVICEHOME | ||
105 | CONFIG = $DEFAULTCONFIG | ||
106 | BINARY = gnunet-service-mesh | ||
107 | ACCEPT_FROM = 127.0.0.1; | ||
108 | ACCEPT_FROM6 = ::1; | ||
109 | UNIXPATH = /tmp/gnunet-service-mesh.sock | ||
110 | UNIX_MATCH_UID = YES | ||
111 | UNIX_MATCH_GID = YES | ||
101 | 112 | ||
102 | [TESTING] | 113 | [TESTING] |
103 | WEAKRANDOM = YES | 114 | WEAKRANDOM = YES |
@@ -114,4 +125,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
114 | [dht] | 125 | [dht] |
115 | AUTOSTART = NO | 126 | AUTOSTART = NO |
116 | 127 | ||
128 | [mesh] | ||
129 | AUTOSTART = NO | ||
117 | 130 | ||
diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index b681de711..c3e4e1f01 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf | |||
@@ -114,4 +114,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
114 | [dht] | 114 | [dht] |
115 | AUTOSTART = NO | 115 | AUTOSTART = NO |
116 | 116 | ||
117 | [mesh] | ||
118 | AUTOSTART = NO | ||
117 | 119 | ||
diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index 878c17590..d28a92e7c 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -111,14 +111,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
111 | AUTOSTART = NO | 111 | AUTOSTART = NO |
112 | 112 | ||
113 | [mesh] | 113 | [mesh] |
114 | AUTOSTART = YES | 114 | AUTOSTART = NO |
115 | PORT = 10511 | 115 | |
116 | HOSTNAME = localhost | ||
117 | HOME = $SERVICEHOME | ||
118 | CONFIG = $DEFAULTCONFIG | ||
119 | BINARY = gnunet-service-mesh | ||
120 | ACCEPT_FROM = 127.0.0.1; | ||
121 | ACCEPT_FROM6 = ::1; | ||
122 | UNIXPATH = /tmp/gnunet-service-mesh.sock | ||
123 | UNIX_MATCH_UID = YES | ||
124 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 129dc938e..0961f3369 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -112,14 +112,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
112 | AUTOSTART = NO | 112 | AUTOSTART = NO |
113 | 113 | ||
114 | [mesh] | 114 | [mesh] |
115 | AUTOSTART = YES | 115 | AUTOSTART = NO |
116 | PORT = 10512 | 116 | |
117 | HOSTNAME = localhost | ||
118 | HOME = $SERVICEHOME | ||
119 | CONFIG = $DEFAULTCONFIG | ||
120 | BINARY = gnunet-service-mesh | ||
121 | ACCEPT_FROM = 127.0.0.1; | ||
122 | ACCEPT_FROM6 = ::1; | ||
123 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
124 | UNIX_MATCH_UID = YES | ||
125 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index db3940cb7..0188b970f 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf | |||
@@ -111,8 +111,6 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
111 | DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf | 111 | DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf |
112 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | 112 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ |
113 | 113 | ||
114 | 114 | [mesh] | |
115 | [dht] | ||
116 | AUTOSTART = NO | 115 | AUTOSTART = NO |
117 | 116 | ||
118 | |||
diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index b3c3ca2bd..65e8b1d67 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf | |||
@@ -124,14 +124,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
124 | AUTOSTART = NO | 124 | AUTOSTART = NO |
125 | 125 | ||
126 | [mesh] | 126 | [mesh] |
127 | AUTOSTART = YES | 127 | AUTOSTART = NO |
128 | PORT = 10512 | 128 | |
129 | HOSTNAME = localhost | ||
130 | HOME = $SERVICEHOME | ||
131 | CONFIG = $DEFAULTCONFIG | ||
132 | BINARY = gnunet-service-mesh | ||
133 | ACCEPT_FROM = 127.0.0.1; | ||
134 | ACCEPT_FROM6 = ::1; | ||
135 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
136 | UNIX_MATCH_UID = YES | ||
137 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index e74be1d8f..2742525b5 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf | |||
@@ -108,4 +108,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
108 | [dht] | 108 | [dht] |
109 | AUTOSTART = NO | 109 | AUTOSTART = NO |
110 | 110 | ||
111 | [mesh] | ||
112 | AUTOSTART = NO | ||
111 | 113 | ||
diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index f9d499c52..dfdec745e 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -117,14 +117,5 @@ UNIX_MATCH_GID = YES | |||
117 | AUTOSTART = NO | 117 | AUTOSTART = NO |
118 | 118 | ||
119 | [mesh] | 119 | [mesh] |
120 | AUTOSTART = YES | 120 | AUTOSTART = NO |
121 | PORT = 10512 | 121 | |
122 | HOSTNAME = localhost | ||
123 | HOME = $SERVICEHOME | ||
124 | CONFIG = $DEFAULTCONFIG | ||
125 | BINARY = gnunet-service-mesh | ||
126 | ACCEPT_FROM = 127.0.0.1; | ||
127 | ACCEPT_FROM6 = ::1; | ||
128 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
129 | UNIX_MATCH_UID = YES | ||
130 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index e1e5a7f57..13b4d6361 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf | |||
@@ -101,10 +101,11 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
101 | 101 | ||
102 | [PATHS] | 102 | [PATHS] |
103 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf | 103 | DEFAULTCONFIG = test_transport_api_unix_peer1.conf |
104 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | ||
105 | 104 | ||
106 | 105 | ||
107 | [dht] | 106 | [dht] |
108 | AUTOSTART = NO | 107 | AUTOSTART = NO |
109 | 108 | ||
109 | [mesh] | ||
110 | AUTOSTART = NO | ||
110 | 111 | ||
diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index eb7ee5b69..9deac9cd8 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -106,14 +106,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
106 | AUTOSTART = NO | 106 | AUTOSTART = NO |
107 | 107 | ||
108 | [mesh] | 108 | [mesh] |
109 | AUTOSTART = YES | 109 | AUTOSTART = NO |
110 | PORT = 10512 | 110 | |
111 | HOSTNAME = localhost | ||
112 | HOME = $SERVICEHOME | ||
113 | CONFIG = $DEFAULTCONFIG | ||
114 | BINARY = gnunet-service-mesh | ||
115 | ACCEPT_FROM = 127.0.0.1; | ||
116 | ACCEPT_FROM6 = ::1; | ||
117 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
118 | UNIX_MATCH_UID = YES | ||
119 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index fd3abebd5..eb7c246cd 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf | |||
@@ -106,4 +106,6 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
106 | [dht] | 106 | [dht] |
107 | AUTOSTART = NO | 107 | AUTOSTART = NO |
108 | 108 | ||
109 | [mesh] | ||
110 | AUTOSTART = NO | ||
109 | 111 | ||
diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index e7199ed40..4dbc32832 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf | |||
@@ -118,14 +118,5 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
118 | AUTOSTART = NO | 118 | AUTOSTART = NO |
119 | 119 | ||
120 | [mesh] | 120 | [mesh] |
121 | AUTOSTART = YES | 121 | AUTOSTART = NO |
122 | PORT = 10512 | 122 | |
123 | HOSTNAME = localhost | ||
124 | HOME = $SERVICEHOME | ||
125 | CONFIG = $DEFAULTCONFIG | ||
126 | BINARY = gnunet-service-mesh | ||
127 | ACCEPT_FROM = 127.0.0.1; | ||
128 | ACCEPT_FROM6 = ::1; | ||
129 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
130 | UNIX_MATCH_UID = YES | ||
131 | UNIX_MATCH_GID = YES | ||
diff --git a/src/transport/test_transport_ats_1addr.conf b/src/transport/test_transport_ats_1addr.conf index 5e64f46d8..076e36947 100644 --- a/src/transport/test_transport_ats_1addr.conf +++ b/src/transport/test_transport_ats_1addr.conf | |||
@@ -65,4 +65,6 @@ AUTOSTART = NO | |||
65 | [dht] | 65 | [dht] |
66 | AUTOSTART = NO | 66 | AUTOSTART = NO |
67 | 67 | ||
68 | [mesh] | ||
69 | AUTOSTART = NO | ||
68 | 70 | ||
diff --git a/src/transport/test_transport_ats_2addr.conf b/src/transport/test_transport_ats_2addr.conf index c92994ad0..440e57447 100644 --- a/src/transport/test_transport_ats_2addr.conf +++ b/src/transport/test_transport_ats_2addr.conf | |||
@@ -66,4 +66,6 @@ AUTOSTART = NO | |||
66 | [dht] | 66 | [dht] |
67 | AUTOSTART = NO | 67 | AUTOSTART = NO |
68 | 68 | ||
69 | [mesh] | ||
70 | AUTOSTART = NO | ||
69 | 71 | ||
diff --git a/src/transport/test_transport_ats_4addr.conf b/src/transport/test_transport_ats_4addr.conf index e82b85bc9..aaa23a515 100644 --- a/src/transport/test_transport_ats_4addr.conf +++ b/src/transport/test_transport_ats_4addr.conf | |||
@@ -68,4 +68,6 @@ AUTOSTART = NO | |||
68 | [dht] | 68 | [dht] |
69 | AUTOSTART = NO | 69 | AUTOSTART = NO |
70 | 70 | ||
71 | [mesh] | ||
72 | AUTOSTART = NO | ||
71 | 73 | ||