diff options
| author | Christian Grothoff <christian@grothoff.org> | 2013-10-09 10:30:21 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2013-10-09 10:30:21 +0000 |
| commit | 7b29d40b75fd60ce5e0b86694499627dc9c63022 (patch) | |
| tree | b33914ae90ad85884f34f44d7fc0483f85661cf5 | |
| parent | d0a9f269aa6575253b1c284d594a467e6fdeb7c7 (diff) | |
last XDG change: use GNUNET_RUNTIME_DIR instead of /tmp for UNIXPATHs by default
177 files changed, 828 insertions, 828 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in index 1b079c98c1..6bffca7965 100644 --- a/src/arm/arm.conf.in +++ b/src/arm/arm.conf.in @@ -6,7 +6,7 @@ BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; DEFAULTSERVICES = topology hostlist dht nse mesh fs -UNIXPATH = /tmp/gnunet-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in index d5116304fc..c53f50b088 100644 --- a/src/ats/ats.conf.in +++ b/src/ats/ats.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-ats.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf index 9a0fa1e93f..c5a2c2d3da 100644 --- a/src/ats/test_ats_api.conf +++ b/src/ats/test_ats_api.conf @@ -4,7 +4,7 @@ GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ [arm] PORT = 12001 DEFAULTSERVICES = -UNIXPATH = /tmp/test-ats-scheduling-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock [ats] #PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25 @@ -14,7 +14,7 @@ HOSTNAME = localhost BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/test-ats-scheduling-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-ats.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/ats/test_ats_mlp.conf b/src/ats/test_ats_mlp.conf index d6c1541c82..79efd79037 100644 --- a/src/ats/test_ats_mlp.conf +++ b/src/ats/test_ats_mlp.conf @@ -4,7 +4,7 @@ GNUNET_TEST_HOME = /tmp/test-ats-api-scheduling/ [arm] PORT = 12001 DEFAULTSERVICES = ats -UNIXPATH = /tmp/test-ats-scheduling-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock [ats] #PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25 @@ -14,7 +14,7 @@ HOSTNAME = localhost BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/test-ats-scheduling-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-ats.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/ats/test_ats_solver_default.conf b/src/ats/test_ats_solver_default.conf index 46187d1630..fb3a7889f8 100644 --- a/src/ats/test_ats_solver_default.conf +++ b/src/ats/test_ats_solver_default.conf @@ -1,7 +1,7 @@ [arm] PORT = 12001 DEFAULTSERVICES = ats -UNIXPATH = /tmp/test-ats-scheduling-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-ats-scheduling-arm.sock [transport] AUTOSTART = NO diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in index de526305cd..1a1fa23b95 100644 --- a/src/consensus/consensus.conf.in +++ b/src/consensus/consensus.conf.in @@ -5,6 +5,6 @@ HOSTNAME = localhost BINARY = gnunet-service-consensus ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-consensus.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-consensus.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf index a59a1012af..a134da9dcc 100644 --- a/src/consensus/test_consensus.conf +++ b/src/consensus/test_consensus.conf @@ -7,7 +7,7 @@ BINARY = gnunet-service-consensus #PREFIX = valgrind --leak-check=full ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-consensus.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-consensus.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES OPTIONS = -L INFO diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in index b4386e80db..48d2dc507c 100644 --- a/src/conversation/conversation.conf.in +++ b/src/conversation/conversation.conf.in @@ -1,6 +1,6 @@ [conversation] AUTOSTART = YES BINARY = gnunet-service-conversation -UNIXPATH = /tmp/gnunet-service-conversation.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock @UNIXONLY@ PORT = 2106 diff --git a/src/core/core.conf.in b/src/core/core.conf.in index f8e71957ac..fbf206d206 100644 --- a/src/core/core.conf.in +++ b/src/core/core.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES # DISABLE_SOCKET_FORWARDING = NO diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf index 440dac5c93..4ece5b0966 100644 --- a/src/core/test_core_api_data.conf +++ b/src/core/test_core_api_data.conf @@ -10,5 +10,5 @@ WAN_QUOTA_OUT = 64 kiB [core] PORT = 2092 -UNIXPATH = /tmp/gnunet-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf index d461f94602..b976fd4117 100644 --- a/src/core/test_core_api_peer1.conf +++ b/src/core/test_core_api_peer1.conf @@ -4,26 +4,26 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/ [arm] PORT = 12460 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12461 [resolver] PORT = 12462 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12463 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12464 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [ats] PORT = 12475 -UNIXPATH = /tmp/gnunet-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock [transport-tcp] PORT = 12467 diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf index 436846f5cc..739b6b1a1c 100644 --- a/src/core/test_core_api_peer2.conf +++ b/src/core/test_core_api_peer2.conf @@ -4,31 +4,31 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/ [arm] PORT = 22460 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 22461 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 22462 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 22463 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 22464 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [core] PORT = 22475 -UNIXPATH = /tmp/gnunet-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock [ats] PORT = 22476 -UNIXPATH = /tmp/gnunet-p2-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock [transport-tcp] PORT = 22467 diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf index 971d68cd0c..ebf77997c0 100644 --- a/src/core/test_core_api_send_to_self.conf +++ b/src/core/test_core_api_send_to_self.conf @@ -8,13 +8,13 @@ DEFAULTSERVICES = core test-sts [core] PORT = 24512 -UNIXPATH = /tmp/gnunet-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock [ats] WAN_QUOTA_IN = 104857600 WAN_QUOTA_OUT = 104757600 PORT = 24571 -UNIXPATH = /tmp/gnunet-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock [test-sts] AUTOSTART = YES @@ -25,5 +25,5 @@ ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; TOTAL_QUOTA_IN = 65536 TOTAL_QUOTA_OUT = 65536 -UNIXPATH = /tmp/gnunet-service-sts.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-sts.sock diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf index b690ba151f..c03eeed1c8 100644 --- a/src/core/test_core_defaults.conf +++ b/src/core/test_core_defaults.conf @@ -19,7 +19,7 @@ WAN_QUOTA_OUT = 1 GB [core] PORT = 12470 -UNIXPATH = /tmp/gnunet-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock [transport-tcp] BINDTO = 127.0.0.1 diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf index ba0257d344..713854aff2 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf @@ -7,30 +7,30 @@ PORT = 12488 [arm] PORT = 12486 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-arm.sock [statistics] PORT = 12487 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-statistics.sock [resolver] PORT = 12484 -UNIXPATH = /tmp/gnunet-core-asym-recv-1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-1-service-resolver.sock [peerinfo] PORT = 12489 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-peerinfo.sock [transport] PORT = 12485 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-transport.sock [transport-udp] PORT = 12489 [ats] PORT = 12491 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-ats.sock # UNSPECIFIED UNSPECIFIED_QUOTA_IN = 1 MB UNSPECIFIED_QUOTA_OUT = 1 MB @@ -50,5 +50,5 @@ WLAN_QUOTA_OUT = 1 MB [core] PORT = 12490 -UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-core.sock diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf index 9f4527a2f7..134f921b6a 100644 --- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf +++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf @@ -5,31 +5,31 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/ [arm] PORT = 22486 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-arm.sock [statistics] PORT = 22487 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-statistics.sock [resolver] PORT = 22484 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-resolver.sock [peerinfo] PORT = 22489 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-peerinfo.sock [transport] PORT = 22485 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-transport.sock [core] PORT = 22490 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-core.sock [ats] PORT = 22491 -UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-ats.sock # UNSPECIFIED UNSPECIFIED_QUOTA_IN = 10240 UNSPECIFIED_QUOTA_OUT = 10240 diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf index 268b8fc00e..97f4852256 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf @@ -10,27 +10,27 @@ PORT = 12492 [arm] PORT = 12486 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-arm.sock [statistics] PORT = 12487 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-statistics.sock [resolver] PORT = 12484 -UNIXPATH = /tmp/gnunet-core-asym-send-1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-1-service-resolver.sock [peerinfo] PORT = 12489 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-peerinfo.sock [transport] PORT = 12485 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-transport.sock [ats] PORT = 12491 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-ats.sock # UNSPECIFIED UNSPECIFIED_QUOTA_IN = 10240 UNSPECIFIED_QUOTA_OUT = 10240 @@ -49,4 +49,4 @@ WLAN_QUOTA_OUT = 10240 [core] PORT = 12490 -UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-core.sock diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf index 721f5c268c..ce1fcda14c 100644 --- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf +++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf @@ -4,37 +4,37 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/ [arm] PORT = 22486 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-arm.sock [statistics] PORT = 22487 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-statistics.sock [resolver] PORT = 22484 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-resolver.sock [peerinfo] PORT = 22489 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-peerinfo.sock [transport] PORT = 22485 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-transport.sock [core] PORT = 22490 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-core.sock [ats] PORT = 22491 -UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-ats.sock WAN_QUOTA_IN = 1 MB WAN_QUOTA_OUT = 1 MB [ats] PORT = 12471 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock # UNSPECIFIED UNSPECIFIED_QUOTA_IN = 1 MB UNSPECIFIED_QUOTA_OUT = 1 MB diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf index c62b4607c3..b96e7fefd0 100644 --- a/src/core/test_core_quota_peer1.conf +++ b/src/core/test_core_quota_peer1.conf @@ -7,27 +7,27 @@ PORT = 12468 [arm] PORT = 12476 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-arm.sock [statistics] PORT = 12477 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-statistics.sock [resolver] PORT = 12474 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-resolver.sock [peerinfo] PORT = 12479 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-peerinfo.sock [transport] PORT = 12475 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-transport.sock [ats] PORT = 12471 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock # UNSPECIFIED UNSPECIFIED_QUOTA_IN = 10240 UNSPECIFIED_QUOTA_OUT = 10240 @@ -46,11 +46,11 @@ WLAN_QUOTA_OUT = 10240 [core] PORT = 12480 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-core.sock [ats] PORT = 12481 -UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock [transport-udp] PORT = 12482 diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf index 452eef63ea..3c3275d74c 100644 --- a/src/core/test_core_quota_peer2.conf +++ b/src/core/test_core_quota_peer2.conf @@ -4,31 +4,31 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-2/ [arm] PORT = 22476 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-arm.sock [statistics] PORT = 22477 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-statistics.sock [resolver] PORT = 22474 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-resolver.sock [peerinfo] PORT = 22479 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-peerinfo.sock [transport] PORT = 22475 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-transport.sock [core] PORT = 22480 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-core.sock [ats] PORT = 22482 -UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-ats.sock # UNSPECIFIED UNSPECIFIED_QUOTA_IN = 10240 UNSPECIFIED_QUOTA_OUT = 10240 diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in index 7d9efff6e7..35098bbcec 100644 --- a/src/datastore/datastore.conf.in +++ b/src/datastore/datastore.conf.in @@ -1,6 +1,6 @@ [datastore] AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-datastore.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES @UNIXONLY@ PORT = 2093 diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in index 7a9781a3aa..b7e03c5d22 100644 --- a/src/dht/dht.conf.in +++ b/src/dht/dht.conf.in @@ -6,7 +6,7 @@ BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; BUCKET_SIZE = 4 -UNIXPATH = /tmp/gnunet-service-dht.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dht.sock # This could be relaxed... UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in index ee9a653023..f97b8f0ff3 100644 --- a/src/dns/dns.conf.in +++ b/src/dns/dns.conf.in @@ -2,7 +2,7 @@ AUTOSTART = YES HOSTNAME = localhost BINARY = gnunet-service-dns -UNIXPATH = /tmp/gnunet-service-dns.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock # Access to this service can compromise all DNS queries in this # system. Thus access should be restricted to the same UID. diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in index 65f54613a5..d044740ce2 100644 --- a/src/dv/dv.conf.in +++ b/src/dv/dv.conf.in @@ -5,7 +5,7 @@ ACCEPT_FROM = 127.0.0.1; BINARY = gnunet-service-dv HOSTNAME = localhost @UNIXONLY@ PORT = 2571 -UNIXPATH = /tmp/gnunet-service-dv.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dv.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES # ACCEPT_FROM = diff --git a/src/experimentation/experimentation.conf.in b/src/experimentation/experimentation.conf.in index 5bfffad86a..6b3974684d 100644 --- a/src/experimentation/experimentation.conf.in +++ b/src/experimentation/experimentation.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-daemon-experimentation ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-daemon-experimentation.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-daemon-experimentation.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES ISSUERS = TFRM29O2RQNKLVBQIGODJ6GD58LSQ2NM9TNFBC6N48BRJHQO38Q73N2OM3V4CLKDM6CILQV4CU8PMJDRG0FNB0PDI057DBRANMLPLRG diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in index bb4cae99a1..087185b0c7 100644 --- a/src/fs/fs.conf.in +++ b/src/fs/fs.conf.in @@ -20,7 +20,7 @@ CONTENT_CACHING = YES # (may improve anonymity, probably not a good idea if content_caching is NO) CONTENT_PUSHING = YES -UNIXPATH = /tmp/gnunet-service-fs.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fs.sock # Do we require users that want to access file-sharing to run this process # (usually not a good idea) diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index 99f7dcc549..beb0ae9a96 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in @@ -2,7 +2,7 @@ AUTOSTART = YES HOSTNAME = localhost BINARY = gnunet-service-gns -UNIXPATH = /tmp/gnunet-service-gns.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock @UNIXONLY@PORT = 2102 # Do we require users that want to access GNS to run this process @@ -26,7 +26,7 @@ AUTOSTART = NO # Where is the certificate for the GNS proxy stored? PROXY_CACERT = $GNUNET_DATA_HOME/gns/gns_ca_cert.pem -PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock +PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock [dns2gns] diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf index 547e5580bc..da6a1823a3 100644 --- a/src/gns/test_gns_proxy.conf +++ b/src/gns/test_gns_proxy.conf @@ -20,7 +20,7 @@ HIJACK_DNS = YES [gns-proxy] PROXY_CACERT = proxy/test_cert.pem -PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock +PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock [namestore] AUTOSTART = YES diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index 5830c427be..d1aef4ca7d 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf @@ -69,7 +69,7 @@ SHORTEN_ZONE = short SHORTEN_ZONEKEY = zonefiles/188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey #ZONEKEY = $GNUNET_TEST_HOME/gns/zonekey.zkey HIJACK_DNS = NO -UNIXPATH = /tmp/gnunet-service-gns.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock AUTO_IMPORT_PKEY = YES MAX_PARALLEL_BACKGROUND_QUERIES = 10 DEFAULT_LOOKUP_TIMEOUT = 15 s @@ -84,7 +84,7 @@ AUTOSTART = NO [namestore] PORT = 22371 AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-namestore-default.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES HOSTNAME = localhost diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf index 377ba4a41e..0d59325aab 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf @@ -8,27 +8,27 @@ PORT = 12968 [arm] PORT = 12966 DEFAULTSERVICES = hostlist topology -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12967 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12964 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12969 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12965 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [core] PORT = 12970 -UNIXPATH = /tmp/gnunet-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock [hostlist] HTTPPORT = 12980 @@ -38,5 +38,5 @@ SERVERS = http://localhost:12981/ [ats] PORT = 12971 -UNIXPATH = /tmp/gnunet-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf index 547a9e2ff5..f3fca70a2e 100644 --- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf +++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf @@ -8,27 +8,27 @@ PORT = 22968 [arm] PORT = 22966 DEFAULTSERVICES = hostlist topology -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 22967 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 22964 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 22969 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 22965 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [core] PORT = 22970 -UNIXPATH = /tmp/gnunet-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock [hostlist] HTTPPORT = 12981 @@ -38,5 +38,5 @@ SERVERS = http://localhost:12980/ [ats] PORT = 22971 -UNIXPATH = /tmp/gnunet-p2-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf index f65ba0ae56..1bdcd8101f 100644 --- a/src/hostlist/test_learning_adv_peer.conf +++ b/src/hostlist/test_learning_adv_peer.conf @@ -8,27 +8,27 @@ PORT = 22968 [arm] PORT = 22966 DEFAULTSERVICES = topology hostlist -UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-arm.sock [statistics] PORT = 22967 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-statistics.sock [resolver] PORT = 22964 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-resolver.sock [peerinfo] PORT = 22969 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-peerinfo.sock [transport] PORT = 22965 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-transport.sock [core] PORT = 22970 -UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p2-service-core.sock [hostlist] HTTPPORT = 12981 @@ -43,4 +43,4 @@ AUTOSTART = NO [ats] PORT = 22971 -UNIXPATH = /tmp/gnunet-ats-p2-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p2-service-core.sock diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf index db1a397f37..afe3ef69a5 100644 --- a/src/hostlist/test_learning_learn_peer.conf +++ b/src/hostlist/test_learning_learn_peer.conf @@ -8,27 +8,27 @@ PORT = 12968 [arm] PORT = 12966 DEFAULTSERVICES = topology hostlist -UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-arm.sock [statistics] PORT = 12967 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-statistics.sock [resolver] PORT = 12964 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-resolver.sock [peerinfo] PORT = 12969 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-peerinfo.sock [transport] PORT = 12965 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-transport.sock [core] PORT = 12970 -UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-hostlist-p1-service-core.sock [hostlist] HTTPPORT = 12980 @@ -42,4 +42,4 @@ AUTOSTART = NO [ats] PORT = 12971 -UNIXPATH = /tmp/gnunet-ats-p1-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p1-service-core.sock diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf index 57cca3343d..dc27bfb9aa 100644 --- a/src/hostlist/test_learning_learn_peer2.conf +++ b/src/hostlist/test_learning_learn_peer2.conf @@ -8,27 +8,27 @@ PORT = 32968 [arm] PORT = 32966 DEFAULTSERVICES = topology hostlist -UNIXPATH = /tmp/gnunet-p3-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-arm.sock [statistics] PORT = 32967 -UNIXPATH = /tmp/gnunet-p3-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-statistics.sock [resolver] PORT = 32964 -UNIXPATH = /tmp/gnunet-p3-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-resolver.sock [peerinfo] PORT = 32969 -UNIXPATH = /tmp/gnunet-p3-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-peerinfo.sock [transport] PORT = 32965 -UNIXPATH = /tmp/gnunet-p3-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-transport.sock [core] PORT = 32970 -UNIXPATH = /tmp/gnunet-p3-service-core.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p3-service-core.sock [hostlist] HTTPPORT = 32980 diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in index 1b68775b93..1b0d087e6e 100644 --- a/src/identity/identity.conf.in +++ b/src/identity/identity.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-identity ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-identity.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-identity.unix UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/identity/test_identity.conf b/src/identity/test_identity.conf index 3349f6aa33..54ea63fd8a 100644 --- a/src/identity/test_identity.conf +++ b/src/identity/test_identity.conf @@ -1,7 +1,7 @@ [arm] PORT = 12000 DEFAULTSERVICES = identity -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [identity] # need to overwrite paths to ensure they stay the same between runs... diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index 08b08762dc..064ac619e9 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf @@ -8,45 +8,45 @@ GNUNET_TEST_HOME = /tmp/c_bootstrap_server/ PRIVATE_KEY = hostkeys/c_bootstrap_server [arm] -UNIXPATH = /tmp/test-service-arm-4 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-4 PORT = 20004 [dns] -UNIXPATH = /tmp/test-service-dns-5 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-5 [core] -UNIXPATH = /tmp/test-service-core-3 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-3 PORT = 20003 [ats] -UNIXPATH = /tmp/test-service-ats-9 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-9 PORT = 20012 [mesh] -UNIXPATH = /tmp/test-service-mesh-13 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-13 PORT = 20016 [datastore] -UNIXPATH = /tmp/test-service-datastore-11 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-11 PORT = 20014 [resolver] -UNIXPATH = /tmp/test-service-resolver-14 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-14 PORT = 20017 [dht] -UNIXPATH = /tmp/test-service-dht-1 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-1 PORT = 20000 [nat] BEHIND_NAT = NO [fs] -UNIXPATH = /tmp/test-service-fs-6 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-6 PORT = 20005 [transport] -UNIXPATH = /tmp/test-service-transport-8 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-8 PORT = 20011 [transport-tcp] @@ -61,18 +61,18 @@ OPTIONS = -p SERVERs = [vpn] -UNIXPATH = /tmp/gnunet-service-vpn-15 +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-15 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-10 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-10 PORT = 20013 [statistics] -UNIXPATH = /tmp/test-service-statistics-2 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-2 PORT = 20001 [nse] -UNIXPATH = /tmp/test-service-nse-12 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-12 PORT = 20015 [transport-http] diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 5f42f22e1e..942360c93d 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf @@ -1,35 +1,35 @@ @INLINE@ confs/test_defaults.conf [arm] -UNIXPATH = /tmp/test-service-arm-46 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46 PORT = 20058 [core] -UNIXPATH = /tmp/test-service-core-45 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45 PORT = 20057 [ats] -UNIXPATH = /tmp/test-service-ats-51 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51 PORT = 20066 [datastore] -UNIXPATH = /tmp/test-service-datastore-53 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53 PORT = 20068 [resolver] -UNIXPATH = /tmp/test-service-resolver-56 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56 PORT = 20071 [dht] -UNIXPATH = /tmp/test-service-dht-43 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43 PORT = 20054 [fs] -UNIXPATH = /tmp/test-service-fs-48 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48 PORT = 20059 [transport] -UNIXPATH = /tmp/test-service-transport-50 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 PORT = 20065 [transport-tcp] @@ -43,10 +43,10 @@ PORT = 0 SERVERS = http://localhost:8080/ [dv] -UNIXPATH = /tmp/test-service-dv-b_nat_c-1 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_nat_c-1 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-52 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52 PORT = 20067 [PATHS] @@ -56,7 +56,7 @@ GNUNET_TEST_HOME = /tmp/c_nat_client PRIVATE_KEY = hostkeys/c_nat_client [nse] -UNIXPATH = /tmp/test-service-nse-54 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54 PORT = 20069 [transport-http] diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 87daeb41d7..f03e118d86 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf @@ -8,14 +8,14 @@ PRIVATE_KEY = hostkeys/c_no_nat_client [arm] DEFAULTSERVICES = topology hostlist dht nse mesh fs -UNIXPATH = /tmp/test-service-arm-18 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 PORT = 20022 [namestore] AUTOSTART = YES [dns] -UNIXPATH = /tmp/test-service-dns-19 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 [consensus] AUTOSTART = YES @@ -24,29 +24,29 @@ AUTOSTART = YES AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-17 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 PORT = 20021 [ats] -UNIXPATH = /tmp/test-service-ats-23 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23 WAN_QUOTA_IN = 64 KiB WAN_QUOTA_OUT = 64 KiB PORT = 20030 [mesh] -UNIXPATH = /tmp/test-service-mesh-27 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27 PORT = 20034 [datastore] -UNIXPATH = /tmp/test-service-datastore-25 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25 PORT = 20032 [resolver] -UNIXPATH = /tmp/test-service-resolver-28 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28 PORT = 20035 [dht] -UNIXPATH = /tmp/test-service-dht-15 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15 PORT = 20018 [dhtcache] @@ -61,12 +61,12 @@ DISABLEV6 = NO PORT = 20020 [fs] -UNIXPATH = /tmp/test-service-fs-20 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20 PORT = 20023 [transport] PLUGINS = tcp udp -UNIXPATH = /tmp/test-service-transport-22 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 UNIX_MATCH_UID = NO PORT = 20029 @@ -83,26 +83,26 @@ SERVERS = http://localhost:8080/ [vpn] BINARY = gnunet-service-vpn -UNIXPATH = /tmp/gnunet-service-vpn-29 +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29 [dv] -UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-1 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-24 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24 USE_INCLUDED_HELLOS = YES PORT = 20031 [statistics] -UNIXPATH = /tmp/test-service-statistics-16 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16 PORT = 20019 [template] PORT = 20024 -UNIXPATH = /tmp/test-service-template-21 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21 [nse] -UNIXPATH = /tmp/test-service-nse-26 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26 UNIX_MATCH_UID = NO WORKBITS = 22 PORT = 20033 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 46f0ddd243..b475ff284a 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf @@ -1,37 +1,37 @@ @INLINE@ confs/test_defaults.conf [arm] -UNIXPATH = /tmp/test-service-arm-32 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32 PORT = 20040 [dns] -UNIXPATH = /tmp/test-service-dns-33 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-31 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31 PORT = 20039 [ats] -UNIXPATH = /tmp/test-service-ats-37 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37 PORT = 20048 [mesh] -UNIXPATH = /tmp/test-service-mesh-41 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41 PORT = 20052 [datastore] -UNIXPATH = /tmp/test-service-datastore-39 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39 PORT = 20050 [resolver] -UNIXPATH = /tmp/test-service-resolver-42 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42 PORT = 20053 [dht] -UNIXPATH = /tmp/test-service-dht-29 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29 PORT = 20036 [nat] @@ -41,11 +41,11 @@ BEHIND_NAT = NO PORT = 20038 [fs] -UNIXPATH = /tmp/test-service-fs-34 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34 PORT = 20041 [transport] -UNIXPATH = /tmp/test-service-transport-36 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36 PORT = 20047 [transport-tcp] @@ -59,17 +59,17 @@ PORT = 20045 SERVERS = http://localhost:8080/ [vpn] -UNIXPATH = /tmp/gnunet-service-vpn.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock [dv] -UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-2 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-38 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38 PORT = 20049 [statistics] -UNIXPATH = /tmp/test-service-statistics-30 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30 PORT = 20037 [PATHS] @@ -81,10 +81,10 @@ PRIVATE_KEY = hostkeys/c_no_nat_client_2 [template] PORT = 20042 -UNIXPATH = /tmp/test-service-template-35 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35 [nse] -UNIXPATH = /tmp/test-service-nse-40 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40 PORT = 20051 [transport-http] 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 67ed37ea61..8f1f776a50 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf @@ -1,36 +1,36 @@ [arm] DEFAULTSERVICES = topology hostlist fs core -UNIXPATH = /tmp/test-service-arm-18 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 PORT = 20022 [dns] -UNIXPATH = /tmp/test-service-dns-19 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-17 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 PORT = 20021 [ats] -UNIXPATH = /tmp/test-service-ats-23 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23 PORT = 20030 [mesh] -UNIXPATH = /tmp/test-service-mesh-27 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27 PORT = 20034 [datastore] -UNIXPATH = /tmp/test-service-datastore-25 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25 PORT = 20032 [resolver] -UNIXPATH = /tmp/test-service-resolver-28 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28 PORT = 20035 [dht] -UNIXPATH = /tmp/test-service-dht-15 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15 PORT = 20018 [nat] @@ -40,12 +40,12 @@ BEHIND_NAT = NO PORT = 20020 [fs] -UNIXPATH = /tmp/test-service-fs-20 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20 PORT = 20023 [transport] PLUGINS = http -UNIXPATH = /tmp/test-service-transport-22 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 PORT = 20029 [transport-tcp] @@ -59,18 +59,18 @@ PORT = 20027 SERVERS = http://localhost:8080/ [vpn] -UNIXPATH = /tmp/gnunet-service-vpn-29 +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29 [dv] -UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-1 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-24 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24 USE_INCLUDED_HELLOS = YES PORT = 20031 [statistics] -UNIXPATH = /tmp/test-service-statistics-16 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16 PORT = 20019 [PATHS] @@ -79,10 +79,10 @@ DEFAULTCONFIG = c_no_nat_client_http.conf [template] PORT = 20024 -UNIXPATH = /tmp/test-service-template-21 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21 [nse] -UNIXPATH = /tmp/test-service-nse-26 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26 PORT = 20033 [transport-http] 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 a581d7f02c..c10b042f5a 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 @@ -2,37 +2,37 @@ [arm] DEFAULTSERVICES = topology hostlist fs core -UNIXPATH = /tmp/test-service-arm-32 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32 PORT = 20040 [dns] -UNIXPATH = /tmp/test-service-dns-33 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-31 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31 PORT = 20039 [ats] -UNIXPATH = /tmp/test-service-ats-37 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37 PORT = 20048 [mesh] -UNIXPATH = /tmp/test-service-mesh-41 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41 PORT = 20052 [datastore] -UNIXPATH = /tmp/test-service-datastore-39 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39 PORT = 20050 [resolver] -UNIXPATH = /tmp/test-service-resolver-42 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42 PORT = 20053 [dht] -UNIXPATH = /tmp/test-service-dht-29 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29 PORT = 20036 [nat] @@ -42,12 +42,12 @@ BEHIND_NAT = NO PORT = 20038 [fs] -UNIXPATH = /tmp/test-service-fs-34 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34 PORT = 20041 [transport] PLUGINS = http -UNIXPATH = /tmp/test-service-transport-36 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36 PORT = 20047 [transport-tcp] @@ -61,18 +61,18 @@ PORT = 20045 SERVERS = http://localhost:8080/ [vpn] -UNIXPATH = /tmp/gnunet-service-vpn.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock [dv] -UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_http_c-2 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-38 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38 USE_INCLUDED_HELLOS = YES PORT = 20049 [statistics] -UNIXPATH = /tmp/test-service-statistics-30 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30 PORT = 20037 [PATHS] @@ -81,10 +81,10 @@ DEFAULTCONFIG = c_no_nat_client_http_2.conf [template] PORT = 20042 -UNIXPATH = /tmp/test-service-template-35 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35 [nse] -UNIXPATH = /tmp/test-service-nse-40 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40 PORT = 20051 [transport-http] 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 c1129b5193..1321b0c354 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf @@ -2,37 +2,37 @@ [arm] DEFAULTSERVICES = topology hostlist fs core -UNIXPATH = /tmp/test-service-arm-18 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 PORT = 20022 [dns] -UNIXPATH = /tmp/test-service-dns-19 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-17 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17 PORT = 20021 [ats] -UNIXPATH = /tmp/test-service-ats-23 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23 PORT = 20030 [mesh] -UNIXPATH = /tmp/test-service-mesh-27 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27 PORT = 20034 [datastore] -UNIXPATH = /tmp/test-service-datastore-25 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25 PORT = 20032 [resolver] -UNIXPATH = /tmp/test-service-resolver-28 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28 PORT = 20035 [dht] -UNIXPATH = /tmp/test-service-dht-15 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15 PORT = 20018 [nat] @@ -42,12 +42,12 @@ BEHIND_NAT = NO PORT = 20020 [fs] -UNIXPATH = /tmp/test-service-fs-20 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20 PORT = 20023 [transport] PLUGINS = unix tcp udp http -UNIXPATH = /tmp/test-service-transport-22 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22 PORT = 20029 [transport-unix] @@ -64,18 +64,18 @@ PORT = 20027 SERVERS = http://localhost:8080/ [vpn] -UNIXPATH = /tmp/gnunet-service-vpn-29 +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29 [dv] -UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-1 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-24 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24 USE_INCLUDED_HELLOS = YES PORT = 20031 [statistics] -UNIXPATH = /tmp/test-service-statistics-16 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16 PORT = 20019 [PATHS] @@ -84,10 +84,10 @@ DEFAULTCONFIG = c_no_nat_client_unix.conf [template] PORT = 20024 -UNIXPATH = /tmp/test-service-template-21 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21 [nse] -UNIXPATH = /tmp/test-service-nse-26 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26 PORT = 20033 [gnunetd] @@ -100,5 +100,5 @@ PORT = 0 PORT = 20025 [chat] -UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-chat-b_no_nat_unix_c-1 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 f4d91d3361..67f0e0d761 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 @@ -2,37 +2,37 @@ [arm] DEFAULTSERVICES = topology hostlist fs core -UNIXPATH = /tmp/test-service-arm-32 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32 PORT = 20040 [dns] -UNIXPATH = /tmp/test-service-dns-33 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-31 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31 PORT = 20039 [ats] -UNIXPATH = /tmp/test-service-ats-37 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37 PORT = 20048 [mesh] -UNIXPATH = /tmp/test-service-mesh-41 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41 PORT = 20052 [datastore] -UNIXPATH = /tmp/test-service-datastore-39 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39 PORT = 20050 [resolver] -UNIXPATH = /tmp/test-service-resolver-42 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42 PORT = 20053 [dht] -UNIXPATH = /tmp/test-service-dht-29 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29 PORT = 20036 [nat] @@ -42,12 +42,12 @@ BEHIND_NAT = NO PORT = 20038 [fs] -UNIXPATH = /tmp/test-service-fs-34 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34 PORT = 20041 [transport] PLUGINS = unix tcp udp http -UNIXPATH = /tmp/test-service-transport-36 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36 PORT = 20047 [transport-tcp] @@ -61,18 +61,18 @@ PORT = 20045 SERVERS = http://localhost:8080/ [vpn] -UNIXPATH = /tmp/gnunet-service-vpn.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock [dv] -UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_unix_c-2 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-38 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38 USE_INCLUDED_HELLOS = YES PORT = 20049 [statistics] -UNIXPATH = /tmp/test-service-statistics-30 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30 PORT = 20037 [PATHS] @@ -81,10 +81,10 @@ DEFAULTCONFIG = c_no_nat_client_unix_2.conf [template] PORT = 20042 -UNIXPATH = /tmp/test-service-template-35 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35 [nse] -UNIXPATH = /tmp/test-service-nse-40 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40 PORT = 20051 [transport-http] diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index ca8d684cce..54d8b050d1 100644 --- a/src/integration-tests/confs/c_normal_client_tcp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf @@ -1,35 +1,35 @@ @INLINE@ confs/test_defaults.conf [arm] -UNIXPATH = /tmp/test-service-arm-46 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46 PORT = 20058 [core] -UNIXPATH = /tmp/test-service-core-45 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45 PORT = 20057 [ats] -UNIXPATH = /tmp/test-service-ats-51 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51 PORT = 20066 [datastore] -UNIXPATH = /tmp/test-service-datastore-53 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53 PORT = 20068 [resolver] -UNIXPATH = /tmp/test-service-resolver-56 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56 PORT = 20071 [dht] -UNIXPATH = /tmp/test-service-dht-43 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43 PORT = 20054 [fs] -UNIXPATH = /tmp/test-service-fs-48 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48 PORT = 20059 [transport] -UNIXPATH = /tmp/test-service-transport-50 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 PORT = 20065 [transport-tcp] @@ -40,7 +40,7 @@ ADVERTISED_PORT = 20064 PORT = 0 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-52 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52 USE_INCLUDED_HELLOS = YES PORT = 20067 @@ -48,7 +48,7 @@ PORT = 20067 GNUNET_TEST_HOME = /tmp/c_normal_client [nse] -UNIXPATH = /tmp/test-service-nse-54 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54 PORT = 20069 [gnunetd] 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 5aaf8ee510..40757ba1ba 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf @@ -1,39 +1,39 @@ @INLINE@ confs/test_defaults.conf [arm] -UNIXPATH = /tmp/test-service-arm-46 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46 PORT = 20058 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-45 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45 PORT = 20057 [ats] -UNIXPATH = /tmp/test-service-ats-51 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51 PORT = 20066 [datastore] -UNIXPATH = /tmp/test-service-datastore-53 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53 PORT = 20068 [resolver] -UNIXPATH = /tmp/test-service-resolver-56 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56 PORT = 20071 [dht] -UNIXPATH = /tmp/test-service-dht-43 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43 PORT = 20054 [fs] -UNIXPATH = /tmp/test-service-fs-48 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48 PORT = 20059 [transport] PLUGINS = tcp udp -UNIXPATH = /tmp/test-service-transport-50 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 PORT = 20065 [transport-tcp] @@ -44,7 +44,7 @@ ADVERTISED_PORT = 20064 PORT = 0 [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-52 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52 USE_INCLUDED_HELLOS = YES PORT = 20067 @@ -52,7 +52,7 @@ PORT = 20067 GNUNET_TEST_HOME = /tmp/c_normal_client [nse] -UNIXPATH = /tmp/test-service-nse-54 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54 PORT = 20069 [transport-http] 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 7b01fc9a36..5a70d9d4c3 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 @@ -1,39 +1,39 @@ @INLINE@ confs/test_defaults.conf [arm] -UNIXPATH = /tmp/test-service-arm-46 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46 PORT = 20058 [lockmanager] AUTOSTART = YES [core] -UNIXPATH = /tmp/test-service-core-45 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45 PORT = 20057 [ats] -UNIXPATH = /tmp/test-service-ats-51 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51 PORT = 20066 [datastore] -UNIXPATH = /tmp/test-service-datastore-53 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53 PORT = 20068 [resolver] -UNIXPATH = /tmp/test-service-resolver-56 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56 PORT = 20071 [dht] -UNIXPATH = /tmp/test-service-dht-43 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43 PORT = 20054 [fs] -UNIXPATH = /tmp/test-service-fs-48 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48 PORT = 20059 [transport] PLUGINS = tcp udp http -UNIXPATH = /tmp/test-service-transport-50 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50 PORT = 20065 [transport-tcp] @@ -44,10 +44,10 @@ ADVERTISED_PORT = 20064 PORT = 0 [dv] -UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_c_normal_client_tcp_udp_http [peerinfo] -UNIXPATH = /tmp/test-service-peerinfo-52 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52 USE_INCLUDED_HELLOS = YES PORT = 20067 @@ -55,7 +55,7 @@ PORT = 20067 GNUNET_TEST_HOME = /tmp/c_normal_client [nse] -UNIXPATH = /tmp/test-service-nse-54 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54 PORT = 20069 [transport-http] diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf index b1f3c33be5..eb97229152 100644 --- a/src/integration-tests/confs/test_defaults.conf +++ b/src/integration-tests/confs/test_defaults.conf @@ -5,7 +5,7 @@ DEFAULTSERVICES = topology hostlist fs AUTOSTART = NO [dns] -UNIXPATH = /tmp/test-service-dns-47 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-47 PORT = 0 ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -24,7 +24,7 @@ ATS_MIN_INTERVAL = 15000 ATS_EXEC_INTERVAL = 30000 [mesh] -UNIXPATH = /tmp/test-service-mesh-55 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-55 PORT = 20070 [datastore] @@ -67,14 +67,14 @@ USE_LOCALADDR = YES SERVERS = [vpn] -UNIXPATH = /tmp/gnunet-service-vpn-57 +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-57 PORT = 0 [peerinfo] USE_INCLUDED_HELLOS = NO [statistics] -UNIXPATH = /tmp/test-service-statistics-44 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-44 PORT = 20055 [template] diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in index 39ede6750f..cb061bd70b 100644 --- a/src/mesh/mesh.conf.in +++ b/src/mesh/mesh.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-mesh.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-mesh.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES REFRESH_CONNECTION_TIME = 5 min diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in index 65299cecfc..305893b002 100644 --- a/src/multicast/multicast.conf.in +++ b/src/multicast/multicast.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-multicast ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-multicast.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES # DISABLE_SOCKET_FORWARDING = NO diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in index 91dbaabad9..66695af2ef 100644 --- a/src/namestore/namestore.conf.in +++ b/src/namestore/namestore.conf.in @@ -1,6 +1,6 @@ [namestore] AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-namestore.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES @UNIXONLY@ PORT = 2099 diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf index 9722828acc..e9a1b77bfd 100644 --- a/src/nat/test_nat_data.conf +++ b/src/nat/test_nat_data.conf @@ -51,7 +51,7 @@ BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; DEFAULTSERVICES = topology hostlist -UNIXPATH = /tmp/gnunet-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES # GLOBAL_POSTFIX = -l $GNUNET_TEST_HOME/{}-logs @@ -72,7 +72,7 @@ HOSTNAME = localhost BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES # DISABLE_SOCKET_FORWARDING = NO @@ -92,7 +92,7 @@ HOSTNAME = localhost BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = NO # DISABLE_SOCKET_FORWARDING = NO diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in index fbc2722353..ecae4641c3 100644 --- a/src/nse/nse.conf.in +++ b/src/nse/nse.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-nse.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-nse.unix UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf index caf68396d7..7600ce7b6e 100644 --- a/src/nse/nse_infiniband.conf +++ b/src/nse/nse_infiniband.conf @@ -15,7 +15,7 @@ STATS_DIR= /home/totakura/nse/test/load [nse] PORT = 12114 -UNIXPATH = /tmp/test-nse-service-nse.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix BINARY = gnunet-service-nse #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p @@ -30,7 +30,7 @@ HISTOGRAM_DIR = /home/totakura/nse/test/histograms [arm] DEFAULTSERVICES = core nse -UNIXPATH = /tmp/test-nse-service-arm.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix [statistics] AUTOSTART = YES diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index 134fe64c49..2a06d3bc0d 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf @@ -13,7 +13,7 @@ OPERATION_TIMEOUT = 45 s [nse] PORT = 12114 -UNIXPATH = /tmp/test-nse-service-nse.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix BINARY = gnunet-service-nse #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p @@ -27,7 +27,7 @@ PROOFFILE = $GNUNET_TEST_HOME/nse.proof [arm] DEFAULTSERVICES = core nse -UNIXPATH = /tmp/test-nse-service-arm.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix [statistics] AUTOSTART = YES diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf index d8cd2580bf..b6239140ef 100644 --- a/src/nse/test_nse.conf +++ b/src/nse/test_nse.conf @@ -3,7 +3,7 @@ GNUNET_TEST_HOME = /tmp/test-nse-multipeer/ [nse] PORT = 22353 -UNIXPATH = /tmp/test-nse-service-nse.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-nse.unix BINARY = gnunet-service-nse #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p @@ -21,7 +21,7 @@ HISTOGRAM = $GNUNET_TEST_HOME/nse-histogram [arm] PORT = 22354 DEFAULTSERVICES = nse core -UNIXPATH = /tmp/test-nse-service-arm.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix [fs] AUTOSTART = NO diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in index 5604004987..3233c44d7e 100644 --- a/src/peerinfo/peerinfo.conf.in +++ b/src/peerinfo/peerinfo.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerinfo.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES # DISABLE_SOCKET_FORWARDING = NO diff --git a/src/psyc/psyc.conf.in b/src/psyc/psyc.conf.in index 7dfeb0d979..d1f5abe6d4 100644 --- a/src/psyc/psyc.conf.in +++ b/src/psyc/psyc.conf.in @@ -1,6 +1,6 @@ [psyc] AUTOSTART = YES BINARY = gnunet-service-psyc -UNIXPATH = /tmp/gnunet-service-psyc.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf index da2dde680f..1e646239a8 100644 --- a/src/psyc/test_psyc.conf +++ b/src/psyc/test_psyc.conf @@ -1,10 +1,10 @@ [arm] -UNIXPATH = /tmp/test-gnunet-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-arm.sock DEFAULTSERVICES = psyc [psyc] AUTOSTART = YES BINARY = gnunet-service-psyc -UNIXPATH = /tmp/test-gnunet-service-psyc.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-psyc.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/psycstore/psycstore.conf.in b/src/psycstore/psycstore.conf.in index 98c6aeda82..4af03bbd0c 100644 --- a/src/psycstore/psycstore.conf.in +++ b/src/psycstore/psycstore.conf.in @@ -1,7 +1,7 @@ [psycstore] AUTOSTART = YES BINARY = gnunet-service-psycstore -UNIXPATH = /tmp/gnunet-service-psycstore.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock @UNIXONLY@PORT = 2111 UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/psycstore/test_psycstore.conf b/src/psycstore/test_psycstore.conf index 5a20273a20..45eea4cc1b 100644 --- a/src/psycstore/test_psycstore.conf +++ b/src/psycstore/test_psycstore.conf @@ -1,11 +1,11 @@ [arm] -UNIXPATH = /tmp/test-gnunet-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-arm.sock DEFAULTSERVICES = psycstore [psycstore] AUTOSTART = YES BINARY = gnunet-service-psycstore -UNIXPATH = /tmp/test-gnunet-service-psycstore.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test-gnunet-service-psycstore.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES DATABASE = sqlite diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in index 59376a61ec..26768347fa 100644 --- a/src/regex/regex.conf.in +++ b/src/regex/regex.conf.in @@ -1,7 +1,7 @@ [regex] AUTOSTART = YES @UNIXONLY@ PORT = 2107 -UNIXPATH = /tmp/gnunet-service-regex.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock HOSTNAME = localhost BINARY = gnunet-service-regex ACCEPT_FROM = 127.0.0.1; diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in index 6e84b84d67..e9335cd29b 100644 --- a/src/revocation/revocation.conf.in +++ b/src/revocation/revocation.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-revocation ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-revocation.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-revocation.unix UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/scalarproduct/scalarproduct.conf.in b/src/scalarproduct/scalarproduct.conf.in index 064b7fd8c1..325fbad828 100644 --- a/src/scalarproduct/scalarproduct.conf.in +++ b/src/scalarproduct/scalarproduct.conf.in @@ -1,6 +1,6 @@ [vectorproduct] BINARY = gnunet-service-vectorproduct -UNIXPATH = /tmp/gnunet-service-vectorproduct.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vectorproduct.sock # PORT = 2106 @UNIXONLY@ PORT = 2087 diff --git a/src/set/set.conf.in b/src/set/set.conf.in index 81e11cff04..9f700cfe6d 100644 --- a/src/set/set.conf.in +++ b/src/set/set.conf.in @@ -5,6 +5,6 @@ HOSTNAME = localhost BINARY = gnunet-service-set ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-set.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-set.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/set/test_set.conf b/src/set/test_set.conf index 2b8f11fd70..0d8ef692d5 100644 --- a/src/set/test_set.conf +++ b/src/set/test_set.conf @@ -11,7 +11,7 @@ BINARY = gnunet-service-set #PREFIX = gdbserver :1234 ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-set.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-set.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES OPTIONS = -L INFO diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in index 7ce0af99f0..c7d3037820 100644 --- a/src/statistics/statistics.conf.in +++ b/src/statistics/statistics.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES DATABASE = $GNUNET_DATA_HOME/statistics.dat diff --git a/src/statistics/test_statistics_api_data.conf b/src/statistics/test_statistics_api_data.conf index c0ea8630d6..572f51d717 100644 --- a/src/statistics/test_statistics_api_data.conf +++ b/src/statistics/test_statistics_api_data.conf @@ -3,12 +3,12 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-statistics/ [statistics] PORT = 22353 -UNIXPATH = /tmp/test-statistics-service-statistics.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-statistics.unix [arm] PORT = 22354 DEFAULTSERVICES = -UNIXPATH = /tmp/test-statistics-service-arm.unix +UNIXPATH = $GNUNET_RUNTIME_DIR/test-statistics-service-arm.unix [fs] AUTOSTART = NO diff --git a/src/template/template.conf b/src/template/template.conf index ac1479b48a..8c8c179f70 100644 --- a/src/template/template.conf +++ b/src/template/template.conf @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-template.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-template.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES # DISABLE_SOCKET_FORWARDING = NO diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in index 108142d5eb..79334c4cd4 100644 --- a/src/testbed/testbed.conf.in +++ b/src/testbed/testbed.conf.in @@ -18,7 +18,7 @@ OPERATION_TIMEOUT = 30 s ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-testbed.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES @@ -87,7 +87,7 @@ AUTOSTART = NO @UNIXONLY@ PORT = 2102 HOSTNAME = localhost BINARY = gnunet-service-testbed-logger -UNIXPATH = /tmp/gnunet-gnunet-testbed-logger.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gnunet-testbed-logger.sock DIR = /tmp UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES @@ -97,6 +97,6 @@ UNIX_MATCH_GID = YES AUTOSTART = NO @UNIXONLY@ PORT = 2103 HOSTNAME = localhost -UNIXPATH = /tmp/gnunet-service-testbed-barrier.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES diff --git a/src/testing/test_testing_sharedservices.conf b/src/testing/test_testing_sharedservices.conf index c7014065f1..ad8a346c0f 100644 --- a/src/testing/test_testing_sharedservices.conf +++ b/src/testing/test_testing_sharedservices.conf @@ -3,7 +3,7 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-testing/ [testbed-logger] PORT = 15000 -UNIXPATH = /tmp/testbed-logger.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock DIR = /tmp/testbed-logger [resolver] diff --git a/src/transport/template_cfg_peer1.conf b/src/transport/template_cfg_peer1.conf index d66ab19066..3042ce862a 100644 --- a/src/transport/template_cfg_peer1.conf +++ b/src/transport/template_cfg_peer1.conf @@ -19,31 +19,31 @@ PORT = 12007 [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock USE_INCLUDED_HELLOS = NO [transport] #PREFIX = valgrind --leak-check=full PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [ats] WAN_QUOTA_IN = unlimited WAN_QUOTA_OUT = unlimited PORT = 12006 -UNIXPATH = /tmp/gnunet-p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock [hostlist] SERVERS = dummy
\ No newline at end of file diff --git a/src/transport/template_cfg_peer2.conf b/src/transport/template_cfg_peer2.conf index a4b2f2b912..b5ba77b768 100644 --- a/src/transport/template_cfg_peer2.conf +++ b/src/transport/template_cfg_peer2.conf @@ -19,31 +19,31 @@ PORT = 12017 [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock USE_INCLUDED_HELLOS = NO [transport] #PREFIX = valgrind --leak-check=full PORT = 12010 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [ats] WAN_QUOTA_IN = unlimited WAN_QUOTA_OUT = unlimited PORT = 12016 -UNIXPATH = /tmp/gnunet-p2-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock [hostlist] SERVERS = dummy
\ No newline at end of file diff --git a/src/transport/test_plugin_transport_data.conf b/src/transport/test_plugin_transport_data.conf index 885fed8d72..e561cfd30e 100644 --- a/src/transport/test_plugin_transport_data.conf +++ b/src/transport/test_plugin_transport_data.conf @@ -26,23 +26,23 @@ PORT = 2403 [arm] PORT = 2360 -UNIXPATH = /tmp/gnunet-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-arm.sock [statistics] PORT = 2361 -UNIXPATH = /tmp/gnunet-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-statistics.sock [resolver] PORT = 2362 -UNIXPATH = /tmp/gnunet-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock [peerinfo] PORT = 2363 -UNIXPATH = /tmp/gnunet-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerinfo.sock [transport] PORT = 2364 -UNIXPATH = /tmp/gnunet-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock [nat] RETURN_LOCAL_ADDRESSES = YES diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf index f20b62b85d..8f50bf1130 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf @@ -8,23 +8,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf index fe2535d9f1..1816ec99ed 100644 --- a/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_quota_compliance_bluetooth_peer1.conf b/src/transport/test_quota_compliance_bluetooth_peer1.conf index f20b62b85d..8f50bf1130 100644 --- a/src/transport/test_quota_compliance_bluetooth_peer1.conf +++ b/src/transport/test_quota_compliance_bluetooth_peer1.conf @@ -8,23 +8,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_quota_compliance_bluetooth_peer2.conf b/src/transport/test_quota_compliance_bluetooth_peer2.conf index fe2535d9f1..1816ec99ed 100644 --- a/src/transport/test_quota_compliance_bluetooth_peer2.conf +++ b/src/transport/test_quota_compliance_bluetooth_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf index 98d1db1cbd..10ee029361 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer1.conf @@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1 [arm] PORT = 4015 -UNIXPATH = /tmp/test_quota_compliance_http_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock [statistics] PORT = 4014 -UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock [resolver] PORT = 4013 -UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock [peerinfo] PORT = 4012 -UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock [transport] PORT = 4011 PLUGINS = http_client -UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf index 953915cf62..470b3003ae 100644 --- a/src/transport/test_quota_compliance_http_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_http_asymmetric_peer2.conf @@ -10,23 +10,23 @@ BINDTO = 127.0.0.1 [arm] PORT = 3015 -UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock [statistics] PORT = 3014 -UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock [resolver] PORT = 3013 -UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock [peerinfo] PORT = 3012 -UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock [transport] PORT = 3011 PLUGINS = http_server -UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf index 98d1db1cbd..10ee029361 100644 --- a/src/transport/test_quota_compliance_http_peer1.conf +++ b/src/transport/test_quota_compliance_http_peer1.conf @@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1 [arm] PORT = 4015 -UNIXPATH = /tmp/test_quota_compliance_http_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer1.sock [statistics] PORT = 4014 -UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer1.sock [resolver] PORT = 4013 -UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer1.sock [peerinfo] PORT = 4012 -UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer1.sock [transport] PORT = 4011 PLUGINS = http_client -UNIXPATH = /tmp/test_quota_compliance_http_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf index 953915cf62..470b3003ae 100644 --- a/src/transport/test_quota_compliance_http_peer2.conf +++ b/src/transport/test_quota_compliance_http_peer2.conf @@ -10,23 +10,23 @@ BINDTO = 127.0.0.1 [arm] PORT = 3015 -UNIXPATH = /tmp/test_quota_compliance_http_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_arm_peer2.sock [statistics] PORT = 3014 -UNIXPATH = /tmp/test_quota_compliance_http_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_statistics_peer2.sock [resolver] PORT = 3013 -UNIXPATH = /tmp/test_quota_compliance_http_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_resolver_peer2.sock [peerinfo] PORT = 3012 -UNIXPATH = /tmp/test_quota_compliance_http_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_peerinfo_peer2.sock [transport] PORT = 3011 PLUGINS = http_server -UNIXPATH = /tmp/test_quota_compliance_http_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_http_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf index 9493fdee28..52504d34da 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer1.conf @@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ [arm] PORT = 4006 -UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock [statistics] PORT = 4005 -UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock [resolver] PORT = 4004 -UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock [peerinfo] PORT = 4003 -UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock [transport] PORT = 4002 PLUGINS = https_client -UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf index eefc24f1da..59ac327d56 100644 --- a/src/transport/test_quota_compliance_https_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_https_asymmetric_peer2.conf @@ -9,23 +9,23 @@ CERT_FILE = https_cert_qutoa_p2.crt [arm] PORT = 3006 -UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock [statistics] PORT = 3005 -UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock [resolver] PORT = 3004 -UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock [peerinfo] PORT = 3003 -UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock [transport] PORT = 3002 PLUGINS = https_server -UNIXPATH = /tmp/https_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf index 9493fdee28..52504d34da 100644 --- a/src/transport/test_quota_compliance_https_peer1.conf +++ b/src/transport/test_quota_compliance_https_peer1.conf @@ -6,23 +6,23 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ [arm] PORT = 4006 -UNIXPATH = /tmp/test_quota_compliance_https_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer1.sock [statistics] PORT = 4005 -UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer1.sock [resolver] PORT = 4004 -UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer1.sock [peerinfo] PORT = 4003 -UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer1.sock [transport] PORT = 4002 PLUGINS = https_client -UNIXPATH = /tmp/test_quota_compliance_https_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf index eefc24f1da..59ac327d56 100644 --- a/src/transport/test_quota_compliance_https_peer2.conf +++ b/src/transport/test_quota_compliance_https_peer2.conf @@ -9,23 +9,23 @@ CERT_FILE = https_cert_qutoa_p2.crt [arm] PORT = 3006 -UNIXPATH = /tmp/test_quota_compliance_https_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_arm_peer2.sock [statistics] PORT = 3005 -UNIXPATH = /tmp/test_quota_compliance_https_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_statistics_peer2.sock [resolver] PORT = 3004 -UNIXPATH = /tmp/test_quota_compliance_https_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_resolver_peer2.sock [peerinfo] PORT = 3003 -UNIXPATH = /tmp/test_quota_compliance_https_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_https_peerinfo_peer2.sock [transport] PORT = 3002 PLUGINS = https_server -UNIXPATH = /tmp/https_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/https_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf index 51804917ce..cc797c1548 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf @@ -10,23 +10,23 @@ PORT = 4094 [arm] PORT = 4087 -UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock [statistics] PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock [resolver] PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock [peerinfo] PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock [transport] PORT = 4091 PLUGINS = tcp -UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf index a31459db0c..d1e91a2208 100644 --- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf index 51804917ce..cc797c1548 100644 --- a/src/transport/test_quota_compliance_tcp_peer1.conf +++ b/src/transport/test_quota_compliance_tcp_peer1.conf @@ -10,23 +10,23 @@ PORT = 4094 [arm] PORT = 4087 -UNIXPATH = /tmp/test_quota_compliance_tcp_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_arm_peer1.sock [statistics] PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_tcp_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_statistics_peer1.sock [resolver] PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_tcp_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_resolver_peer1.sock [peerinfo] PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_tcp_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_peerinfo_peer1.sock [transport] PORT = 4091 PLUGINS = tcp -UNIXPATH = /tmp/test_quota_compliance_tcp_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_tcp_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf index 0e477e7c6c..c80e588cea 100644 --- a/src/transport/test_quota_compliance_tcp_peer2.conf +++ b/src/transport/test_quota_compliance_tcp_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf index 8130083b14..13d417d707 100644 --- a/src/transport/test_quota_compliance_udp_peer1.conf +++ b/src/transport/test_quota_compliance_udp_peer1.conf @@ -8,22 +8,22 @@ MAX_BPS = 50000000 [arm] PORT = 4087 -UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer1.sock [statistics] PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer1.sock [resolver] PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer1.sock [peerinfo] PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer1.sock [transport] PORT = 4091 PLUGINS = udp -UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf index 835ad8ff0f..db5f32f0d3 100644 --- a/src/transport/test_quota_compliance_udp_peer2.conf +++ b/src/transport/test_quota_compliance_udp_peer2.conf @@ -8,23 +8,23 @@ MAX_BPS = 50000000 [arm] PORT = 3087 -UNIXPATH = /tmp/test_quota_compliance_udp_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_arm_peer2.sock [statistics] PORT = 3088 -UNIXPATH = /tmp/test_quota_compliance_udp_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_statistics_peer2.sock [resolver] PORT = 3089 -UNIXPATH = /tmp/test_quota_compliance_udp_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_resolver_peer2.sock [peerinfo] PORT = 3090 -UNIXPATH = /tmp/test_quota_compliance_udp_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_peerinfo_peer2.sock [transport] PORT = 3091 PLUGINS = udp -UNIXPATH = /tmp/test_quota_compliance_udp_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_udp_transport_peer2.sock diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf index 2282bcb572..63beae53cc 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer1/ [arm] PORT = 4087 -UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock [statistics] PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock [resolver] PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock [peerinfo] PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock [transport] PORT = 4091 PLUGINS = unix -UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock [transport-unix] PORT = 4092 diff --git a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf index 339d5d7c66..36a55e69c9 100644 --- a/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test_quota_compliance_peer2 [arm] PORT = 3087 -UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock [statistics] PORT = 3088 -UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock [resolver] PORT = 3089 -UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock [peerinfo] PORT = 3090 -UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock [transport] PORT = 3091 PLUGINS = unix -UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock [transport-unix] PORT = 3368 diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf index 38dfb4fe78..284a830c5b 100644 --- a/src/transport/test_quota_compliance_unix_peer1.conf +++ b/src/transport/test_quota_compliance_unix_peer1.conf @@ -7,21 +7,21 @@ PORT = 12120 [arm] PORT = 4087 -UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer1.sock [statistics] PORT = 4088 -UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer1.sock [resolver] PORT = 4089 -UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer1.sock [peerinfo] PORT = 4090 -UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer1.sock [transport] PORT = 4091 PLUGINS = unix -UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer1.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer1.sock diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf index c9dc6126bc..9e10a92f02 100644 --- a/src/transport/test_quota_compliance_unix_peer2.conf +++ b/src/transport/test_quota_compliance_unix_peer2.conf @@ -7,24 +7,24 @@ PORT = 12136 [arm] PORT = 3087 -UNIXPATH = /tmp/test_quota_compliance_unix_arm_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_arm_peer2.sock [statistics] PORT = 3088 -UNIXPATH = /tmp/test_quota_compliance_unix_statistics_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_statistics_peer2.sock [resolver] PORT = 3089 -UNIXPATH = /tmp/test_quota_compliance_unix_resolver_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_resolver_peer2.sock [peerinfo] PORT = 3090 -UNIXPATH = /tmp/test_quota_compliance_unix_peerinfo_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_peerinfo_peer2.sock [transport] PORT = 3091 PLUGINS = unix -UNIXPATH = /tmp/test_quota_compliance_unix_transport_peer2.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/test_quota_compliance_unix_transport_peer2.sock [transport-unix] PORT = 3368 diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf index d49a06b78e..eb7756f272 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf @@ -7,23 +7,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf index 137dd37ece..aafeb09f8a 100644 --- a/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_quota_compliance_wlan_peer1.conf b/src/transport/test_quota_compliance_wlan_peer1.conf index d49a06b78e..eb7756f272 100644 --- a/src/transport/test_quota_compliance_wlan_peer1.conf +++ b/src/transport/test_quota_compliance_wlan_peer1.conf @@ -7,23 +7,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_quota_compliance_wlan_peer2.conf b/src/transport/test_quota_compliance_wlan_peer2.conf index 137dd37ece..aafeb09f8a 100644 --- a/src/transport/test_quota_compliance_wlan_peer2.conf +++ b/src/transport/test_quota_compliance_wlan_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_bidirectional_connect_peer1.conf b/src/transport/test_transport_api_bidirectional_connect_peer1.conf index 88a4f54f6e..855fa2557e 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer1.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer1.conf @@ -5,23 +5,23 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p1/ [arm] PORT = 12000 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [transport-tcp] PORT = 12005 diff --git a/src/transport/test_transport_api_bidirectional_connect_peer2.conf b/src/transport/test_transport_api_bidirectional_connect_peer2.conf index 7d6ddec3ea..c81777ae37 100644 --- a/src/transport/test_transport_api_bidirectional_connect_peer2.conf +++ b/src/transport/test_transport_api_bidirectional_connect_peer2.conf @@ -5,23 +5,23 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-tcp-p2/ [arm] PORT = 12010 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12014 -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-tcp] PORT = 12015 diff --git a/src/transport/test_transport_api_bluetooth_peer1.conf b/src/transport/test_transport_api_bluetooth_peer1.conf index ccc9cec58f..d63bca9393 100644 --- a/src/transport/test_transport_api_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_bluetooth_peer1.conf @@ -8,24 +8,24 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock #PREFIX = xterm -T transport2 -e gdb --command=cmd --args #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 #PREFIX = valgrind --leak-check=full --show-reachable=yes diff --git a/src/transport/test_transport_api_bluetooth_peer2.conf b/src/transport/test_transport_api_bluetooth_peer2.conf index 5250cfdeec..4a19cddf5c 100644 --- a/src/transport/test_transport_api_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_bluetooth_peer2.conf @@ -8,24 +8,24 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #PREFIX = xterm -T transport2 -e gdb --command=cmd --args #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 #PREFIX = valgrind --leak-check=full --show-reachable=yes diff --git a/src/transport/test_transport_api_disconnect_tcp_peer1.conf b/src/transport/test_transport_api_disconnect_tcp_peer1.conf index 0de45c8cf2..66daf44ec5 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer1.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer1.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_disconnect_tcp_peer2.conf b/src/transport/test_transport_api_disconnect_tcp_peer2.conf index 0e477e7c6c..c80e588cea 100644 --- a/src/transport/test_transport_api_disconnect_tcp_peer2.conf +++ b/src/transport/test_transport_api_disconnect_tcp_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_http_peer1.conf b/src/transport/test_transport_api_http_peer1.conf index c65c38f94f..238089c42a 100644 --- a/src/transport/test_transport_api_http_peer1.conf +++ b/src/transport/test_transport_api_http_peer1.conf @@ -7,25 +7,25 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ [arm] PORT = 12085 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12084 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12083 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12082 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12081 PLUGINS = http_client #BINARY = .libs/gnunet-service-transport -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock #PREFIX = valgrind --leak-check=full #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args diff --git a/src/transport/test_transport_api_http_peer2.conf b/src/transport/test_transport_api_http_peer2.conf index 04e51fe93a..f2b748fd85 100644 --- a/src/transport/test_transport_api_http_peer2.conf +++ b/src/transport/test_transport_api_http_peer2.conf @@ -10,22 +10,22 @@ USE_IPv6 = YES [arm] PORT = 12095 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12094 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12093 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12092 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12091 PLUGINS = http_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #PREFIX = valgrind --leak-check=full diff --git a/src/transport/test_transport_api_http_reverse_peer1.conf b/src/transport/test_transport_api_http_reverse_peer1.conf index 2bdc3dbd5b..351b297464 100644 --- a/src/transport/test_transport_api_http_reverse_peer1.conf +++ b/src/transport/test_transport_api_http_reverse_peer1.conf @@ -8,25 +8,25 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ [arm] PORT = 12095 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12094 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12093 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12092 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12091 PLUGINS = http_client #BINARY = .libs/gnunet-service-transport -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PREFIX = valgrind --leak-check=full #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args @@ -35,5 +35,5 @@ PREFIX = valgrind --leak-check=full WAN_QUOTA_IN = unlimited WAN_QUOTA_OUT = unlimited PORT = 12006 -UNIXPATH = /tmp/gnunet-http_reserver_p1-service-ats.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-http_reserver_p1-service-ats.sock diff --git a/src/transport/test_transport_api_http_reverse_peer2.conf b/src/transport/test_transport_api_http_reverse_peer2.conf index b38b5e56dc..0283d12b51 100644 --- a/src/transport/test_transport_api_http_reverse_peer2.conf +++ b/src/transport/test_transport_api_http_reverse_peer2.conf @@ -17,24 +17,24 @@ EXTERNAL_HOSTNAME_ONLY = YES [arm] PORT = 12085 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12084 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12083 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12082 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12081 PLUGINS = http_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock PREFIX = valgrind --leak-check=full #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args diff --git a/src/transport/test_transport_api_https_peer1.conf b/src/transport/test_transport_api_https_peer1.conf index 4e0cac4522..e682b9b76b 100644 --- a/src/transport/test_transport_api_https_peer1.conf +++ b/src/transport/test_transport_api_https_peer1.conf @@ -12,19 +12,19 @@ PORT = 12105 [statistics] PORT = 12104 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12103 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12102 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12101 PLUGINS = https_client -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_https_peer2.conf b/src/transport/test_transport_api_https_peer2.conf index 443717ebd5..96cc507239 100644 --- a/src/transport/test_transport_api_https_peer2.conf +++ b/src/transport/test_transport_api_https_peer2.conf @@ -16,23 +16,23 @@ CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt [arm] PORT = 12115 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12114 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12113 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12112 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12111 PLUGINS = https_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf index 004893a992..2e99125938 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf @@ -9,23 +9,23 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf index 121566e0be..06bd8aecac 100644 --- a/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf +++ b/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_manipulation_cfg_peer1.conf b/src/transport/test_transport_api_manipulation_cfg_peer1.conf index 786256777a..952230a491 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer1.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer1.conf @@ -9,23 +9,23 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp MANIPULATE_DELAY_IN = 100 ms MANIPULATE_DELAY_OUT = 100 ms
\ No newline at end of file diff --git a/src/transport/test_transport_api_manipulation_cfg_peer2.conf b/src/transport/test_transport_api_manipulation_cfg_peer2.conf index 6985bf1725..85127bee4c 100644 --- a/src/transport/test_transport_api_manipulation_cfg_peer2.conf +++ b/src/transport/test_transport_api_manipulation_cfg_peer2.conf @@ -9,23 +9,23 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #MANIPULATE_DELAY_IN = 0 ms #MANIPULATE_DELAY_OUT = 0 ms diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf index ed11174f07..c05439ab2a 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf +++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp diff --git a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf index 0e477e7c6c..c80e588cea 100644 --- a/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf +++ b/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf index ed11174f07..c05439ab2a 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf +++ b/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp diff --git a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf index 0e477e7c6c..c80e588cea 100644 --- a/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf +++ b/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_multi_peer1.conf b/src/transport/test_transport_api_multi_peer1.conf index 5105324f45..0313f5b600 100644 --- a/src/transport/test_transport_api_multi_peer1.conf +++ b/src/transport/test_transport_api_multi_peer1.conf @@ -18,24 +18,24 @@ PORT = 12143 [arm] PORT = 12149 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12148 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12147 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12146 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12145 PLUGINS = tcp udp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [transport-unix] PORT = 12144 diff --git a/src/transport/test_transport_api_multi_peer2.conf b/src/transport/test_transport_api_multi_peer2.conf index 54ab6b8fd8..2d548a66d9 100644 --- a/src/transport/test_transport_api_multi_peer2.conf +++ b/src/transport/test_transport_api_multi_peer2.conf @@ -21,24 +21,24 @@ PORT = 12153 [arm] PORT = 12159 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12158 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12157 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12156 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12155 PLUGINS = tcp udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-unix] PORT = 12154 diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf index f20b62b85d..8f50bf1130 100644 --- a/src/transport/test_transport_api_reliability_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_reliability_bluetooth_peer1.conf @@ -8,23 +8,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf index fe2535d9f1..1816ec99ed 100644 --- a/src/transport/test_transport_api_reliability_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_reliability_bluetooth_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_http_peer1.conf b/src/transport/test_transport_api_reliability_http_peer1.conf index 1e493aaba7..a04b6d3d86 100644 --- a/src/transport/test_transport_api_reliability_http_peer1.conf +++ b/src/transport/test_transport_api_reliability_http_peer1.conf @@ -12,22 +12,22 @@ PORT = 12180 [arm] PORT = 12185 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12184 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12183 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12182 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12181 PLUGINS = http_client -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_http_peer2.conf b/src/transport/test_transport_api_reliability_http_peer2.conf index 4f7bbaf280..8d85cf7b18 100644 --- a/src/transport/test_transport_api_reliability_http_peer2.conf +++ b/src/transport/test_transport_api_reliability_http_peer2.conf @@ -9,22 +9,22 @@ BINDTO = 127.0.0.1 [arm] PORT = 12195 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12194 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12193 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12192 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12191 PLUGINS = http_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_https_peer1.conf b/src/transport/test_transport_api_reliability_https_peer1.conf index 6f20604e2d..07f8590a27 100644 --- a/src/transport/test_transport_api_reliability_https_peer1.conf +++ b/src/transport/test_transport_api_reliability_https_peer1.conf @@ -6,22 +6,22 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-https-p1/ [arm] PORT = 12305 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12304 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12303 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12302 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12301 PLUGINS = https_client -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_https_peer2.conf b/src/transport/test_transport_api_reliability_https_peer2.conf index 82e5cc01d0..7f7f807787 100644 --- a/src/transport/test_transport_api_reliability_https_peer2.conf +++ b/src/transport/test_transport_api_reliability_https_peer2.conf @@ -9,23 +9,23 @@ CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt [arm] PORT = 12315 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12314 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12313 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12312 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12311 PLUGINS = https_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf index d248984d65..6de950189a 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf @@ -14,23 +14,23 @@ TIMEOUT = 5 s [arm] PORT = 1204 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12023 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12022 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12021 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 29542 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf index bb221e8911..5e8b54a686 100644 --- a/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf @@ -13,23 +13,23 @@ TIMEOUT = 5 s [arm] PORT = 12034 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12033 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12032 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12031 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 45923 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_tcp_peer1.conf b/src/transport/test_transport_api_reliability_tcp_peer1.conf index 0de45c8cf2..66daf44ec5 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer1.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer1.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_tcp_peer2.conf b/src/transport/test_transport_api_reliability_tcp_peer2.conf index 0e1667b891..e6baa32f67 100644 --- a/src/transport/test_transport_api_reliability_tcp_peer2.conf +++ b/src/transport/test_transport_api_reliability_tcp_peer2.conf @@ -9,21 +9,21 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_wlan_peer1.conf b/src/transport/test_transport_api_reliability_wlan_peer1.conf index d49a06b78e..eb7756f272 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer1.conf @@ -7,23 +7,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_reliability_wlan_peer2.conf b/src/transport/test_transport_api_reliability_wlan_peer2.conf index 137dd37ece..aafeb09f8a 100644 --- a/src/transport/test_transport_api_reliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_reliability_wlan_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_nat_peer1.conf b/src/transport/test_transport_api_tcp_nat_peer1.conf index d50bac5439..0b2e7a4d34 100644 --- a/src/transport/test_transport_api_tcp_nat_peer1.conf +++ b/src/transport/test_transport_api_tcp_nat_peer1.conf @@ -14,22 +14,22 @@ TIMEOUT = 5 s [arm] PORT = 1204 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12023 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12022 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12021 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 29542 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_nat_peer2.conf b/src/transport/test_transport_api_tcp_nat_peer2.conf index 395bbadc6d..b2afa4a8d0 100644 --- a/src/transport/test_transport_api_tcp_nat_peer2.conf +++ b/src/transport/test_transport_api_tcp_nat_peer2.conf @@ -13,21 +13,21 @@ TIMEOUT = 5 s [arm] PORT = 12034 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12033 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12032 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12031 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 45923 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_tcp_peer1.conf b/src/transport/test_transport_api_tcp_peer1.conf index ed11174f07..c05439ab2a 100644 --- a/src/transport/test_transport_api_tcp_peer1.conf +++ b/src/transport/test_transport_api_tcp_peer1.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp diff --git a/src/transport/test_transport_api_tcp_peer2.conf b/src/transport/test_transport_api_tcp_peer2.conf index 0e477e7c6c..c80e588cea 100644 --- a/src/transport/test_transport_api_tcp_peer2.conf +++ b/src/transport/test_transport_api_tcp_peer2.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_http_peer1.conf b/src/transport/test_transport_api_timeout_http_peer1.conf index 9af0c22faa..9c3f909984 100644 --- a/src/transport/test_transport_api_timeout_http_peer1.conf +++ b/src/transport/test_transport_api_timeout_http_peer1.conf @@ -9,25 +9,25 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-http-p1/ [arm] PORT = 12085 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12084 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12083 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12082 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12081 PLUGINS = http_client #BINARY = .libs/gnunet-service-transport -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock #PREFIX = valgrind --leak-check=full #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args diff --git a/src/transport/test_transport_api_timeout_http_peer2.conf b/src/transport/test_transport_api_timeout_http_peer2.conf index e572dbe7f4..7d0359fd2f 100644 --- a/src/transport/test_transport_api_timeout_http_peer2.conf +++ b/src/transport/test_transport_api_timeout_http_peer2.conf @@ -13,22 +13,22 @@ BINDTO = 127.0.0.1 [arm] PORT = 12095 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12094 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12093 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12092 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12091 PLUGINS = http_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #PREFIX = valgrind --leak-check=full diff --git a/src/transport/test_transport_api_timeout_https_peer1.conf b/src/transport/test_transport_api_timeout_https_peer1.conf index 674014afa2..00980de99c 100644 --- a/src/transport/test_transport_api_timeout_https_peer1.conf +++ b/src/transport/test_transport_api_timeout_https_peer1.conf @@ -9,19 +9,19 @@ PORT = 12105 [statistics] PORT = 12104 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12103 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12102 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12101 PLUGINS = https_client -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_https_peer2.conf b/src/transport/test_transport_api_timeout_https_peer2.conf index 2891cf665e..017aa908e0 100644 --- a/src/transport/test_transport_api_timeout_https_peer2.conf +++ b/src/transport/test_transport_api_timeout_https_peer2.conf @@ -9,23 +9,23 @@ CERT_FILE = $GNUNET_TEST_HOME/https_cert_p2.crt [arm] PORT = 12115 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12114 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12113 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12112 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12111 PLUGINS = https_server -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_tcp_peer1.conf b/src/transport/test_transport_api_timeout_tcp_peer1.conf index 004893a992..2e99125938 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer1.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer1.conf @@ -9,23 +9,23 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_tcp_peer2.conf b/src/transport/test_transport_api_timeout_tcp_peer2.conf index 4e1e9791a9..b3c68ac0e0 100644 --- a/src/transport/test_transport_api_timeout_tcp_peer2.conf +++ b/src/transport/test_transport_api_timeout_tcp_peer2.conf @@ -11,23 +11,23 @@ PORT = 12100 [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_udp_peer1.conf b/src/transport/test_transport_api_timeout_udp_peer1.conf index 71e85bdc7a..efa08fde5e 100644 --- a/src/transport/test_transport_api_timeout_udp_peer1.conf +++ b/src/transport/test_transport_api_timeout_udp_peer1.conf @@ -10,24 +10,24 @@ MAX_BPS = 50000000 [arm] PORT = 12045 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12044 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12043 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12042 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12041 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_udp_peer2.conf b/src/transport/test_transport_api_timeout_udp_peer2.conf index c545ec7faf..14618f3b45 100644 --- a/src/transport/test_transport_api_timeout_udp_peer2.conf +++ b/src/transport/test_transport_api_timeout_udp_peer2.conf @@ -9,23 +9,23 @@ MAX_BPS = 50000000 [arm] PORT = 12055 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12054 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12053 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12052 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12051 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_timeout_unix_peer1.conf b/src/transport/test_transport_api_timeout_unix_peer1.conf index 34e6ae9455..d43ef4a332 100644 --- a/src/transport/test_transport_api_timeout_unix_peer1.conf +++ b/src/transport/test_transport_api_timeout_unix_peer1.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ [arm] PORT = 12125 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12124 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12123 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12122 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12121 PLUGINS = unix -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [transport-unix] PORT = 12120 diff --git a/src/transport/test_transport_api_timeout_unix_peer2.conf b/src/transport/test_transport_api_timeout_unix_peer2.conf index d0a5c0953c..9feed6592f 100644 --- a/src/transport/test_transport_api_timeout_unix_peer2.conf +++ b/src/transport/test_transport_api_timeout_unix_peer2.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ [arm] PORT = 12135 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12134 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12133 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12132 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12131 PLUGINS = unix -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-unix] PORT = 12136 diff --git a/src/transport/test_transport_api_udp_nat_peer1.conf b/src/transport/test_transport_api_udp_nat_peer1.conf index 89e5e8d3eb..526f3e6b19 100644 --- a/src/transport/test_transport_api_udp_nat_peer1.conf +++ b/src/transport/test_transport_api_udp_nat_peer1.conf @@ -13,23 +13,23 @@ PORT = 0 [arm] PORT = 12065 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12064 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12063 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12062 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12061 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_udp_nat_peer2.conf b/src/transport/test_transport_api_udp_nat_peer2.conf index 9f31cfa214..24bb6f6917 100644 --- a/src/transport/test_transport_api_udp_nat_peer2.conf +++ b/src/transport/test_transport_api_udp_nat_peer2.conf @@ -11,23 +11,23 @@ PORT = 12070 [arm] PORT = 12075 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12074 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12073 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12072 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12071 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_udp_peer1.conf b/src/transport/test_transport_api_udp_peer1.conf index 046cd86ca8..70af52994d 100644 --- a/src/transport/test_transport_api_udp_peer1.conf +++ b/src/transport/test_transport_api_udp_peer1.conf @@ -12,24 +12,24 @@ BINDTO6 = ::1 [arm] PORT = 12045 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12044 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12043 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12042 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12041 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_udp_peer2.conf b/src/transport/test_transport_api_udp_peer2.conf index 5def1dfeec..6400ef5546 100644 --- a/src/transport/test_transport_api_udp_peer2.conf +++ b/src/transport/test_transport_api_udp_peer2.conf @@ -11,23 +11,23 @@ BINDTO6 = ::1 [arm] PORT = 12055 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12054 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12053 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12052 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12051 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_unix_peer1.conf b/src/transport/test_transport_api_unix_peer1.conf index 34e6ae9455..d43ef4a332 100644 --- a/src/transport/test_transport_api_unix_peer1.conf +++ b/src/transport/test_transport_api_unix_peer1.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ [arm] PORT = 12125 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12124 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12123 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12122 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12121 PLUGINS = unix -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [transport-unix] PORT = 12120 diff --git a/src/transport/test_transport_api_unix_peer2.conf b/src/transport/test_transport_api_unix_peer2.conf index d0a5c0953c..9feed6592f 100644 --- a/src/transport/test_transport_api_unix_peer2.conf +++ b/src/transport/test_transport_api_unix_peer2.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ [arm] PORT = 12135 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12134 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12133 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12132 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12131 PLUGINS = unix -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-unix] PORT = 12136 diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf index f20b62b85d..8f50bf1130 100644 --- a/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf +++ b/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf @@ -8,23 +8,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf index fe2535d9f1..1816ec99ed 100644 --- a/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf +++ b/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = bluetooth -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf index 7fe9a08103..eeee8ee627 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf @@ -8,23 +8,23 @@ MAX_BPS = 1073741824 [arm] PORT = 12045 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12044 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12043 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12042 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12041 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf index 83ecb9eb24..678642a41b 100644 --- a/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf @@ -8,23 +8,23 @@ MAX_BPS = 1073741824 [arm] PORT = 12055 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12054 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12053 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12052 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12051 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_udp_peer1.conf b/src/transport/test_transport_api_unreliability_udp_peer1.conf index 17c644b0b5..d16be3b20d 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer1.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer1.conf @@ -8,23 +8,23 @@ MAX_BPS = 5000000 [arm] PORT = 12045 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12044 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12043 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12042 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12041 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_udp_peer2.conf b/src/transport/test_transport_api_unreliability_udp_peer2.conf index 2208668618..a7e6a57fb1 100644 --- a/src/transport/test_transport_api_unreliability_udp_peer2.conf +++ b/src/transport/test_transport_api_unreliability_udp_peer2.conf @@ -8,23 +8,23 @@ MAX_BPS = 5000000 [arm] PORT = 12055 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12054 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12053 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12052 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12051 PLUGINS = udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_unix_peer1.conf b/src/transport/test_transport_api_unreliability_unix_peer1.conf index 34e6ae9455..d43ef4a332 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer1.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer1.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p1/ [arm] PORT = 12125 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12124 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12123 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12122 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12121 PLUGINS = unix -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock [transport-unix] PORT = 12120 diff --git a/src/transport/test_transport_api_unreliability_unix_peer2.conf b/src/transport/test_transport_api_unreliability_unix_peer2.conf index fd8a29cffb..f863d4d428 100644 --- a/src/transport/test_transport_api_unreliability_unix_peer2.conf +++ b/src/transport/test_transport_api_unreliability_unix_peer2.conf @@ -4,24 +4,24 @@ GNUNET_TEST_HOME = /tmp/test-transport/api-unix-p2/ [arm] PORT = 12135 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12134 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12133 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12132 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12131 PLUGINS = unix -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-unix] PORT = 12131 diff --git a/src/transport/test_transport_api_unreliability_wlan_peer1.conf b/src/transport/test_transport_api_unreliability_wlan_peer1.conf index d49a06b78e..eb7756f272 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer1.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer1.conf @@ -7,23 +7,23 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock diff --git a/src/transport/test_transport_api_unreliability_wlan_peer2.conf b/src/transport/test_transport_api_unreliability_wlan_peer2.conf index 137dd37ece..aafeb09f8a 100644 --- a/src/transport/test_transport_api_unreliability_wlan_peer2.conf +++ b/src/transport/test_transport_api_unreliability_wlan_peer2.conf @@ -8,22 +8,22 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index 68b507ad99..8b870f1d48 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf @@ -8,24 +8,24 @@ TESTMODE = 1 [arm] PORT = 12164 -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12163 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12162 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12161 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12160 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock #PREFIX = xterm -T transport2 -e gdb --command=cmd --args #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 #PREFIX = valgrind --leak-check=full --show-reachable=yes diff --git a/src/transport/test_transport_api_wlan_peer2.conf b/src/transport/test_transport_api_wlan_peer2.conf index 7f18dbfb0a..c32ce5ced5 100644 --- a/src/transport/test_transport_api_wlan_peer2.conf +++ b/src/transport/test_transport_api_wlan_peer2.conf @@ -8,24 +8,24 @@ TESTMODE = 2 [arm] PORT = 12174 -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12173 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12172 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12171 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12170 PLUGINS = wlan -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock #PREFIX = xterm -T transport2 -e gdb --command=cmd --args #PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600 #PREFIX = valgrind --leak-check=full --show-reachable=yes diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf index a11c6536ad..ed04799f52 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf @@ -9,24 +9,24 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp [transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO] diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf index 0cf3c6c4a3..07d779babd 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf @@ -9,24 +9,24 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp udp [transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO] diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf index be699a6c32..f4d955f06b 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf @@ -9,24 +9,24 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp [transport-blacklist-ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO] diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf index 1aefad0d9a..830c3d4c02 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf @@ -9,25 +9,25 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238] diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf index e0cbad2b98..ef4efd3731 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf @@ -9,25 +9,25 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12010 PLUGINS = tcp udp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238] ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = tcp
\ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf index 590b96d137..254425a09a 100644 --- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf +++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf @@ -9,25 +9,25 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] #PREFIX = valgrind --leak-check=full PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock [transport-blacklist-CQQU54C07Q4P8HGGM6ATP8NV8ACJONGK5NJSP0UAL1RGH34V553JT70UEBO52VKOBHGJ6RJVDPUKUJ2F9U6EBAICJJEBHIHAC1TI238] ABB6BSVJT4LGSSFGJO91RVBE5R53UHUV55SIDAV3C01RB6CEUV0HDNVFOEUF69BRRROK361TOH6DUV3GUTANUB57N112VB5FPFKF2CO = tcp
\ No newline at end of file diff --git a/src/transport/test_transport_blacklisting_cfg_peer1.conf b/src/transport/test_transport_blacklisting_cfg_peer1.conf index ed11174f07..c05439ab2a 100644 --- a/src/transport/test_transport_blacklisting_cfg_peer1.conf +++ b/src/transport/test_transport_blacklisting_cfg_peer1.conf @@ -9,22 +9,22 @@ TIMEOUT = 5 s [arm] PORT = 12005 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p1-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock [statistics] PORT = 12004 -UNIXPATH = /tmp/gnunet-p1-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-statistics.sock [resolver] PORT = 12003 -UNIXPATH = /tmp/gnunet-p1-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock [peerinfo] PORT = 12002 -UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock [transport] PORT = 12001 -UNIXPATH = /tmp/gnunet-p1-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock PLUGINS = tcp diff --git a/src/transport/test_transport_blacklisting_cfg_peer2.conf b/src/transport/test_transport_blacklisting_cfg_peer2.conf index 0e1667b891..e6baa32f67 100644 --- a/src/transport/test_transport_blacklisting_cfg_peer2.conf +++ b/src/transport/test_transport_blacklisting_cfg_peer2.conf @@ -9,21 +9,21 @@ TIMEOUT = 5 s [arm] PORT = 12014 DEFAULTSERVICES = transport -UNIXPATH = /tmp/gnunet-p2-service-arm.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock [statistics] PORT = 12013 -UNIXPATH = /tmp/gnunet-p2-service-statistics.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock [resolver] PORT = 12012 -UNIXPATH = /tmp/gnunet-p2-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock [peerinfo] PORT = 12011 -UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock [transport] PORT = 12010 PLUGINS = tcp -UNIXPATH = /tmp/gnunet-p2-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in index d9abdbf11d..945d7b4cbd 100644 --- a/src/transport/transport.conf.in +++ b/src/transport/transport.conf.in @@ -8,7 +8,7 @@ NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; PLUGINS = tcp udp -UNIXPATH = /tmp/gnunet-service-transport.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-transport.sock BLACKLIST_FILE = $GNUNET_CONFIG_HOME/transport/blacklist UNIX_MATCH_UID = NO UNIX_MATCH_GID = YES diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in index 42cc5855ff..8066c42c1d 100644 --- a/src/util/resolver.conf.in +++ b/src/util/resolver.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-resolver.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-resolver.sock UNIX_MATCH_UID = NO UNIX_MATCH_GID = NO # DISABLE_SOCKET_FORWARDING = NO diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in index 91610eb2af..5a850deaeb 100644 --- a/src/vpn/vpn.conf.in +++ b/src/vpn/vpn.conf.in @@ -5,7 +5,7 @@ HOSTNAME = localhost BINARY = gnunet-service-vpn ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; -UNIXPATH = /tmp/gnunet-service-vpn.sock +UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES |