diff options
16 files changed, 240 insertions, 20 deletions
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 781611990..710dbc881 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf | |||
@@ -105,4 +105,15 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
105 | [dht] | 105 | [dht] |
106 | AUTOSTART = NO | 106 | AUTOSTART = NO |
107 | 107 | ||
108 | 108 | [mesh] | |
109 | AUTOSTART = YES | ||
110 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index 09d9fe3fc..bd2ffc319 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf | |||
@@ -113,4 +113,15 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
113 | [dht] | 113 | [dht] |
114 | AUTOSTART = NO | 114 | AUTOSTART = NO |
115 | 115 | ||
116 | 116 | [mesh] | |
117 | AUTOSTART = YES | ||
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_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index f84a7a066..649a07e53 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf | |||
@@ -111,4 +111,15 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
111 | [dht] | 111 | [dht] |
112 | AUTOSTART = NO | 112 | AUTOSTART = NO |
113 | 113 | ||
114 | 114 | [mesh] | |
115 | AUTOSTART = YES | ||
116 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index 4e8069bb5..c473cbd10 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf | |||
@@ -99,4 +99,15 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
99 | [dht] | 99 | [dht] |
100 | AUTOSTART = NO | 100 | AUTOSTART = NO |
101 | 101 | ||
102 | 102 | [mesh] | |
103 | AUTOSTART = YES | ||
104 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index 7be68cbbe..c0fd3d54d 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf | |||
@@ -99,4 +99,15 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
99 | [dht] | 99 | [dht] |
100 | AUTOSTART = NO | 100 | AUTOSTART = NO |
101 | 101 | ||
102 | 102 | [mesh] | |
103 | AUTOSTART = YES | ||
104 | PORT = 10512 | ||
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_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index dc370fa12..e971a7d33 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf | |||
@@ -125,4 +125,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
125 | [dht] | 125 | [dht] |
126 | AUTOSTART = NO | 126 | AUTOSTART = NO |
127 | 127 | ||
128 | 128 | [mesh] | |
129 | AUTOSTART = YES | ||
130 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index f3703de92..c03e4f59b 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf | |||
@@ -130,4 +130,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
130 | [dht] | 130 | [dht] |
131 | AUTOSTART = NO | 131 | AUTOSTART = NO |
132 | 132 | ||
133 | 133 | [mesh] | |
134 | AUTOSTART = YES | ||
135 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index c1f1eadb9..53254123f 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf | |||
@@ -38,7 +38,18 @@ AUTOSTART = NO | |||
38 | 38 | ||
39 | [datastore] | 39 | [datastore] |
40 | AUTOSTART = NO | 40 | AUTOSTART = NO |
41 | 41 | [mesh] | |
42 | AUTOSTART = YES | ||
43 | PORT = 10512 | ||
44 | HOSTNAME = localhost | ||
45 | HOME = $SERVICEHOME | ||
46 | CONFIG = $DEFAULTCONFIG | ||
47 | BINARY = gnunet-service-mesh | ||
48 | ACCEPT_FROM = 127.0.0.1; | ||
49 | ACCEPT_FROM6 = ::1; | ||
50 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
51 | UNIX_MATCH_UID = YES | ||
52 | UNIX_MATCH_GID = YES | ||
42 | [hostlist] | 53 | [hostlist] |
43 | HTTP-PROXY = | 54 | HTTP-PROXY = |
44 | SERVERS = http://gnunet.org:8080/ | 55 | SERVERS = http://gnunet.org:8080/ |
@@ -133,4 +144,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-multi-peer-2/ | |||
133 | [dht] | 144 | [dht] |
134 | AUTOSTART = NO | 145 | AUTOSTART = NO |
135 | 146 | ||
136 | 147 | [mesh] | |
148 | AUTOSTART = YES | ||
149 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_rel_http_peer2.conf index e1658bf75..0b3da5074 100644 --- a/src/transport/test_transport_api_rel_http_peer2.conf +++ b/src/transport/test_transport_api_rel_http_peer2.conf | |||
@@ -129,4 +129,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
129 | [dht] | 129 | [dht] |
130 | AUTOSTART = NO | 130 | AUTOSTART = NO |
131 | 131 | ||
132 | 132 | [mesh] | |
133 | AUTOSTART = YES | ||
134 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_rel_https_peer2.conf index e826e7ebe..534a13b47 100644 --- a/src/transport/test_transport_api_rel_https_peer2.conf +++ b/src/transport/test_transport_api_rel_https_peer2.conf | |||
@@ -130,4 +130,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
130 | [dht] | 130 | [dht] |
131 | AUTOSTART = NO | 131 | AUTOSTART = NO |
132 | 132 | ||
133 | 133 | [mesh] | |
134 | AUTOSTART = YES | ||
135 | PORT = 10512 | ||
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_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index e750ee011..878c17590 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf | |||
@@ -110,4 +110,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-1/ | |||
110 | [dht] | 110 | [dht] |
111 | AUTOSTART = NO | 111 | AUTOSTART = NO |
112 | 112 | ||
113 | 113 | [mesh] | |
114 | AUTOSTART = YES | ||
115 | PORT = 10511 | ||
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 40f0b0732..129dc938e 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf | |||
@@ -111,4 +111,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
111 | [dht] | 111 | [dht] |
112 | AUTOSTART = NO | 112 | AUTOSTART = NO |
113 | 113 | ||
114 | 114 | [mesh] | |
115 | AUTOSTART = YES | ||
116 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 689074302..b3c3ca2bd 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf | |||
@@ -98,7 +98,18 @@ UNIXPATH = /tmp/gnunet-p2-service-arm.sock | |||
98 | TIMEOUT = 300000 | 98 | TIMEOUT = 300000 |
99 | PORT = 22368 | 99 | PORT = 22368 |
100 | 100 | ||
101 | [TESTING] | 101 | [TESTING][mesh] |
102 | AUTOSTART = YES | ||
103 | PORT = 10512 | ||
104 | HOSTNAME = localhost | ||
105 | HOME = $SERVICEHOME | ||
106 | CONFIG = $DEFAULTCONFIG | ||
107 | BINARY = gnunet-service-mesh | ||
108 | ACCEPT_FROM = 127.0.0.1; | ||
109 | ACCEPT_FROM6 = ::1; | ||
110 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
111 | UNIX_MATCH_UID = YES | ||
112 | UNIX_MATCH_GID = YES | ||
102 | WEAKRANDOM = YES | 113 | WEAKRANDOM = YES |
103 | 114 | ||
104 | [gnunetd] | 115 | [gnunetd] |
@@ -112,4 +123,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
112 | [dht] | 123 | [dht] |
113 | AUTOSTART = NO | 124 | AUTOSTART = NO |
114 | 125 | ||
115 | 126 | [mesh] | |
127 | AUTOSTART = YES | ||
128 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index f6e89f8e9..f9d499c52 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf | |||
@@ -100,9 +100,31 @@ HOSTKEY = $SERVICEHOME/.hostkey | |||
100 | [PATHS] | 100 | [PATHS] |
101 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf | 101 | DEFAULTCONFIG = test_transport_api_udp_peer2.conf |
102 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | 102 | SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ |
103 | 103 | [mesh] | |
104 | AUTOSTART = YES | ||
105 | PORT = 10512 | ||
106 | HOSTNAME = localhost | ||
107 | HOME = $SERVICEHOME | ||
108 | CONFIG = $DEFAULTCONFIG | ||
109 | BINARY = gnunet-service-mesh | ||
110 | ACCEPT_FROM = 127.0.0.1; | ||
111 | ACCEPT_FROM6 = ::1; | ||
112 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
113 | UNIX_MATCH_UID = YES | ||
114 | UNIX_MATCH_GID = YES | ||
104 | 115 | ||
105 | [dht] | 116 | [dht] |
106 | AUTOSTART = NO | 117 | AUTOSTART = NO |
107 | 118 | ||
108 | 119 | [mesh] | |
120 | AUTOSTART = YES | ||
121 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index c297ef20e..eb7ee5b69 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf | |||
@@ -105,4 +105,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
105 | [dht] | 105 | [dht] |
106 | AUTOSTART = NO | 106 | AUTOSTART = NO |
107 | 107 | ||
108 | 108 | [mesh] | |
109 | AUTOSTART = YES | ||
110 | PORT = 10512 | ||
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_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index c8dd96bf2..e7199ed40 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf | |||
@@ -75,7 +75,18 @@ UNIXPATH = /tmp/gnunet-p2-service-resolver.sock | |||
75 | [statistics] | 75 | [statistics] |
76 | ACCEPT_FROM6 = ::1; | 76 | ACCEPT_FROM6 = ::1; |
77 | ACCEPT_FROM = 127.0.0.1; | 77 | ACCEPT_FROM = 127.0.0.1; |
78 | BINARY = gnunet-service-statistics | 78 | BINARY = gnunet-serv[mesh] |
79 | AUTOSTART = YES | ||
80 | PORT = 10512 | ||
81 | HOSTNAME = localhost | ||
82 | HOME = $SERVICEHOME | ||
83 | CONFIG = $DEFAULTCONFIG | ||
84 | BINARY = gnunet-service-mesh | ||
85 | ACCEPT_FROM = 127.0.0.1; | ||
86 | ACCEPT_FROM6 = ::1; | ||
87 | UNIXPATH = /tmp/gnunet-service-mesh2.sock | ||
88 | UNIX_MATCH_UID = YES | ||
89 | UNIX_MATCH_GID = YESice-statistics | ||
79 | CONFIG = $DEFAULTCONFIG | 90 | CONFIG = $DEFAULTCONFIG |
80 | HOME = $SERVICEHOME | 91 | HOME = $SERVICEHOME |
81 | HOSTNAME = localhost | 92 | HOSTNAME = localhost |
@@ -106,4 +117,15 @@ SERVICEHOME = /tmp/test-gnunetd-transport-peer-2/ | |||
106 | [dht] | 117 | [dht] |
107 | AUTOSTART = NO | 118 | AUTOSTART = NO |
108 | 119 | ||
109 | 120 | [mesh] | |
121 | AUTOSTART = YES | ||
122 | PORT = 10512 | ||
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 | ||