diff options
Diffstat (limited to 'src')
12 files changed, 117 insertions, 6 deletions
diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index 644899d21..e96c31cf4 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf | |||
@@ -349,6 +349,16 @@ UNIXPATH = /tmp/test-service-dht-1 | |||
349 | UNIX_MATCH_UID = YES | 349 | UNIX_MATCH_UID = YES |
350 | UNIX_MATCH_GID = YES | 350 | UNIX_MATCH_GID = YES |
351 | 351 | ||
352 | [chat] | ||
353 | UNIXPATH = /tmp/test-service-chat-b_server-1 | ||
354 | UNIX_MATCH_UID = YES | ||
355 | UNIX_MATCH_GID = YES | ||
356 | |||
357 | [dv] | ||
358 | UNIXPATH = /tmp/test-service-dv-b_server-1 | ||
359 | UNIX_MATCH_UID = YES | ||
360 | UNIX_MATCH_GID = YES | ||
361 | |||
352 | [dhtcache] | 362 | [dhtcache] |
353 | DATABASE = sqlite | 363 | DATABASE = sqlite |
354 | QUOTA = 1 MB | 364 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf index 4e42e5faf..5081553c9 100644 --- a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf +++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | [PATHS] | 1 | [PATHS] |
2 | SERVICEHOME = /tmp/c_bootstrap_server/ | 2 | SERVICEHOME = /tmp/c_bootstrap_server/ |
3 | DEFAULTCONFIG = confs/c_bootstrap_server.conf | 3 | DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf |
4 | 4 | ||
5 | [gnunetd] | 5 | [gnunetd] |
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 6 | #HOSTKEY = $SERVICEHOME/.hostkey |
@@ -143,7 +143,7 @@ ATS_MIN_INTERVAL = 15000 | |||
143 | ATS_EXEC_INTERVAL = 30000 | 143 | ATS_EXEC_INTERVAL = 30000 |
144 | 144 | ||
145 | [transport] | 145 | [transport] |
146 | PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif | 146 | #PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif |
147 | AUTOSTART = YES | 147 | AUTOSTART = YES |
148 | PORT = 20011 | 148 | PORT = 20011 |
149 | HOSTNAME = localhost | 149 | HOSTNAME = localhost |
@@ -274,7 +274,7 @@ CONFIG = $DEFAULTCONFIG | |||
274 | BINARY = gnunet-service-arm | 274 | BINARY = gnunet-service-arm |
275 | ACCEPT_FROM = 127.0.0.1; | 275 | ACCEPT_FROM = 127.0.0.1; |
276 | ACCEPT_FROM6 = ::1; | 276 | ACCEPT_FROM6 = ::1; |
277 | DEFAULTSERVICES = topology hostlist fs | 277 | DEFAULTSERVICES = topology hostlist fs dht gns |
278 | UNIXPATH = /tmp/test-service-arm-4 | 278 | UNIXPATH = /tmp/test-service-arm-4 |
279 | UNIX_MATCH_UID = YES | 279 | UNIX_MATCH_UID = YES |
280 | UNIX_MATCH_GID = YES | 280 | UNIX_MATCH_GID = YES |
@@ -361,4 +361,4 @@ AUTOSTART = NO | |||
361 | AUTOSTART = NO | 361 | AUTOSTART = NO |
362 | 362 | ||
363 | [lockmanager] | 363 | [lockmanager] |
364 | AUTOSTART = NO \ No newline at end of file | 364 | AUTOSTART = NO |
diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 5bb80dc16..9e12bb9fa 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf | |||
@@ -359,5 +359,15 @@ UNIX_MATCH_GID = YES | |||
359 | DATABASE = sqlite | 359 | DATABASE = sqlite |
360 | QUOTA = 1 MB | 360 | QUOTA = 1 MB |
361 | 361 | ||
362 | [chat] | ||
363 | UNIXPATH = /tmp/test-service-chat-b_nat_c-1 | ||
364 | UNIX_MATCH_UID = YES | ||
365 | UNIX_MATCH_GID = YES | ||
366 | |||
367 | [dv] | ||
368 | UNIXPATH = /tmp/test-service-dv-b_nat_c-1 | ||
369 | UNIX_MATCH_UID = YES | ||
370 | UNIX_MATCH_GID = YES | ||
371 | |||
362 | [lockmanager] | 372 | [lockmanager] |
363 | AUTOSTART = NO \ No newline at end of file | 373 | AUTOSTART = NO |
diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 393fc7e45..445f30817 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf | |||
@@ -150,6 +150,7 @@ ATS_EXEC_INTERVAL = 30000 | |||
150 | 150 | ||
151 | [transport] | 151 | [transport] |
152 | #DEBUG = YES | 152 | #DEBUG = YES |
153 | #PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif | ||
153 | AUTOSTART = YES | 154 | AUTOSTART = YES |
154 | PORT = 20029 | 155 | PORT = 20029 |
155 | HOSTNAME = localhost | 156 | HOSTNAME = localhost |
@@ -360,5 +361,15 @@ UNIX_MATCH_GID = YES | |||
360 | DATABASE = sqlite | 361 | DATABASE = sqlite |
361 | QUOTA = 1 MB | 362 | QUOTA = 1 MB |
362 | 363 | ||
364 | [chat] | ||
365 | UNIXPATH = /tmp/test-service-chat-b_no_nat_c-1 | ||
366 | UNIX_MATCH_UID = YES | ||
367 | UNIX_MATCH_GID = YES | ||
368 | |||
369 | [dv] | ||
370 | UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1 | ||
371 | UNIX_MATCH_UID = YES | ||
372 | UNIX_MATCH_GID = YES | ||
373 | |||
363 | [lockmanager] | 374 | [lockmanager] |
364 | AUTOSTART = NO | 375 | AUTOSTART = NO |
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index 657b94885..cac4e7b21 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf | |||
@@ -342,6 +342,16 @@ UNIX_MATCH_GID = YES | |||
342 | DATABASE = sqlite | 342 | DATABASE = sqlite |
343 | QUOTA = 1 MB | 343 | QUOTA = 1 MB |
344 | 344 | ||
345 | [chat] | ||
346 | UNIXPATH = /tmp/test-service-chat-b_no_nat_c-2 | ||
347 | UNIX_MATCH_UID = YES | ||
348 | UNIX_MATCH_GID = YES | ||
349 | |||
350 | [dv] | ||
351 | UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2 | ||
352 | UNIX_MATCH_UID = YES | ||
353 | UNIX_MATCH_GID = YES | ||
354 | |||
345 | [gns] | 355 | [gns] |
346 | AUTOSTART = NO | 356 | AUTOSTART = NO |
347 | 357 | ||
diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf index 03f594b56..0ed1aee8f 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf | |||
@@ -357,6 +357,16 @@ UNIXPATH = /tmp/test-service-dht-15 | |||
357 | UNIX_MATCH_UID = YES | 357 | UNIX_MATCH_UID = YES |
358 | UNIX_MATCH_GID = YES | 358 | UNIX_MATCH_GID = YES |
359 | 359 | ||
360 | [chat] | ||
361 | UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-1 | ||
362 | UNIX_MATCH_UID = YES | ||
363 | UNIX_MATCH_GID = YES | ||
364 | |||
365 | [dv] | ||
366 | UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1 | ||
367 | UNIX_MATCH_UID = YES | ||
368 | UNIX_MATCH_GID = YES | ||
369 | |||
360 | [dhtcache] | 370 | [dhtcache] |
361 | DATABASE = sqlite | 371 | DATABASE = sqlite |
362 | QUOTA = 1 MB | 372 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf index b6982733f..47c861a72 100644 --- a/src/integration-tests/confs/c_no_nat_client_http_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf | |||
@@ -350,3 +350,13 @@ UNIX_MATCH_GID = YES | |||
350 | DATABASE = sqlite | 350 | DATABASE = sqlite |
351 | QUOTA = 1 MB | 351 | QUOTA = 1 MB |
352 | 352 | ||
353 | [chat] | ||
354 | UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-2 | ||
355 | UNIX_MATCH_UID = YES | ||
356 | UNIX_MATCH_GID = YES | ||
357 | |||
358 | [dv] | ||
359 | UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2 | ||
360 | UNIX_MATCH_UID = YES | ||
361 | UNIX_MATCH_GID = YES | ||
362 | |||
diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index 6d445dd23..b48042908 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf | |||
@@ -360,6 +360,16 @@ UNIXPATH = /tmp/test-service-dht-15 | |||
360 | UNIX_MATCH_UID = YES | 360 | UNIX_MATCH_UID = YES |
361 | UNIX_MATCH_GID = YES | 361 | UNIX_MATCH_GID = YES |
362 | 362 | ||
363 | [chat] | ||
364 | UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1 | ||
365 | UNIX_MATCH_UID = YES | ||
366 | UNIX_MATCH_GID = YES | ||
367 | |||
368 | [dv] | ||
369 | UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1 | ||
370 | UNIX_MATCH_UID = YES | ||
371 | UNIX_MATCH_GID = YES | ||
372 | |||
363 | [dhtcache] | 373 | [dhtcache] |
364 | DATABASE = sqlite | 374 | DATABASE = sqlite |
365 | QUOTA = 1 MB | 375 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf index 14fb71f10..ca4da89cb 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf | |||
@@ -349,6 +349,16 @@ UNIXPATH = /tmp/test-service-dht-29 | |||
349 | UNIX_MATCH_UID = YES | 349 | UNIX_MATCH_UID = YES |
350 | UNIX_MATCH_GID = YES | 350 | UNIX_MATCH_GID = YES |
351 | 351 | ||
352 | [chat] | ||
353 | UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-2 | ||
354 | UNIX_MATCH_UID = YES | ||
355 | UNIX_MATCH_GID = YES | ||
356 | |||
357 | [dv] | ||
358 | UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2 | ||
359 | UNIX_MATCH_UID = YES | ||
360 | UNIX_MATCH_GID = YES | ||
361 | |||
352 | [dhtcache] | 362 | [dhtcache] |
353 | DATABASE = sqlite | 363 | DATABASE = sqlite |
354 | QUOTA = 1 MB | 364 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index 6bf53a011..f01cac9d1 100644 --- a/src/integration-tests/confs/c_normal_client_tcp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf | |||
@@ -355,6 +355,16 @@ UNIXPATH = /tmp/test-service-dht-43 | |||
355 | UNIX_MATCH_UID = YES | 355 | UNIX_MATCH_UID = YES |
356 | UNIX_MATCH_GID = YES | 356 | UNIX_MATCH_GID = YES |
357 | 357 | ||
358 | [chat] | ||
359 | UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp-1 | ||
360 | UNIX_MATCH_UID = YES | ||
361 | UNIX_MATCH_GID = YES | ||
362 | |||
363 | [dv] | ||
364 | UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp-1 | ||
365 | UNIX_MATCH_UID = YES | ||
366 | UNIX_MATCH_GID = YES | ||
367 | |||
358 | [dhtcache] | 368 | [dhtcache] |
359 | DATABASE = sqlite | 369 | DATABASE = sqlite |
360 | QUOTA = 1 MB \ No newline at end of file | 370 | QUOTA = 1 MB |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf index 90a7e2b49..f515609bd 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf | |||
@@ -355,6 +355,16 @@ UNIXPATH = /tmp/test-service-dht-43 | |||
355 | UNIX_MATCH_UID = YES | 355 | UNIX_MATCH_UID = YES |
356 | UNIX_MATCH_GID = YES | 356 | UNIX_MATCH_GID = YES |
357 | 357 | ||
358 | [chat] | ||
359 | UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp-1 | ||
360 | UNIX_MATCH_UID = YES | ||
361 | UNIX_MATCH_GID = YES | ||
362 | |||
363 | [dv] | ||
364 | UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp-1 | ||
365 | UNIX_MATCH_UID = YES | ||
366 | UNIX_MATCH_GID = YES | ||
367 | |||
358 | [dhtcache] | 368 | [dhtcache] |
359 | DATABASE = sqlite | 369 | DATABASE = sqlite |
360 | QUOTA = 1 MB \ No newline at end of file | 370 | QUOTA = 1 MB \ No newline at end of file |
diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf index 523d98bb2..a4a30c18c 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf | |||
@@ -355,6 +355,16 @@ UNIXPATH = /tmp/test-service-dht-43 | |||
355 | UNIX_MATCH_UID = YES | 355 | UNIX_MATCH_UID = YES |
356 | UNIX_MATCH_GID = YES | 356 | UNIX_MATCH_GID = YES |
357 | 357 | ||
358 | [chat] | ||
359 | UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp_http | ||
360 | UNIX_MATCH_UID = YES | ||
361 | UNIX_MATCH_GID = YES | ||
362 | |||
363 | [dv] | ||
364 | UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http | ||
365 | UNIX_MATCH_UID = YES | ||
366 | UNIX_MATCH_GID = YES | ||
367 | |||
358 | [dhtcache] | 368 | [dhtcache] |
359 | DATABASE = sqlite | 369 | DATABASE = sqlite |
360 | QUOTA = 1 MB \ No newline at end of file | 370 | QUOTA = 1 MB \ No newline at end of file |