last XDG change: use GNUNET_RUNTIME_DIR instead of /tmp for UNIXPATHs by default

diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 1b079c98c12c831a96a7091d10fdcad3bb50b104..6bffca79657c3cfdd63d159ecfb376e9972b13fd 100644 (file)
--- 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 d5116304fcc7e623251910b1f1d89c5e8d5b0b3a..c53f50b0881e81fefa5a84b41851691ce32e2dcf 100644 (file)
--- 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 9a0fa1e93f50897a0fc0a5767c6aabbb7fe24696..c5a2c2d3da7925a3eb2cae29488beeb68765266e 100644 (file)
--- 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 d6c1541c826a491d28ff2566cd773f60a771d65c..79efd79037c70f621c160a0a7bcde6cd430ea43c 100644 (file)
--- 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 46187d163007542198fe5ffab7bfc2aebccd3cfb..fb3a7889f892080bf5784800aa42c7524ec04f1b 100644 (file)
--- 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 de526305cd60eeeccb9fadf7f7255125847a4bde..1a1fa23b95929e814792b4d1a5254f9198056740 100644 (file)
--- 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 a59a1012afdab694c14557bf1a44d07141282033..a134da9dcca75a86ea558da8bfaa2957dccd313d 100644 (file)
--- 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 b4386e80db36de3eff057b54a81b0b438b813c17..48d2dc507c5f464889492b4dfc84707e4768a697 100644 (file)
--- 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 f8e71957ac5e713e8870fa31bd2162966fc67df6..fbf206d206413bee2ba46f6e2ce630a0441fcc0e 100644 (file)
--- 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 440dac5c93ae0c5e966c79ea2a013febf16171fa..4ece5b09663e11f355fa8d2f61be8de4c76a702e 100644 (file)
--- 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 d461f94602f41cc95b97061b2c41a7caa3a57b1e..b976fd4117674ac0acb0f5ee15f71e046b9771b3 100644 (file)
--- 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 436846f5cc67b953fd41ffb4444db03619638b31..739b6b1a1cd72603033d32b9e54a571de038103c 100644 (file)
--- 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 971d68cd0c3699deeee1b40fc5fffd6d26eb304b..ebf77997c029c4214c62177fc552263b1baf581a 100644 (file)
--- 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 b690ba151fc700f346090931913ab2dfe2c965d5..c03eeed1c8bfc4b9a5a2ad354100181883121ce2 100644 (file)
--- 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 ba0257d344091d600782db4c0a553808def991ec..713854aff2618b615d7365da3a4d7b90087024c8 100644 (file)
--- 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 9f4527a2f7509a976b1ae6fce3dc260ecba629e3..134f921b6a86080524e98233d7668c456f1dae60 100644 (file)
--- 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 268b8fc00eabab3cca62e94aeb4b239d7398f51e..97f48522568538419c1caae962035fa385f1cfb5 100644 (file)
--- 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 721f5c268ced5e7de9f86f919e9964c9cf91efc1..ce1fcda14cc589f39e32975f932f850e61d44ff8 100644 (file)
--- 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 c62b4607c39ca2ce451c0a4b05ced960e0133270..b96e7fefd087f0580080e4b2eaf1fd5d8a3d4bcb 100644 (file)
--- 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 452eef63eac7cbc8d90c709754a4377d66928e07..3c3275d74cd6d75eb9f1aa6c54e8f9fe76f2e02d 100644 (file)
--- 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 7d9efff6e71a4a848b9ec6ab0950166f52c26d56..35098bbcecb3f6a187dd624e5e770f0d84e7f44f 100644 (file)
--- 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 7a9781a3aaa1ba8f16eddbe53472aa86ead94f0c..b7e03c5d22f55568725124fb295d851b3733f7fd 100644 (file)
--- 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 ee9a653023b106834f32f057073fb2ec8b54d5f4..f97b8f0ff3cf8f4040139b6ebce30f924b903dff 100644 (file)
--- 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 65f54613a59361f74b1a5be47b6328b876f4f9ef..d044740ce289e368c7f8ac539622dbf1f673c518 100644 (file)
--- 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 5bfffad86a52e34abaa38aa50778f8857d2a9d0a..6b3974684d0dd5195e7118ac6ae5f3ba83dfc825 100644 (file)
--- 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 bb4cae99a14624a95eac6ea817e488806dbea666..087185b0c7ec7365d9cb6d11edd2215cb6b0e818 100644 (file)
--- 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 99f7dcc549c995bd9dec3096c1a93c42afc55154..beb0ae9a96fffa05d6b15a644d0dd2b862e54e47 100644 (file)
--- 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 547e5580bc4e52bce03b991e404cd742ab689070..da6a1823a36c7870547ad5ed1e1d4706d71c0387 100644 (file)
--- 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 5830c427be217f2109e9f037e9e81fbe12e18e1c..d1aef4ca7d5913ec0133a348ca82f1ab2660fcc3 100644 (file)
--- 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 377ba4a41e856694242970304201b007d72f7212..0d59325aabbf3da155a6b7969ba9cc36ceb4f4c4 100644 (file)
--- 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 547a9e2ff58d51fe6c6aa014aa3f613e2483f050..f3fca70a2e5a045547352cfa506d4df7774330b9 100644 (file)
--- 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 f65ba0ae561dc618298fe8f712e601450228bce5..1bdcd8101f74736e2cedeb0fdd7af685c5a06767 100644 (file)
--- 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 db1a397f371c2c810514ad0c4edf0d5c7323f071..afe3ef69a5de032735a05ac754979d9baa72bc4f 100644 (file)
--- 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 57cca3343dd1ad88644acef0ee6c181fd2daec60..dc27bfb9aaf40759d46a56b1545f6759b3141606 100644 (file)
--- 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 1b68775b935d341fce736503d69473828ac0417d..1b0d087e6ed4c630a32ef0b4d482667916c01208 100644 (file)
--- 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 3349f6aa3379d12c0de3914baccf6a96cf23ccac..54ea63fd8aee9e676702bf66ede216a9385b06d3 100644 (file)
--- 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 08b08762dc0315a9e3847d3288cc7da8a5df2d79..064ac619e96c7af6ff115226f5fb72e93a143e1d 100644 (file)
--- 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 5f42f22e1ec2bfc4253fac6e2fa3dbe0cfd1005b..942360c93dff9ce69e30a53fbaf1aea94dd40122 100644 (file)
--- 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 87daeb41d7071e933d1c976dbd68b602f6037898..f03e118d86d7fec785d2547dac6c2ad6994029c0 100644 (file)
--- 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 46f0ddd243fca3bfb6088af101ab06e112255a14..b475ff284a3774fd8c56d97b3424ad8ab3670c22 100644 (file)
--- 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 67ed37ea6126386f8f4c4b5fbb7e3a39c240f56a..8f1f776a502754aca1ba022dfb905442ba7aa2af 100644 (file)
--- 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 a581d7f02c11bde48e56eed57e9e45a792d43669..c10b042f5a07a8b5499d11984134f52d5ed5efbe 100644 (file)
--- 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 c1129b51939ad1a738751c41f5d620a763b8cc76..1321b0c35451afeff29c99b5161e04a985be177e 100644 (file)
--- 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 f4d91d3361c85865b3552d28cd6884b38937fb29..67f0e0d761557444ef04f1a10be7dc7a45e56473 100644 (file)
--- 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 ca8d684cced8de31619cb54fba27f55965e6d1fb..54d8b050d1b0c619da8a7aaaa496afea684f1ef2 100644 (file)
--- 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 5aaf8ee5102b81a46639b8304d5d0ae7862fe50f..40757ba1baaf973ad65eeeb851f6848c76ad3de0 100644 (file)
--- 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 7b01fc9a36fcb262c27e3f5aebe2e1b6f9e714c5..5a70d9d4c311f2a6e6125afeeb5519fd1eed4f4b 100644 (file)
--- 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 b1f3c33be5dbe3c88c85cfde513c7a42032453ed..eb972291529df3340dd8331fd3b38237195c82f1 100644 (file)
--- 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 39ede6750ff8dbeb2b68c8999b070f665f2c4803..cb061bd70b66794cd9350427d493d07d167d97a6 100644 (file)
--- 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 65299cecfc9d0ea962da6623ca36f37d183f5902..305893b00256e4643ce91894b27a1bbbec4ca76d 100644 (file)
--- 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 91dbaabad9b77edc4e937c08db29f690c0d2f783..66695af2ef0a2843a8a56ad943b439eb96119554 100644 (file)
--- 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 9722828acc455eb9f3cdfa646a1241eb068ae930..e9a1b77bfdc41af823180175fb8954a282e105e3 100644 (file)
--- 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 fbc2722353dab5a5be91f1acfb9b446d26cbcb4f..ecae4641c3c848e4c76e2d223f5ac2fa9bb2c5eb 100644 (file)
--- 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 caf68396d79fe3f298a0d81054554c1e7ad55e31..7600ce7b6eb873b97f9ee88791fe6753a562cc36 100644 (file)
--- 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 134fe64c4939da6fa7ff1c2c289f92ec09e81225..2a06d3bc0de8f4fd38a76c699af5ce5c25e30902 100644 (file)
--- 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 d8cd2580bfc97390fca056b3f17683e009cbd272..b6239140ef2ee8ccb3b7d605e9a9fd700d642f4b 100644 (file)
--- 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 5604004987e3b386412e9da5f83fc52c1792451e..3233c44d7ec7863ce12be811ca34bc8b3ecf58a0 100644 (file)
--- 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 7dfeb0d979dec74dd475c3d6fe9e6934152f59f0..d1f5abe6d4023104b1f4727f0ce95cec840e4335 100644 (file)
--- 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 da2dde680f3601db84d93f8a5abfdfcec84ca6cc..1e646239a857835389c265c82d6f122458bd02ca 100644 (file)
--- 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 98c6aeda8230d3de7bffebfef4865a59e56c41d3..4af03bbd0c29f995777134a986efb5413c94ee3c 100644 (file)
--- 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 5a20273a20cb39a12be957d7253b3c4268cd4057..45eea4cc1b39c54da3b71c952843fb3a7088eb25 100644 (file)
--- 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 59376a61ec780658b4ac686db3b5a54ba1dba574..26768347fae4bda4aebd4de5d2705c90922572b4 100644 (file)
--- 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 6e84b84d673325ed976eecbc5e2c1662f8e59e35..e9335cd29b4474bf7284ddf0340d48f8fcb0edf6 100644 (file)
--- 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 064b7fd8c1b3ddda3731f5aea6f20a24e2889ed3..325fbad828361d9b256d3b3a9d03b1c71b71a5b1 100644 (file)
--- 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 81e11cff0454244ca92735e7542a33b81bb23efd..9f700cfe6d16898eb19cf25f3a06d7483c84caa1 100644 (file)
--- 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 2b8f11fd70f2c41787dbce7a2970baa3b62fc67b..0d8ef692d54da37bdb86d2d3831ecbdd2dcdff4b 100644 (file)
--- 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 7ce0af99f0c10895facd7f7130d0923940c6d40d..c7d30378204cbd938c3f908d40c78cfbb95f63c1 100644 (file)
--- 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 c0ea8630d6c8a792c97828b057b51b04676757d9..572f51d7174ec2286993b3053d4c05a34a1fca18 100644 (file)
--- 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 ac1479b48a4109b11298c8bdcf8b34e902435f51..8c8c179f708217d9236e519ec9f4ced47bf6284f 100644 (file)
--- 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 108142d5ebffd4c7774b5054ed3529ae56cd77ff..79334c4cd49191461015970dd66030caaea22581 100644 (file)
--- 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 c7014065f17c4e2fa31ad1fdc89c7fce7a650bbd..ad8a346c0f0b9f847afb253f8227da9948d09212 100644 (file)
--- 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 d66ab19066b3f54d81281b447edca9723c7e5947..3042ce862a05218abc0182a2609abc6a93dc2f06 100644 (file)
--- 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 a4b2f2b9125e27dd140bf6a844bc255beef7b4ba..b5ba77b7686ac9a68a534cf0c3ba7936d46993be 100644 (file)
--- 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 885fed8d72350f48b9c15319e2e84f8fbc2f3932..e561cfd30e45fb95f51f2163ec3e3f781e86dde3 100644 (file)
--- 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 f20b62b85dd9631f0f84abcd3c8da79e5382f7a5..8f50bf11307610b7906da945f67f607fe553dd34 100644 (file)
--- 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 fe2535d9f163ad002d63c5e5b0663bf34b12aae5..1816ec99ed5d5f7e4e601c7d012d87175c6d6cf2 100644 (file)
--- 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 f20b62b85dd9631f0f84abcd3c8da79e5382f7a5..8f50bf11307610b7906da945f67f607fe553dd34 100644 (file)
--- 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 fe2535d9f163ad002d63c5e5b0663bf34b12aae5..1816ec99ed5d5f7e4e601c7d012d87175c6d6cf2 100644 (file)
--- 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 98d1db1cbd46e1a0cae4bc8c86dc67462827de9f..10ee02936189c7844ad6ee6f1060557ce7447604 100644 (file)
--- 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 953915cf623d54aed0d4c9bf4d8dbd596e620754..470b3003aefc0a5a8c7640805535e3caad26b117 100644 (file)
--- 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 98d1db1cbd46e1a0cae4bc8c86dc67462827de9f..10ee02936189c7844ad6ee6f1060557ce7447604 100644 (file)
--- 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 953915cf623d54aed0d4c9bf4d8dbd596e620754..470b3003aefc0a5a8c7640805535e3caad26b117 100644 (file)
--- 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 9493fdee28b16fae00e44e60c873e0247218f3f3..52504d34dafb3106a0226d63fa25c43115b3748a 100644 (file)
--- 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 eefc24f1daa3c7276efa793c7ae94831da4f7d19..59ac327d561e4b9b0911727af3bb89bb4d123ac9 100644 (file)
--- 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 9493fdee28b16fae00e44e60c873e0247218f3f3..52504d34dafb3106a0226d63fa25c43115b3748a 100644 (file)
--- 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 eefc24f1daa3c7276efa793c7ae94831da4f7d19..59ac327d561e4b9b0911727af3bb89bb4d123ac9 100644 (file)
--- 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 51804917ceb2f038dd7bc0aba088241218f1ae78..cc797c1548fc754cfa5577cc7b855d3297eca585 100644 (file)
--- 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 a31459db0cfc318dfa1d7377f407ba2244cde860..d1e91a2208a846cb8d506670c0bafd80bdbff84c 100644 (file)
--- 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 51804917ceb2f038dd7bc0aba088241218f1ae78..cc797c1548fc754cfa5577cc7b855d3297eca585 100644 (file)
--- 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 0e477e7c6cd01dd21b63a6ed3b181fe98212550e..c80e588cead0f4411aae99d1752d0f52a3b1cf29 100644 (file)
--- 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 8130083b144b8be2a665ff0a852456c8500a6e64..13d417d7077cbd483ae5f35127b5704601c84fa1 100644 (file)
--- 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 835ad8ff0f60f0864bf2a7d46b609cb5169a7939..db5f32f0d313c44340d83d5f8dfec68e272f8c57 100644 (file)
--- 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 2282bcb572e37e510f74dd9d24021ee6ad669815..63beae53ccddfc75210676f757f5ad9337dfef72 100644 (file)
--- 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 339d5d7c66ec436ed2a4263ae704d3f8c6536ebf..36a55e69c9055221eb51a55cf8ae5df594699d2a 100644 (file)
--- 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 38dfb4fe78851c6c7ae1dab153b6a70cdc1c46f7..284a830c5b73fb84d498c153d0c3b32e7b617fa7 100644 (file)
--- 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 c9dc6126bcb737e7df950f0662c1e14972379c22..9e10a92f02e8b67d92e6eb6ffd6ed04759b105d7 100644 (file)
--- 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 d49a06b78e8ffa5b70daf95af87e3e1021f62247..eb7756f272523337b472f5b63be644dc40c51c0b 100644 (file)
--- 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 137dd37ece05107b08ee2b2c7573c1735a72868f..aafeb09f8ac84b1619a8c4e98d57038aa440c60c 100644 (file)
--- 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 d49a06b78e8ffa5b70daf95af87e3e1021f62247..eb7756f272523337b472f5b63be644dc40c51c0b 100644 (file)
--- 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 137dd37ece05107b08ee2b2c7573c1735a72868f..aafeb09f8ac84b1619a8c4e98d57038aa440c60c 100644 (file)
--- 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 88a4f54f6e8455dc72f82d4b16a804c06feb5a19..855fa2557eb572deeb4a892ba651b6d4bd92d4e1 100644 (file)
--- 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 7d6ddec3eae024c9d2cb39695f781c0132fe75f7..c81777ae375d01cd63b9725eae15a2b021a6fd8d 100644 (file)
--- 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 ccc9cec58f2cba0756722320cd84f12834f6b2b6..d63bca939320fe789060994a43fff5922d30354e 100644 (file)
--- 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 5250cfdeec8e2c0034b58760e32bec1e274a3003..4a19cddf5c156845c6b6ab472577a4cf1699841a 100644 (file)
--- 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 0de45c8cf272f73534ffcefa3b933b5224ac0b78..66daf44ec51410bb1a8c0a34c7612fdd376fa291 100644 (file)
--- 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 0e477e7c6cd01dd21b63a6ed3b181fe98212550e..c80e588cead0f4411aae99d1752d0f52a3b1cf29 100644 (file)
--- 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 c65c38f94f222780839fb1ddebe8bbe511f7cd72..238089c42adf6128b923508ce84a2a2474af1305 100644 (file)
--- 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 04e51fe93ae79f72f9ff5cadffb40c9b50719e1e..f2b748fd85b9288165c39dbb07ebb3e478f3e5b7 100644 (file)
--- 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 2bdc3dbd5b27264388ed28ebfab2299bf907d536..351b297464963bb8597747c85d710073af5124aa 100644 (file)
--- 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 b38b5e56dcc752caac1934780a146bf9e3702539..0283d12b517d7dbfbe44d7558c554106b02df9b1 100644 (file)
--- 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 4e0cac4522ce67d926989d3d05354ef513293a26..e682b9b76b1782620026da16cb451c08ca646cd7 100644 (file)
--- 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 443717ebd543fbb71477acd84a67989c144c3e29..96cc5072394924cdcd49a5341e1fc46912a7a376 100644 (file)
--- 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 004893a99261431b2d383303b09ee14329a4d4ba..2e991259388b69a1412254960c894ad9fc0e438e 100644 (file)
--- 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 121566e0be8814ec0081cd255a6b77c7052863e5..06bd8aecacc45a8a8c78686f58c5c92274ff80f6 100644 (file)
--- 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 786256777a051921814f211dd8b213b88d87eedd..952230a491983ea2a960d027d9f7ae5372d47c2d 100644 (file)
--- 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 6985bf172553f41584950c62fcf757de7404fdb2..85127bee4c6ece961d139fe7d1e4f6cfa98713cd 100644 (file)
--- 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 ed11174f07914d701c6d202cbbd944abe3609fa6..c05439ab2adb4f4316ed624ad283fa59dea8638f 100644 (file)
--- 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 0e477e7c6cd01dd21b63a6ed3b181fe98212550e..c80e588cead0f4411aae99d1752d0f52a3b1cf29 100644 (file)
--- 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 ed11174f07914d701c6d202cbbd944abe3609fa6..c05439ab2adb4f4316ed624ad283fa59dea8638f 100644 (file)
--- 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 0e477e7c6cd01dd21b63a6ed3b181fe98212550e..c80e588cead0f4411aae99d1752d0f52a3b1cf29 100644 (file)
--- 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 5105324f45ae316380f2b4846b81479dec996829..0313f5b600aa59ff022f11be6671f513b5db5558 100644 (file)
--- 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 54ab6b8fd8eedb1827bb22f0945dfcf421f0b43a..2d548a66d992277f13d96d6e7842946c255e0dc7 100644 (file)
--- 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 f20b62b85dd9631f0f84abcd3c8da79e5382f7a5..8f50bf11307610b7906da945f67f607fe553dd34 100644 (file)
--- 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 fe2535d9f163ad002d63c5e5b0663bf34b12aae5..1816ec99ed5d5f7e4e601c7d012d87175c6d6cf2 100644 (file)
--- 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 1e493aaba7a305c1f9bab9acf37bf33b0fb9015e..a04b6d3d8620c5dfa49b9a4d5c138a2768ba1337 100644 (file)
--- 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 4f7bbaf280295f664729bd356cbeafd1b3ba559c..8d85cf7b18586fa0cc998623d4250d0bc96d4923 100644 (file)
--- 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 6f20604e2de90feaf4eb65ef2d5ce59bfa1cd09f..07f8590a2732f9e8d7a9e375964898e69c56722f 100644 (file)
--- 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 82e5cc01d0fe7b984cd3db7c825b86fd58e8c5b9..7f7f807787f27550494ebbaa516f0ca71cbada5a 100644 (file)
--- 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 d248984d6508c63119c737d84ca7ce0b4776b472..6de950189a2561f5a4802b06dc16b5f97ab40a9d 100644 (file)
--- 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 bb221e8911b5dc46a1932bbb36d6d3a71b08dc33..5e8b54a686eae124a1daabe715fc06534b030f54 100644 (file)
--- 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 0de45c8cf272f73534ffcefa3b933b5224ac0b78..66daf44ec51410bb1a8c0a34c7612fdd376fa291 100644 (file)
--- 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 0e1667b891a3ee970de993573deca5cba5df2f29..e6baa32f673e0ffcebe72613ca68325ecc1a507b 100644 (file)
--- 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 d49a06b78e8ffa5b70daf95af87e3e1021f62247..eb7756f272523337b472f5b63be644dc40c51c0b 100644 (file)
--- 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 137dd37ece05107b08ee2b2c7573c1735a72868f..aafeb09f8ac84b1619a8c4e98d57038aa440c60c 100644 (file)
--- 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 d50bac5439231fef4ce4e1cdaa43ff5ebab860aa..0b2e7a4d34c9ae6462e398370921279db1bf191c 100644 (file)
--- 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 395bbadc6d5151f03756393035206a1f678d35df..b2afa4a8d082a9a29f7b8f0da2e4fccc1a8c6ae2 100644 (file)
--- 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 ed11174f07914d701c6d202cbbd944abe3609fa6..c05439ab2adb4f4316ed624ad283fa59dea8638f 100644 (file)
--- 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 0e477e7c6cd01dd21b63a6ed3b181fe98212550e..c80e588cead0f4411aae99d1752d0f52a3b1cf29 100644 (file)
--- 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 9af0c22faab1ba24031d7261a5341f4c0bed2cc3..9c3f909984adb54c1c490cdbe4d001f869100c30 100644 (file)
--- 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 e572dbe7f48b204618e97a80302163b813ce12f6..7d0359fd2f4fa75424789171dab4514e64f3af14 100644 (file)
--- 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 674014afa29aab4dd66e26959fe3ee880d4b59a1..00980de99c0aed96662c3fd15909cc84fa1157b5 100644 (file)
--- 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 2891cf665e112dbf6422d5b65aad48ec91baf51f..017aa908e017a02be3268783bec6abc86af0642d 100644 (file)
--- 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 004893a99261431b2d383303b09ee14329a4d4ba..2e991259388b69a1412254960c894ad9fc0e438e 100644 (file)
--- 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 4e1e9791a9f9b0c0579d7babfd724752cb7de446..b3c68ac0e015f0482a554a35809f149e00160232 100644 (file)
--- 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 71e85bdc7a075c72ccf4d8b678b7ef5ed252f228..efa08fde5e0d849dca07ec9a80ec2cda1d032ee2 100644 (file)
--- 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 c545ec7faf71f11d8fceb13f3b325066ed536272..14618f3b4571e4f29083eef2bd3114f8cfe2759e 100644 (file)
--- 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 34e6ae94553f35bc5bafbe551a54c589f0eed8bd..d43ef4a33297044eae848e3aa753acdc844cf81e 100644 (file)
--- 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 d0a5c0953cff03ba11946559bb155f8b27043bd8..9feed6592fb432b57ba5f93fb6ade321b5d6eb3e 100644 (file)
--- 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 89e5e8d3eb112a08968c52d510f555093478b93e..526f3e6b19a1ce42c28bfef19f6c3949dc129cee 100644 (file)
--- 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 9f31cfa214d0c89cec3ade1ed8bd068eb07a8761..24bb6f69179ccfe31d495faacf2a67406c329483 100644 (file)
--- 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 046cd86ca892da58dfbc557fa3ddde444b7797f6..70af52994d67b71f5803810dc4f762313b1ebfc3 100644 (file)
--- 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 5def1dfeecb181eea2a462a44fe40719259e6a1c..6400ef55461d36e996f5a3acc674c53445a146f3 100644 (file)
--- 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 34e6ae94553f35bc5bafbe551a54c589f0eed8bd..d43ef4a33297044eae848e3aa753acdc844cf81e 100644 (file)
--- 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 d0a5c0953cff03ba11946559bb155f8b27043bd8..9feed6592fb432b57ba5f93fb6ade321b5d6eb3e 100644 (file)
--- 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 f20b62b85dd9631f0f84abcd3c8da79e5382f7a5..8f50bf11307610b7906da945f67f607fe553dd34 100644 (file)
--- 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 fe2535d9f163ad002d63c5e5b0663bf34b12aae5..1816ec99ed5d5f7e4e601c7d012d87175c6d6cf2 100644 (file)
--- 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 7fe9a0810313ff1c9fe0fb01017e1425fa0134d3..eeee8ee627e1b909be089ee5793084f7ed4df65d 100644 (file)
--- 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 83ecb9eb2466a7dcdf18f53a2b016be47d9ce997..678642a41bdc4d8141f8afcaf3eca5f0652dd426 100644 (file)
--- 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 17c644b0b549c93f589d35b2763ab3089ed99737..d16be3b20de40b15509bbefa25eb6e31c087d74a 100644 (file)
--- 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 220866861893244c0dbd94eb0f9e0f718cd2e2dc..a7e6a57fb1b6f3d72e8d7d6e78966156393db069 100644 (file)
--- 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 34e6ae94553f35bc5bafbe551a54c589f0eed8bd..d43ef4a33297044eae848e3aa753acdc844cf81e 100644 (file)
--- 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 fd8a29cffbdf59d01898a99a5a613430f2ba723e..f863d4d4286f44c68dd49dcc0efb44ecbbe5a750 100644 (file)
--- 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 d49a06b78e8ffa5b70daf95af87e3e1021f62247..eb7756f272523337b472f5b63be644dc40c51c0b 100644 (file)
--- 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 137dd37ece05107b08ee2b2c7573c1735a72868f..aafeb09f8ac84b1619a8c4e98d57038aa440c60c 100644 (file)
--- 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 68b507ad998a57ee7a69a5132aa3068c130b0412..8b870f1d48d91d964bfc7a8d754642f9f0d77808 100644 (file)
--- 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 7f18dbfb0a3361d56040e198adfafa91d0fcab14..c32ce5ced521847096d499542dc0d6a98b44499c 100644 (file)
--- 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 a11c6536ad496c40b22d8d800c9d80e1a4e8122b..ed04799f52dcf408245e64a3fcab4dcc53fa3dfa 100644 (file)
--- 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 0cf3c6c4a3a70a9bb7d12ad4f547e4c2c2fb2793..07d779babdbd635f5a1b0da64cbd36d80d297887 100644 (file)
--- 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 be699a6c322a6bba3db15ce9f91d4182dffa3476..f4d955f06ba7b93287170898b577b3e500a3dacb 100644 (file)
--- 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 1aefad0d9ac8f12eecb67f4230e6ad81c8ea8dbe..830c3d4c02d4dd695ff9051bd730fd26411ab4ee 100644 (file)
--- 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 e0cbad2b98e857222f9975d3e81a653ca5ad6ce4..ef4efd37316a8671f111c1538c2751d358ee44ae 100644 (file)
--- 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 590b96d137b60a428456818a93c739c305da48d3..254425a09aadcb3c043f48a1c9f1ac9b16a27732 100644 (file)
--- 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 ed11174f07914d701c6d202cbbd944abe3609fa6..c05439ab2adb4f4316ed624ad283fa59dea8638f 100644 (file)
--- 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 0e1667b891a3ee970de993573deca5cba5df2f29..e6baa32f673e0ffcebe72613ca68325ecc1a507b 100644 (file)
--- 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 d9abdbf11d9910097edb846b3836865a01da21d6..945d7b4cbd68a3bc411ce11ba0ba2e50545df07a 100644 (file)
--- 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 42cc5855ff46cd323b792da1cffc70c25b052e54..8066c42c1d90dc11e74282850f971d02c8017b63 100644 (file)
--- 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 91610eb2af14523423008adcc9299bd196a5481e..5a850deaebcc96971be4fc071d829d103515aacf 100644 (file)
--- 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