12 files changed, 62 insertions, 62 deletions

diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index f8e71957a..fbf206d20 100644
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -5,7 +5,7 @@ HOSTNAME = localhost
 BINARY = gnunet-service-core
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-UNIXPATH = /tmp/gnunet-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES
 # DISABLE_SOCKET_FORWARDING = NO
diff --git a/src/core/test_core_api_data.conf b/src/core/test_core_api_data.conf
index 440dac5c9..4ece5b096 100644
--- a/src/core/test_core_api_data.conf
+++ b/src/core/test_core_api_data.conf
@@ -10,5 +10,5 @@ WAN_QUOTA_OUT = 64 kiB
 
 [core]
 PORT = 2092
-UNIXPATH = /tmp/gnunet-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
 
diff --git a/src/core/test_core_api_peer1.conf b/src/core/test_core_api_peer1.conf
index d461f9460..b976fd411 100644
--- a/src/core/test_core_api_peer1.conf
+++ b/src/core/test_core_api_peer1.conf
@@ -4,26 +4,26 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-1/
 
 [arm]
 PORT = 12460
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
 PORT = 12461
 
 [resolver]
 PORT = 12462
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12463
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12464
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
 [ats]
 PORT = 12475
-UNIXPATH = /tmp/gnunet-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [transport-tcp]
 PORT = 12467
diff --git a/src/core/test_core_api_peer2.conf b/src/core/test_core_api_peer2.conf
index 436846f5c..739b6b1a1 100644
--- a/src/core/test_core_api_peer2.conf
+++ b/src/core/test_core_api_peer2.conf
@@ -4,31 +4,31 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-peer-2/
 
 [arm]
 PORT = 22460
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
 PORT = 22461
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
 PORT = 22462
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22463
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
 PORT = 22464
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [core]
 PORT = 22475
-UNIXPATH = /tmp/gnunet-p2-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock
 
 [ats]
 PORT = 22476
-UNIXPATH = /tmp/gnunet-p2-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
 [transport-tcp]
 PORT = 22467
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 971d68cd0..ebf77997c 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -8,13 +8,13 @@ DEFAULTSERVICES = core test-sts
 
 [core]
 PORT = 24512
-UNIXPATH = /tmp/gnunet-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
 
 [ats]
 WAN_QUOTA_IN = 104857600
 WAN_QUOTA_OUT = 104757600
 PORT = 24571
-UNIXPATH = /tmp/gnunet-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [test-sts]
 AUTOSTART = YES
@@ -25,5 +25,5 @@ ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 TOTAL_QUOTA_IN = 65536
 TOTAL_QUOTA_OUT = 65536
-UNIXPATH = /tmp/gnunet-service-sts.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-sts.sock
 
diff --git a/src/core/test_core_defaults.conf b/src/core/test_core_defaults.conf
index b690ba151..c03eeed1c 100644
--- a/src/core/test_core_defaults.conf
+++ b/src/core/test_core_defaults.conf
@@ -19,7 +19,7 @@ WAN_QUOTA_OUT = 1 GB
 
 [core]
 PORT = 12470
-UNIXPATH = /tmp/gnunet-p1-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
 
 [transport-tcp]
 BINDTO = 127.0.0.1
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index ba0257d34..713854aff 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -7,30 +7,30 @@ PORT = 12488
 
 [arm]
 PORT = 12486
-UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-arm.sock
 
 [statistics]
 PORT = 12487
-UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-statistics.sock
 
 [resolver]
 PORT = 12484
-UNIXPATH = /tmp/gnunet-core-asym-recv-1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-1-service-resolver.sock
 
 [peerinfo]
 PORT = 12489
-UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12485
-UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-transport.sock
 
 [transport-udp]
 PORT = 12489
 
 [ats]
 PORT = 12491
-UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-ats.sock
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN =  1 MB
 UNSPECIFIED_QUOTA_OUT =  1 MB
@@ -50,5 +50,5 @@ WLAN_QUOTA_OUT =  1 MB
 
 [core]
 PORT = 12490
