gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r30044 - in gnunet/src: arm ats consensus conversation core


From: gnunet
Subject: [GNUnet-SVN] r30044 - in gnunet/src: arm ats consensus conversation core datastore dht dns dv experimentation fs gns hostlist identity integration-tests/confs mesh multicast namestore nat nse peerinfo psyc psycstore regex revocation scalarproduct set statistics template testbed testing transport util vpn
Date: Wed, 9 Oct 2013 12:30:21 +0200

Author: grothoff
Date: 2013-10-09 12:30:21 +0200 (Wed, 09 Oct 2013)
New Revision: 30044

Modified:
   gnunet/src/arm/arm.conf.in
   gnunet/src/ats/ats.conf.in
   gnunet/src/ats/test_ats_api.conf
   gnunet/src/ats/test_ats_mlp.conf
   gnunet/src/ats/test_ats_solver_default.conf
   gnunet/src/consensus/consensus.conf.in
   gnunet/src/consensus/test_consensus.conf
   gnunet/src/conversation/conversation.conf.in
   gnunet/src/core/core.conf.in
   gnunet/src/core/test_core_api_data.conf
   gnunet/src/core/test_core_api_peer1.conf
   gnunet/src/core/test_core_api_peer2.conf
   gnunet/src/core/test_core_api_send_to_self.conf
   gnunet/src/core/test_core_defaults.conf
   gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
   gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
   gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
   gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
   gnunet/src/core/test_core_quota_peer1.conf
   gnunet/src/core/test_core_quota_peer2.conf
   gnunet/src/datastore/datastore.conf.in
   gnunet/src/dht/dht.conf.in
   gnunet/src/dns/dns.conf.in
   gnunet/src/dv/dv.conf.in
   gnunet/src/experimentation/experimentation.conf.in
   gnunet/src/fs/fs.conf.in
   gnunet/src/gns/gns.conf.in
   gnunet/src/gns/test_gns_proxy.conf
   gnunet/src/gns/test_gns_simple_lookup.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
   gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
   gnunet/src/hostlist/test_learning_adv_peer.conf
   gnunet/src/hostlist/test_learning_learn_peer.conf
   gnunet/src/hostlist/test_learning_learn_peer2.conf
   gnunet/src/identity/identity.conf.in
   gnunet/src/identity/test_identity.conf
   gnunet/src/integration-tests/confs/c_bootstrap_server.conf
   gnunet/src/integration-tests/confs/c_nat_client.conf
   gnunet/src/integration-tests/confs/c_no_nat_client.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
   gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
   gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
   gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
   gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
   gnunet/src/integration-tests/confs/test_defaults.conf
   gnunet/src/mesh/mesh.conf.in
   gnunet/src/multicast/multicast.conf.in
   gnunet/src/namestore/namestore.conf.in
   gnunet/src/nat/test_nat_data.conf
   gnunet/src/nse/nse.conf.in
   gnunet/src/nse/nse_infiniband.conf
   gnunet/src/nse/nse_profiler_test.conf
   gnunet/src/nse/test_nse.conf
   gnunet/src/peerinfo/peerinfo.conf.in
   gnunet/src/psyc/psyc.conf.in
   gnunet/src/psyc/test_psyc.conf
   gnunet/src/psycstore/psycstore.conf.in
   gnunet/src/psycstore/test_psycstore.conf
   gnunet/src/regex/regex.conf.in
   gnunet/src/revocation/revocation.conf.in
   gnunet/src/scalarproduct/scalarproduct.conf.in
   gnunet/src/set/set.conf.in
   gnunet/src/set/test_set.conf
   gnunet/src/statistics/statistics.conf.in
   gnunet/src/statistics/test_statistics_api_data.conf
   gnunet/src/template/template.conf
   gnunet/src/testbed/testbed.conf.in
   gnunet/src/testing/test_testing_sharedservices.conf
   gnunet/src/transport/template_cfg_peer1.conf
   gnunet/src/transport/template_cfg_peer2.conf
   gnunet/src/transport/test_plugin_transport_data.conf
   gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf
   gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf
   gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_http_peer1.conf
   gnunet/src/transport/test_quota_compliance_http_peer2.conf
   gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_https_peer1.conf
   gnunet/src/transport/test_quota_compliance_https_peer2.conf
   gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
   gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
   gnunet/src/transport/test_quota_compliance_udp_peer1.conf
   gnunet/src/transport/test_quota_compliance_udp_peer2.conf
   gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_unix_peer1.conf
   gnunet/src/transport/test_quota_compliance_unix_peer2.conf
   gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
   gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
   gnunet/src/transport/test_quota_compliance_wlan_peer1.conf
   gnunet/src/transport/test_quota_compliance_wlan_peer2.conf
   gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
   gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
   gnunet/src/transport/test_transport_api_bluetooth_peer1.conf
   gnunet/src/transport/test_transport_api_bluetooth_peer2.conf
   gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_http_peer1.conf
   gnunet/src/transport/test_transport_api_http_peer2.conf
   gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
   gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
   gnunet/src/transport/test_transport_api_https_peer1.conf
   gnunet/src/transport/test_transport_api_https_peer2.conf
   gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
   gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
   gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_multi_peer1.conf
   gnunet/src/transport/test_transport_api_multi_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
   gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
   gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
   gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
   gnunet/src/transport/test_transport_api_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
   gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
   gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
   gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
   gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
   gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
   gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
   gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
   gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
   gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
   gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
   gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
   gnunet/src/transport/test_transport_api_udp_peer1.conf
   gnunet/src/transport/test_transport_api_udp_peer2.conf
   gnunet/src/transport/test_transport_api_unix_peer1.conf
   gnunet/src/transport/test_transport_api_unix_peer2.conf
   gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
   gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
   gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
   gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
   gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
   gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
   gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
   gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
   gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
   gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
   gnunet/src/transport/test_transport_api_wlan_peer1.conf
   gnunet/src/transport/test_transport_api_wlan_peer2.conf
   gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
   
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
   gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
   gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
   
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
   gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
   gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
   gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
   gnunet/src/transport/transport.conf.in
   gnunet/src/util/resolver.conf.in
   gnunet/src/vpn/vpn.conf.in
Log:
last XDG change: use GNUNET_RUNTIME_DIR instead of /tmp for UNIXPATHs by default

Modified: gnunet/src/arm/arm.conf.in
===================================================================
--- gnunet/src/arm/arm.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/arm/arm.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -6,7 +6,7 @@
 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
 

Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/ats/ats.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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
 

Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf    2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/ats/test_ats_api.conf    2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,7 +4,7 @@
 [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 @@
 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
 

Modified: gnunet/src/ats/test_ats_mlp.conf
===================================================================
--- gnunet/src/ats/test_ats_mlp.conf    2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/ats/test_ats_mlp.conf    2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,7 +4,7 @@
 [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 @@
 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
 

Modified: gnunet/src/ats/test_ats_solver_default.conf
===================================================================
--- gnunet/src/ats/test_ats_solver_default.conf 2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/ats/test_ats_solver_default.conf 2013-10-09 10:30:21 UTC (rev 
30044)
@@ -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

Modified: gnunet/src/consensus/consensus.conf.in
===================================================================
--- gnunet/src/consensus/consensus.conf.in      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/consensus/consensus.conf.in      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -5,6 +5,6 @@
 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

Modified: gnunet/src/consensus/test_consensus.conf
===================================================================
--- gnunet/src/consensus/test_consensus.conf    2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/consensus/test_consensus.conf    2013-10-09 10:30:21 UTC (rev 
30044)
@@ -7,7 +7,7 @@
 #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

Modified: gnunet/src/conversation/conversation.conf.in
===================================================================
--- gnunet/src/conversation/conversation.conf.in        2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/conversation/conversation.conf.in        2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -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
 

Modified: gnunet/src/core/core.conf.in
===================================================================
--- gnunet/src/core/core.conf.in        2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/core/core.conf.in        2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf     2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/core/test_core_api_data.conf     2013-10-09 10:30:21 UTC (rev 
30044)
@@ -10,5 +10,5 @@
 
 [core]
 PORT = 2092
-UNIXPATH = /tmp/gnunet-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-core.sock
 

Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf    2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/core/test_core_api_peer1.conf    2013-10-09 10:30:21 UTC (rev 
30044)
@@ -4,26 +4,26 @@
 
 [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

Modified: gnunet/src/core/test_core_api_peer2.conf
===================================================================
--- gnunet/src/core/test_core_api_peer2.conf    2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/core/test_core_api_peer2.conf    2013-10-09 10:30:21 UTC (rev 
30044)
@@ -4,31 +4,31 @@
 
 [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

Modified: gnunet/src/core/test_core_api_send_to_self.conf
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.conf     2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/core/test_core_api_send_to_self.conf     2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -8,13 +8,13 @@
 
 [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_FROM6 = ::1;
 TOTAL_QUOTA_IN = 65536
 TOTAL_QUOTA_OUT = 65536
-UNIXPATH = /tmp/gnunet-service-sts.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-sts.sock
 

Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf     2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/core/test_core_defaults.conf     2013-10-09 10:30:21 UTC (rev 
30044)
@@ -19,7 +19,7 @@
 
 [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

Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -7,30 +7,30 @@
 
 [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 @@
 
 [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
 

Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,31 +5,31 @@
 
 [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

Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -10,27 +10,27 @@
 
 [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 @@
 
 [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

Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,37 +4,37 @@
 
 [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

Modified: gnunet/src/core/test_core_quota_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer1.conf  2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/core/test_core_quota_peer1.conf  2013-10-09 10:30:21 UTC (rev 
30044)
@@ -7,27 +7,27 @@
 
 [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 @@
 
 [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

Modified: gnunet/src/core/test_core_quota_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer2.conf  2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/core/test_core_quota_peer2.conf  2013-10-09 10:30:21 UTC (rev 
30044)
@@ -4,31 +4,31 @@
 
 [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

Modified: gnunet/src/datastore/datastore.conf.in
===================================================================
--- gnunet/src/datastore/datastore.conf.in      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/datastore/datastore.conf.in      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -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

Modified: gnunet/src/dht/dht.conf.in
===================================================================
--- gnunet/src/dht/dht.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/dht/dht.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -6,7 +6,7 @@
 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

Modified: gnunet/src/dns/dns.conf.in
===================================================================
--- gnunet/src/dns/dns.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/dns/dns.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -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.

Modified: gnunet/src/dv/dv.conf.in
===================================================================
--- gnunet/src/dv/dv.conf.in    2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/dv/dv.conf.in    2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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 =

Modified: gnunet/src/experimentation/experimentation.conf.in
===================================================================
--- gnunet/src/experimentation/experimentation.conf.in  2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/experimentation/experimentation.conf.in  2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/fs/fs.conf.in
===================================================================
--- gnunet/src/fs/fs.conf.in    2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/fs/fs.conf.in    2013-10-09 10:30:21 UTC (rev 30044)
@@ -20,7 +20,7 @@
 # (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)

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/gns/gns.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -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
 @address@hidden = 2102
 
 # Do we require users that want to access GNS to run this process
@@ -26,7 +26,7 @@
 
 # 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]

Modified: gnunet/src/gns/test_gns_proxy.conf
===================================================================
--- gnunet/src/gns/test_gns_proxy.conf  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/gns/test_gns_proxy.conf  2013-10-09 10:30:21 UTC (rev 30044)
@@ -20,7 +20,7 @@
 
 [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

Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf  2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/gns/test_gns_simple_lookup.conf  2013-10-09 10:30:21 UTC (rev 
30044)
@@ -69,7 +69,7 @@
 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 @@
 [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

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,27 +8,27 @@
 [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 @@
 
 [ats]
 PORT = 12971
-UNIXPATH = /tmp/gnunet-p1-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 

Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,27 +8,27 @@
 [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 @@
 
 [ats]
 PORT = 22971
-UNIXPATH = /tmp/gnunet-p2-service-ats.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 

Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf     2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf     2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -8,27 +8,27 @@
 [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 @@
 
 [ats]
 PORT = 22971
-UNIXPATH = /tmp/gnunet-ats-p2-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p2-service-core.sock

Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf   2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf   2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -8,27 +8,27 @@
 [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 @@
 
 [ats]
 PORT = 12971
-UNIXPATH = /tmp/gnunet-ats-p1-service-core.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p1-service-core.sock

Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf  2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf  2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -8,27 +8,27 @@
 [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

Modified: gnunet/src/identity/identity.conf.in
===================================================================
--- gnunet/src/identity/identity.conf.in        2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/identity/identity.conf.in        2013-10-09 10:30:21 UTC (rev 
30044)
@@ -5,7 +5,7 @@
 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
 

Modified: gnunet/src/identity/test_identity.conf
===================================================================
--- gnunet/src/identity/test_identity.conf      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/identity/test_identity.conf      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -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...

Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,45 +8,45 @@
 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 @@
 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]

Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf        2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf        2013-10-09 
10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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]

Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,14 +8,14 @@
 
 [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
 
 [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 @@
 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 @@
 
 [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

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_2.conf   2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_2.conf   2013-10-09 
10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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 @@
 
 [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]

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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 @@
 
 [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]

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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 @@
 
 [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]

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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 @@
 
 [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 = 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
 

Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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 @@
 
 [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]

Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2013-10-09 
10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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]

Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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]

Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -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 @@
 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 @@
 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]

Modified: gnunet/src/integration-tests/confs/test_defaults.conf
===================================================================
--- gnunet/src/integration-tests/confs/test_defaults.conf       2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/integration-tests/confs/test_defaults.conf       2013-10-09 
10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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_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 @@
 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]

Modified: gnunet/src/mesh/mesh.conf.in
===================================================================
--- gnunet/src/mesh/mesh.conf.in        2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/mesh/mesh.conf.in        2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/multicast/multicast.conf.in
===================================================================
--- gnunet/src/multicast/multicast.conf.in      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/multicast/multicast.conf.in      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/namestore/namestore.conf.in
===================================================================
--- gnunet/src/namestore/namestore.conf.in      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/namestore/namestore.conf.in      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -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

Modified: gnunet/src/nat/test_nat_data.conf
===================================================================
--- gnunet/src/nat/test_nat_data.conf   2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/nat/test_nat_data.conf   2013-10-09 10:30:21 UTC (rev 30044)
@@ -51,7 +51,7 @@
 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 @@
 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 @@
 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

Modified: gnunet/src/nse/nse.conf.in
===================================================================
--- gnunet/src/nse/nse.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/nse/nse.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/nse/nse_infiniband.conf
===================================================================
--- gnunet/src/nse/nse_infiniband.conf  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/nse/nse_infiniband.conf  2013-10-09 10:30:21 UTC (rev 30044)
@@ -15,7 +15,7 @@
 
 [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 @@
 
 [arm]
 DEFAULTSERVICES = core nse
-UNIXPATH = /tmp/test-nse-service-arm.unix
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
 
 [statistics]
 AUTOSTART = YES

Modified: gnunet/src/nse/nse_profiler_test.conf
===================================================================
--- gnunet/src/nse/nse_profiler_test.conf       2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/nse/nse_profiler_test.conf       2013-10-09 10:30:21 UTC (rev 
30044)
@@ -13,7 +13,7 @@
 
 [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 @@
 
 [arm]
 DEFAULTSERVICES = core nse
-UNIXPATH = /tmp/test-nse-service-arm.unix
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-nse-service-arm.unix
 
 [statistics]
 AUTOSTART = YES

Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf        2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/nse/test_nse.conf        2013-10-09 10:30:21 UTC (rev 30044)
@@ -3,7 +3,7 @@
 
 [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 @@
 [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

Modified: gnunet/src/peerinfo/peerinfo.conf.in
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf.in        2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/peerinfo/peerinfo.conf.in        2013-10-09 10:30:21 UTC (rev 
30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/psyc/psyc.conf.in
===================================================================
--- gnunet/src/psyc/psyc.conf.in        2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/psyc/psyc.conf.in        2013-10-09 10:30:21 UTC (rev 30044)
@@ -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

Modified: gnunet/src/psyc/test_psyc.conf
===================================================================
--- gnunet/src/psyc/test_psyc.conf      2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/psyc/test_psyc.conf      2013-10-09 10:30:21 UTC (rev 30044)
@@ -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

Modified: gnunet/src/psycstore/psycstore.conf.in
===================================================================
--- gnunet/src/psycstore/psycstore.conf.in      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/psycstore/psycstore.conf.in      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -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
 @address@hidden = 2111
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES

Modified: gnunet/src/psycstore/test_psycstore.conf
===================================================================
--- gnunet/src/psycstore/test_psycstore.conf    2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/psycstore/test_psycstore.conf    2013-10-09 10:30:21 UTC (rev 
30044)
@@ -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

Modified: gnunet/src/regex/regex.conf.in
===================================================================
--- gnunet/src/regex/regex.conf.in      2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/regex/regex.conf.in      2013-10-09 10:30:21 UTC (rev 30044)
@@ -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;

Modified: gnunet/src/revocation/revocation.conf.in
===================================================================
--- gnunet/src/revocation/revocation.conf.in    2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/revocation/revocation.conf.in    2013-10-09 10:30:21 UTC (rev 
30044)
@@ -5,7 +5,7 @@
 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
 

Modified: gnunet/src/scalarproduct/scalarproduct.conf.in
===================================================================
--- gnunet/src/scalarproduct/scalarproduct.conf.in      2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/scalarproduct/scalarproduct.conf.in      2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -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
 

Modified: gnunet/src/set/set.conf.in
===================================================================
--- gnunet/src/set/set.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/set/set.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,6 +5,6 @@
 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

Modified: gnunet/src/set/test_set.conf
===================================================================
--- gnunet/src/set/test_set.conf        2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/set/test_set.conf        2013-10-09 10:30:21 UTC (rev 30044)
@@ -11,7 +11,7 @@
 #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

Modified: gnunet/src/statistics/statistics.conf.in
===================================================================
--- gnunet/src/statistics/statistics.conf.in    2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/statistics/statistics.conf.in    2013-10-09 10:30:21 UTC (rev 
30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/statistics/test_statistics_api_data.conf
===================================================================
--- gnunet/src/statistics/test_statistics_api_data.conf 2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/statistics/test_statistics_api_data.conf 2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -3,12 +3,12 @@
 
 [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

Modified: gnunet/src/template/template.conf
===================================================================
--- gnunet/src/template/template.conf   2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/template/template.conf   2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/testbed/testbed.conf.in
===================================================================
--- gnunet/src/testbed/testbed.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/testbed/testbed.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -18,7 +18,7 @@
 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 @@
 @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 @@
 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

Modified: gnunet/src/testing/test_testing_sharedservices.conf
===================================================================
--- gnunet/src/testing/test_testing_sharedservices.conf 2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/testing/test_testing_sharedservices.conf 2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -3,7 +3,7 @@
 
 [testbed-logger]
 PORT = 15000
-UNIXPATH = /tmp/testbed-logger.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/testbed-logger.sock
 DIR = /tmp/testbed-logger
 
 [resolver]

Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf        2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/transport/template_cfg_peer1.conf        2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -19,31 +19,31 @@
 [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

Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf        2013-10-09 10:26:23 UTC 
(rev 30043)
+++ gnunet/src/transport/template_cfg_peer2.conf        2013-10-09 10:30:21 UTC 
(rev 30044)
@@ -19,31 +19,31 @@
 [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

Modified: gnunet/src/transport/test_plugin_transport_data.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data.conf        2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_plugin_transport_data.conf        2013-10-09 
10:30:21 UTC (rev 30044)
@@ -26,23 +26,23 @@
 
 [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

Modified: 
gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer1.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: 
gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_asymmetric_peer2.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_peer1.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_bluetooth_peer2.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -6,23 +6,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -10,23 +10,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -6,23 +6,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer2.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_http_peer2.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -10,23 +10,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -6,23 +6,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer1.conf 2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_https_peer1.conf 2013-10-09 
10:30:21 UTC (rev 30044)
@@ -6,23 +6,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer2.conf 2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_https_peer2.conf 2013-10-09 
10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -10,23 +10,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer1.conf   2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer1.conf   2013-10-09 
10:30:21 UTC (rev 30044)
@@ -10,23 +10,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf   2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf   2013-10-09 
10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_quota_compliance_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer1.conf   2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_udp_peer1.conf   2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_quota_compliance_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer2.conf   2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_udp_peer2.conf   2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_quota_compliance_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_peer1.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_unix_peer1.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -7,21 +7,21 @@
 
 [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

Modified: gnunet/src/transport/test_quota_compliance_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_peer2.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_unix_peer2.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -7,24 +7,24 @@
 
 [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

Modified: gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -7,23 +7,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_quota_compliance_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_peer1.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_wlan_peer1.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -7,23 +7,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_quota_compliance_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_peer2.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_quota_compliance_wlan_peer2.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: 
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,23 +5,23 @@
 [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

Modified: 
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,23 +5,23 @@
 [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

Modified: gnunet/src/transport/test_transport_api_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bluetooth_peer1.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_bluetooth_peer1.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,24 +8,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bluetooth_peer2.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_bluetooth_peer2.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,24 +8,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf   
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf   
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf   
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf   
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer1.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_http_peer1.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -7,25 +7,25 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer2.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_http_peer2.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -10,22 +10,22 @@
 [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

Modified: gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer1.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer1.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,25 +8,25 @@
 [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 @@
 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
 

Modified: gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer2.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer2.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -17,24 +17,24 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer1.conf    2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_https_peer1.conf    2013-10-09 
10:30:21 UTC (rev 30044)
@@ -12,19 +12,19 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer2.conf    2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_https_peer2.conf    2013-10-09 
10:30:21 UTC (rev 30044)
@@ -16,23 +16,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf 
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg_peer1.conf 
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 [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

Modified: gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf 
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_manipulation_cfg_peer2.conf 
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 [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

Modified: 
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer1.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: 
gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_manipulation_recv_tcp_peer2.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: 
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer1.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: 
gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_manipulation_send_tcp_peer2.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_multi_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer1.conf    2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_multi_peer1.conf    2013-10-09 
10:30:21 UTC (rev 30044)
@@ -18,24 +18,24 @@
 [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

Modified: gnunet/src/transport/test_transport_api_multi_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer2.conf    2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_multi_peer2.conf    2013-10-09 
10:30:21 UTC (rev 30044)
@@ -21,24 +21,24 @@
 [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

Modified: 
gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_bluetooth_peer1.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: 
gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_bluetooth_peer2.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer1.conf 
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer1.conf 
2013-10-09 10:30:21 UTC (rev 30044)
@@ -12,22 +12,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer2.conf 
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer2.conf 
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer1.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer1.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -6,22 +6,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer2.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer2.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -14,23 +14,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -13,23 +13,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,21 +9,21 @@
 [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

Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf 
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf 
2013-10-09 10:30:21 UTC (rev 30044)
@@ -7,23 +7,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf 
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf 
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -14,22 +14,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -13,21 +13,21 @@
 [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

Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf      2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf      2013-10-09 
10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf      2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf      2013-10-09 
10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer1.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer1.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,25 +9,25 @@
 [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
 

Modified: gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer2.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer2.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -13,22 +13,22 @@
 [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

Modified: gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer1.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer1.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,19 +9,19 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer2.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer2.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -11,23 +11,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -10,24 +10,24 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf      
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf      
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,23 +9,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -13,23 +13,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf  2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf  2013-10-09 
10:30:21 UTC (rev 30044)
@@ -11,23 +11,23 @@
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer1.conf      2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_udp_peer1.conf      2013-10-09 
10:30:21 UTC (rev 30044)
@@ -12,24 +12,24 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer2.conf      2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_udp_peer2.conf      2013-10-09 
10:30:21 UTC (rev 30044)
@@ -11,23 +11,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unix_peer1.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unix_peer1.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unix_peer2.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unix_peer2.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: 
gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer1.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: 
gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_bluetooth_peer2.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: 
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
===================================================================
--- 
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf   
    2013-10-09 10:26:23 UTC (rev 30043)
+++ 
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf   
    2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: 
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
===================================================================
--- 
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf   
    2013-10-09 10:26:23 UTC (rev 30043)
+++ 
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf   
    2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf        
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf        
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,23 +8,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -4,24 +4,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -7,23 +7,23 @@
 
 [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
 
 

Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf       
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf       
2013-10-09 10:30:21 UTC (rev 30044)
@@ -8,22 +8,22 @@
 
 [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
 

Modified: gnunet/src/transport/test_transport_api_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer1.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_wlan_peer1.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,24 +8,24 @@
 
 [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

Modified: gnunet/src/transport/test_transport_api_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer2.conf     2013-10-09 
10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_api_wlan_peer2.conf     2013-10-09 
10:30:21 UTC (rev 30044)
@@ -8,24 +8,24 @@
 
 [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

Modified: 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,24 +9,24 @@
 [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]

Modified: 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
===================================================================
--- 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
        2013-10-09 10:26:23 UTC (rev 30043)
+++ 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
        2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,24 +9,24 @@
 [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]

Modified: 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,24 +9,24 @@
 [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]

Modified: 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf    
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf    
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,25 +9,25 @@
 [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]

Modified: 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
===================================================================
--- 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
        2013-10-09 10:26:23 UTC (rev 30043)
+++ 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
        2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,25 +9,25 @@
 [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

Modified: 
gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf  
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf  
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,25 +9,25 @@
 [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

Modified: gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_peer1.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,22 +9,22 @@
 [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
 

Modified: gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf     
2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/transport/test_transport_blacklisting_cfg_peer2.conf     
2013-10-09 10:30:21 UTC (rev 30044)
@@ -9,21 +9,21 @@
 [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

Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in      2013-10-09 10:26:23 UTC (rev 
30043)
+++ gnunet/src/transport/transport.conf.in      2013-10-09 10:30:21 UTC (rev 
30044)
@@ -8,7 +8,7 @@
 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

Modified: gnunet/src/util/resolver.conf.in
===================================================================
--- gnunet/src/util/resolver.conf.in    2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/util/resolver.conf.in    2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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

Modified: gnunet/src/vpn/vpn.conf.in
===================================================================
--- gnunet/src/vpn/vpn.conf.in  2013-10-09 10:26:23 UTC (rev 30043)
+++ gnunet/src/vpn/vpn.conf.in  2013-10-09 10:30:21 UTC (rev 30044)
@@ -5,7 +5,7 @@
 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
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]