-UNIXPATH = /tmp/gnunet-core-asym-recv-p1-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-core.sock
 
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index 9f4527a2f..134f921b6 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -5,31 +5,31 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
 
 [arm]
 PORT = 22486
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-arm.sock
 
 [statistics]
 PORT = 22487
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-statistics.sock
 
 [resolver]
 PORT = 22484
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22489
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-peerinfo.sock
 
 [transport]
 PORT = 22485
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-transport.sock
 
 [core]
 PORT = 22490
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-core.sock
 
 [ats]
 PORT = 22491
-UNIXPATH = /tmp/gnunet-core-asym-recv-p2-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-ats.sock
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 10240
 UNSPECIFIED_QUOTA_OUT = 10240
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
index 268b8fc00..97f485225 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -10,27 +10,27 @@ PORT = 12492
 
 [arm]
 PORT = 12486
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-arm.sock
 
 [statistics]
 PORT = 12487
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-statistics.sock
 
 [resolver]
 PORT = 12484
-UNIXPATH = /tmp/gnunet-core-asym-send-1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-1-service-resolver.sock
 
 [peerinfo]
 PORT = 12489
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12485
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-transport.sock
 
 [ats]
 PORT = 12491
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-ats.sock
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 10240
 UNSPECIFIED_QUOTA_OUT = 10240
@@ -49,4 +49,4 @@ WLAN_QUOTA_OUT = 10240
 
 [core]
 PORT = 12490
-UNIXPATH = /tmp/gnunet-core-asym-send-p1-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-core.sock
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
index 721f5c268..ce1fcda14 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -4,37 +4,37 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
 
 [arm]
 PORT = 22486
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-arm.sock
 
 [statistics]
 PORT = 22487
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-statistics.sock
 
 [resolver]
 PORT = 22484
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22489
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-peerinfo.sock
 
 [transport]
 PORT = 22485
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-transport.sock
 
 [core]
 PORT = 22490
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-core.sock
 
 [ats]
 PORT = 22491
-UNIXPATH = /tmp/gnunet-core-asym-send-p2-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-ats.sock
 WAN_QUOTA_IN = 1 MB
 WAN_QUOTA_OUT = 1 MB
 
 [ats]
 PORT = 12471
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN =  1 MB
 UNSPECIFIED_QUOTA_OUT =  1 MB
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index c62b4607c..b96e7fefd 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -7,27 +7,27 @@ PORT = 12468
 
 [arm]
 PORT = 12476
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-arm.sock
 
 [statistics]
 PORT = 12477
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-statistics.sock
 
 [resolver]
 PORT = 12474
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-resolver.sock
 
 [peerinfo]
 PORT = 12479
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-peerinfo.sock
 
 [transport]
 PORT = 12475
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-transport.sock
 
 [ats]
 PORT = 12471
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 10240
 UNSPECIFIED_QUOTA_OUT = 10240
@@ -46,11 +46,11 @@ WLAN_QUOTA_OUT = 10240
 
 [core]
 PORT = 12480
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-core.sock
 
 [ats]
 PORT = 12481
-UNIXPATH = /tmp/gnunet-core-sym-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
 
 [transport-udp]
 PORT = 12482
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 452eef63e..3c3275d74 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -4,31 +4,31 @@ GNUNET_TEST_HOME = /tmp/test-gnunet-core-quota-sym-peer-2/
 
 [arm]
 PORT = 22476
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-arm.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-arm.sock
 
 [statistics]
 PORT = 22477
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-statistics.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-statistics.sock
 
 [resolver]
 PORT = 22474
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-resolver.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-resolver.sock
 
 [peerinfo]
 PORT = 22479
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-peerinfo.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-peerinfo.sock
 
 [transport]
 PORT = 22475
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-transport.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-transport.sock
 
 [core]
 PORT = 22480
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-core.sock
 
 [ats]
 PORT = 22482
-UNIXPATH = /tmp/gnunet-core-sym-p2-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-ats.sock
 # UNSPECIFIED
 UNSPECIFIED_QUOTA_IN = 10240
 UNSPECIFIED_QUOTA_OUT = 10240