[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29645 - in gnunet/src: arm ats consensus core datastore dh
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r29645 - in gnunet/src: arm ats consensus core datastore dht dns dv experimentation fs gns identity include lockmanager mesh multicast namestore nat nse peerinfo psyc psycstore regex scalarproduct set statistics testbed testing transport util vpn |
|
Date: |
Fri, 27 Sep 2013 11:49:40 +0200 |
Author: grothoff
Date: 2013-09-27 11:49:39 +0200 (Fri, 27 Sep 2013)
New Revision: 29645
Modified:
gnunet/src/arm/arm.conf.in
gnunet/src/arm/gnunet-service-arm.c
gnunet/src/arm/test_exponential_backoff.c
gnunet/src/ats/ats.conf.in
gnunet/src/consensus/consensus.conf.in
gnunet/src/core/core.conf.in
gnunet/src/datastore/datastore.conf.in
gnunet/src/dht/dht.conf.in
gnunet/src/dns/dns.conf.in
gnunet/src/dns/dnsstub.c
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/gnunet-dns2gns.c
gnunet/src/identity/identity.conf.in
gnunet/src/include/gnunet_network_lib.h
gnunet/src/lockmanager/lockmanager.conf.in
gnunet/src/mesh/mesh.conf.in
gnunet/src/multicast/multicast.conf.in
gnunet/src/namestore/namestore.conf.in
gnunet/src/nat/nat_test.c
gnunet/src/nse/nse.conf.in
gnunet/src/peerinfo/peerinfo.conf.in
gnunet/src/psyc/psyc.conf.in
gnunet/src/psycstore/psycstore.conf.in
gnunet/src/regex/regex.conf.in
gnunet/src/scalarproduct/scalarproduct.conf.in
gnunet/src/set/set.conf.in
gnunet/src/statistics/statistics.conf.in
gnunet/src/testbed/testbed.conf.in
gnunet/src/testing/testing.c
gnunet/src/transport/gnunet-helper-transport-bluetooth.c
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/transport/plugin_transport_unix.c
gnunet/src/transport/transport.conf.in
gnunet/src/util/client.c
gnunet/src/util/connection.c
gnunet/src/util/disk.c
gnunet/src/util/network.c
gnunet/src/util/resolver.conf.in
gnunet/src/util/server.c
gnunet/src/util/service.c
gnunet/src/util/test_connection.c
gnunet/src/util/test_connection_addressing.c
gnunet/src/util/test_connection_receive_cancel.c
gnunet/src/util/test_connection_timeout.c
gnunet/src/util/test_server_with_client_unix.c
gnunet/src/vpn/vpn.conf.in
Log:
-undo #29640, somehow causes problems
Modified: gnunet/src/arm/arm.conf.in
===================================================================
--- gnunet/src/arm/arm.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/arm/arm.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -7,7 +7,7 @@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
DEFAULTSERVICES = topology hostlist dht nse mesh fs
-UNIXPATH = $SERVICEHOME/gnunet-service-arm.sock
+UNIXPATH = /tmp/gnunet-service-arm.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/arm/gnunet-service-arm.c
===================================================================
--- gnunet/src/arm/gnunet-service-arm.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/arm/gnunet-service-arm.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -622,8 +622,8 @@
"setsockopt");
#endif
- if (GNUNET_OK !=
- GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) sa,
addr_len))
+ if (GNUNET_NETWORK_socket_bind
+ (sock, (const struct sockaddr *) sa, addr_len, 0) != GNUNET_OK)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_
Modified: gnunet/src/arm/test_exponential_backoff.c
===================================================================
--- gnunet/src/arm/test_exponential_backoff.c 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/arm/test_exponential_backoff.c 2013-09-27 09:49:39 UTC (rev
29645)
@@ -42,7 +42,7 @@
#define BINARY "mockup-service"
-#define CFGFILENAME "test_arm_api_data_copy.conf"
+#define CFGFILENAME "test_arm_api_data2.conf"
static const struct GNUNET_CONFIGURATION_Handle *cfg;
Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/ats/ats.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-ats.sock
+UNIXPATH = /tmp/gnunet-service-ats.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/consensus/consensus.conf.in
===================================================================
--- gnunet/src/consensus/consensus.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/consensus/consensus.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -6,6 +6,6 @@
BINARY = gnunet-service-consensus
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-consensus.sock
+UNIXPATH = /tmp/gnunet-service-consensus.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/core/core.conf.in
===================================================================
--- gnunet/src/core/core.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/core/core.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-core.sock
+UNIXPATH = /tmp/gnunet-service-core.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
Modified: gnunet/src/datastore/datastore.conf.in
===================================================================
--- gnunet/src/datastore/datastore.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/datastore/datastore.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -1,6 +1,6 @@
[datastore]
AUTOSTART = YES
-UNIXPATH = $SERVICEHOME/gnunet-service-datastore.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/dht/dht.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -7,7 +7,7 @@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
BUCKET_SIZE = 4
-UNIXPATH = $SERVICEHOME/gnunet-service-dht.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/dns/dns.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -3,7 +3,7 @@
HOSTNAME = localhost
HOME = $SERVICEHOME
BINARY = gnunet-service-dns
-UNIXPATH = $SERVICEHOME/gnunet-service-dns.sock
+UNIXPATH = /tmp/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/dns/dnsstub.c
===================================================================
--- gnunet/src/dns/dnsstub.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/dns/dnsstub.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -167,11 +167,11 @@
return NULL;
}
sa->sa_family = af;
- if (GNUNET_OK !=
- GNUNET_NETWORK_socket_bind (ret,
- sa,
- alen))
- {
+ if (GNUNET_OK != GNUNET_NETWORK_socket_bind (ret,
+ sa,
+ alen,
+ 0))
+ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Could not bind to any port: %s\n"),
STRERROR (errno));
Modified: gnunet/src/dv/dv.conf.in
===================================================================
--- gnunet/src/dv/dv.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/dv/dv.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
HOME = $SERVICEHOME
HOSTNAME = localhost
@UNIXONLY@ PORT = 2571
-UNIXPATH = $SERVICEHOME/gnunet-service-dv.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC
(rev 29644)
+++ gnunet/src/experimentation/experimentation.conf.in 2013-09-27 09:49:39 UTC
(rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-daemon-experimentation
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-daemon-experimentation.sock
+UNIXPATH = /tmp/gnunet-daemon-experimentation.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
ISSUERS =
TFRM29O2RQNKLVBQIGODJ6GD58LSQ2NM9TNFBC6N48BRJHQO38Q73N2OM3V4CLKDM6CILQV4CU8PMJDRG0FNB0PDI057DBRANMLPLRG
\ No newline at end of file
Modified: gnunet/src/fs/fs.conf.in
===================================================================
--- gnunet/src/fs/fs.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/fs/fs.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -22,7 +22,7 @@
# (may improve anonymity, probably not a good idea if content_caching is NO)
CONTENT_PUSHING = YES
-UNIXPATH = $SERVICEHOME/gnunet-service-fs.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/gns/gns.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -3,7 +3,7 @@
HOSTNAME = localhost
HOME = $SERVICEHOME
BINARY = gnunet-service-gns
-UNIXPATH = $SERVICEHOME/gnunet-service-gns.sock
+UNIXPATH = /tmp/gnunet-service-gns.sock
@address@hidden = 2102
ZONE_DIR = $SERVICEHOME/gns/
@@ -32,7 +32,7 @@
# Where is the certificate for the GNS proxy stored?
PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem
-PROXY_UNIXPATH = $SERVICEHOME/gnunet-gns-proxy.sock
+PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
[fcfsd]
Modified: gnunet/src/gns/gnunet-dns2gns.c
===================================================================
--- gnunet/src/gns/gnunet-dns2gns.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/gns/gnunet-dns2gns.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -616,7 +616,8 @@
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (listen_socket4,
(struct sockaddr *) &v4,
- sizeof (v4)))
+ sizeof (v4),
+ 0))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
GNUNET_NETWORK_socket_close (listen_socket4);
@@ -639,7 +640,8 @@
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (listen_socket6,
(struct sockaddr *) &v6,
- sizeof (v6)))
+ sizeof (v6),
+ 0))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
GNUNET_NETWORK_socket_close (listen_socket6);
Modified: gnunet/src/identity/identity.conf.in
===================================================================
--- gnunet/src/identity/identity.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/identity/identity.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-identity
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-identity.unix
+UNIXPATH = /tmp/gnunet-service-identity.unix
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
Modified: gnunet/src/include/gnunet_network_lib.h
===================================================================
--- gnunet/src/include/gnunet_network_lib.h 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/include/gnunet_network_lib.h 2013-09-27 09:49:39 UTC (rev
29645)
@@ -132,17 +132,25 @@
/**
+ * Fail to bind if an address is already in use.
+ */
+#define GNUNET_BIND_EXCLUSIVE 0x01
+
+
+/**
* Bind a socket to a particular address.
*
* @param desc socket to bind
* @param address address to be bound
* @param address_len length of address
+ * @param flags flags affecting bind behaviour
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address,
- socklen_t address_len);
+ socklen_t address_len,
+ int flags);
/**
* Close a socket.
Modified: gnunet/src/lockmanager/lockmanager.conf.in
===================================================================
--- gnunet/src/lockmanager/lockmanager.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/lockmanager/lockmanager.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-lockmanager
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-lockmanager.sock
+UNIXPATH = /tmp/gnunet-service-lockmanager.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/mesh/mesh.conf.in
===================================================================
--- gnunet/src/mesh/mesh.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/mesh/mesh.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-mesh.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/multicast/multicast.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-multicast
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-multicast.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/namestore/namestore.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -1,6 +1,6 @@
[namestore]
AUTOSTART = YES
-UNIXPATH = $SERVICEHOME/gnunet-service-namestore.sock
+UNIXPATH = /tmp/gnunet-service-namestore.sock
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
@UNIXONLY@ PORT = 2099
Modified: gnunet/src/nat/nat_test.c
===================================================================
--- gnunet/src/nat/nat_test.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/nat/nat_test.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -404,7 +404,7 @@
if ((ret->lsock == NULL) ||
(GNUNET_OK !=
GNUNET_NETWORK_socket_bind (ret->lsock, (const struct sockaddr *) &sa,
- sizeof (sa))))
+ sizeof (sa), 0)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
Modified: gnunet/src/nse/nse.conf.in
===================================================================
--- gnunet/src/nse/nse.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/nse/nse.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-nse.unix
+UNIXPATH = /tmp/gnunet-service-nse.unix
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
PROOFFILE = $SERVICEHOME/.nse-proof
Modified: gnunet/src/peerinfo/peerinfo.conf.in
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/peerinfo/peerinfo.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-peerinfo.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/psyc/psyc.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -2,6 +2,6 @@
AUTOSTART = YES
HOME = $SERVICEHOME
BINARY = gnunet-service-psyc
-UNIXPATH = $SERVICEHOME/gnunet-service-psyc.sock
+UNIXPATH = /tmp/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-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/psycstore/psycstore.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -2,7 +2,7 @@
AUTOSTART = YES
HOME = $SERVICEHOME
BINARY = gnunet-service-psycstore
-UNIXPATH = $SERVICEHOME/gnunet-service-psycstore.sock
+UNIXPATH = /tmp/gnunet-service-psycstore.sock
@address@hidden = 2111
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
Modified: gnunet/src/regex/regex.conf.in
===================================================================
--- gnunet/src/regex/regex.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/regex/regex.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -1,7 +1,7 @@
[regex]
AUTOSTART = YES
@UNIXONLY@ PORT = 2107
-UNIXPATH = $SERVICEHOME/gnunet-service-regex.sock
+UNIXPATH = /tmp/gnunet-service-regex.sock
HOSTNAME = localhost
HOME = $SERVICEHOME
BINARY = gnunet-service-regex
Modified: gnunet/src/scalarproduct/scalarproduct.conf.in
===================================================================
--- gnunet/src/scalarproduct/scalarproduct.conf.in 2013-09-27 09:10:45 UTC
(rev 29644)
+++ gnunet/src/scalarproduct/scalarproduct.conf.in 2013-09-27 09:49:39 UTC
(rev 29645)
@@ -1,6 +1,6 @@
[vectorproduct]
BINARY = gnunet-service-vectorproduct
-UNIXPATH = $SERVICEHOME/gnunet-service-vectorproduct.sock
+UNIXPATH = /tmp/gnunet-service-vectorproduct.sock
HOME = $SERVICEHOME
# PORT = 2106
@UNIXONLY@ PORT = 2087
Modified: gnunet/src/set/set.conf.in
===================================================================
--- gnunet/src/set/set.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/set/set.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,6 +6,6 @@
BINARY = gnunet-service-set
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-set.sock
+UNIXPATH = /tmp/gnunet-service-set.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/statistics/statistics.conf.in
===================================================================
--- gnunet/src/statistics/statistics.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/statistics/statistics.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-statistics.sock
+UNIXPATH = /tmp/gnunet-service-statistics.sock
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
# DISABLE_SOCKET_FORWARDING = NO
Modified: gnunet/src/testbed/testbed.conf.in
===================================================================
--- gnunet/src/testbed/testbed.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/testbed/testbed.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -19,7 +19,7 @@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-testbed.sock
+UNIXPATH = /tmp/gnunet-service-testbed.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
@@ -88,7 +88,7 @@
@UNIXONLY@ PORT = 2102
HOSTNAME = localhost
BINARY = gnunet-service-testbed-logger
-UNIXPATH = $SERVICEHOME/gnunet-gnunet-testbed-logger.sock
+UNIXPATH = /tmp/gnunet-gnunet-testbed-logger.sock
DIR = /tmp
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
@@ -98,6 +98,6 @@
AUTOSTART = NO
@UNIXONLY@ PORT = 2103
HOSTNAME = localhost
-UNIXPATH = $SERVICEHOME/gnunet-service-testbed-barrier.sock
+UNIXPATH = /tmp/gnunet-service-testbed-barrier.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/testing/testing.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -619,7 +619,8 @@
continue;
bind_status = GNUNET_NETWORK_socket_bind (socket,
ai->ai_addr,
- ai->ai_addrlen);
+ ai->ai_addrlen,
+ 0);
GNUNET_NETWORK_socket_close (socket);
if (GNUNET_OK != bind_status)
break;
@@ -628,7 +629,8 @@
continue;
bind_status = GNUNET_NETWORK_socket_bind (socket,
ai->ai_addr,
- ai->ai_addrlen);
+ ai->ai_addrlen,
+ 0);
GNUNET_NETWORK_socket_close (socket);
if (GNUNET_OK != bind_status)
break;
Modified: gnunet/src/transport/gnunet-helper-transport-bluetooth.c
===================================================================
--- gnunet/src/transport/gnunet-helper-transport-bluetooth.c 2013-09-27
09:10:45 UTC (rev 29644)
+++ gnunet/src/transport/gnunet-helper-transport-bluetooth.c 2013-09-27
09:49:39 UTC (rev 29645)
@@ -1070,7 +1070,6 @@
return count;
}
-
/**
* Open the bluetooth interface for reading/writing
*
@@ -1088,8 +1087,7 @@
addr.btAddr = 0;
addr.port = BT_PORT_ANY;
- if (GNUNET_OK !=
- GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr, sizeof
(SOCKADDR_BTH)))
+ if (GNUNET_NETWORK_socket_bind (dev->handle, (const SOCKADDR*)&addr,
sizeof (SOCKADDR_BTH), 0) != GNUNET_OK)
{
fprintf (stderr, "Failed to bind the socket: ");
if (GetLastError() == WSAENETDOWN)
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-09-27 09:49:39 UTC (rev
29645)
@@ -2808,7 +2808,7 @@
GNUNET_a2s (serverAddr, addrlen));
/* binding */
if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6,
- serverAddr,
addrlen))
+ serverAddr,
addrlen, 0))
break;
eno = errno;
if (0 != plugin->port)
@@ -2885,7 +2885,7 @@
/* binding */
if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4,
- serverAddr, addrlen))
+ serverAddr, addrlen, 0))
break;
eno = errno;
if (0 != plugin->port)
Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c 2013-09-27 09:10:45 UTC
(rev 29644)
+++ gnunet/src/transport/plugin_transport_unix.c 2013-09-27 09:49:39 UTC
(rev 29645)
@@ -572,6 +572,7 @@
const void *sb;
size_t sbs;
struct sockaddr_un un;
+ size_t slen;
const char *unix_path;
@@ -591,12 +592,21 @@
unix_path = (const char *) &addr[1];
memset (&un, 0, sizeof (un));
un.sun_family = AF_UNIX;
- strncpy (un.sun_path, unix_path, sizeof (un.sun_path) - 1);
+ slen = strlen (unix_path);
+ if (slen >= sizeof (un.sun_path))
+ slen = sizeof (un.sun_path) - 1;
+ GNUNET_assert (slen < sizeof (un.sun_path));
+ memcpy (un.sun_path, unix_path, slen);
+ un.sun_path[slen] = '\0';
+ slen = sizeof (struct sockaddr_un);
+#if LINUX
+ un.sun_path[0] = '\0';
+#endif
#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) sizeof (struct sockaddr_un);
+ un.sun_len = (u_char) slen;
#endif
sb = (struct sockaddr *) &un;
- sbs = sizeof (struct sockaddr_un);
+ sbs = slen;
resend:
/* Send the data */
@@ -1013,18 +1023,19 @@
}
else
{
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Read %d bytes from socket %s\n",
- (int) ret,
- un.sun_path);
+#if LINUX
+ un.sun_path[0] = '/';
+#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Read %d bytes from socket %s\n", ret,
+ &un.sun_path[0]);
}
GNUNET_assert (AF_UNIX == (un.sun_family));
- ua_len = sizeof (struct UnixAddress) + strlen (un.sun_path) + 1;
+ ua_len = sizeof (struct UnixAddress) + strlen (&un.sun_path[0]) +1;
ua = GNUNET_malloc (ua_len);
ua->addrlen = htonl (strlen (&un.sun_path[0]) +1);
ua->options = htonl (0);
- memcpy (&ua[1], &un.sun_path[0], strlen (un.sun_path) + 1);
+ memcpy (&ua[1], &un.sun_path[0], strlen (&un.sun_path[0]) +1);
msg = (struct UNIXMessage *) buf;
csize = ntohs (msg->header.size);
@@ -1203,7 +1214,7 @@
* Create a slew of UNIX sockets. If possible, use IPv6 and IPv4.
*
* @param cls closure for server start, should be a struct Plugin *
- * @return number of sockets created or #GNUNET_SYSERR on error
+ * @return number of sockets created or GNUNET_SYSERR on error
*/
static int
unix_transport_server_start (void *cls)
@@ -1212,16 +1223,26 @@
struct sockaddr *serverAddr;
socklen_t addrlen;
struct sockaddr_un un;
+ size_t slen;
memset (&un, 0, sizeof (un));
un.sun_family = AF_UNIX;
- strncpy (un.sun_path, plugin->unix_socket_path, sizeof (un.sun_path) - 1);
+ slen = strlen (plugin->unix_socket_path) + 1;
+ if (slen >= sizeof (un.sun_path))
+ slen = sizeof (un.sun_path) - 1;
+
+ memcpy (un.sun_path, plugin->unix_socket_path, slen);
+ un.sun_path[slen] = '\0';
+ slen = sizeof (struct sockaddr_un);
#if HAVE_SOCKADDR_IN_SIN_LEN
- un.sun_len = (u_char) sizeof (struct sockaddr_un);
+ un.sun_len = (u_char) slen;
#endif
serverAddr = (struct sockaddr *) &un;
- addrlen = sizeof (struct sockaddr_un);
+ addrlen = slen;
+#if LINUX
+ un.sun_path[0] = '\0';
+#endif
plugin->ats_network = plugin->env->get_address_type (plugin->env->cls,
serverAddr, addrlen);
plugin->unix_sock.desc =
GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_DGRAM, 0);
@@ -1230,8 +1251,8 @@
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
return GNUNET_SYSERR;
}
- if (GNUNET_OK !=
- GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen))
+ if (GNUNET_NETWORK_socket_bind (plugin->unix_sock.desc, serverAddr, addrlen,
0)
+ != GNUNET_OK)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
GNUNET_NETWORK_socket_close (plugin->unix_sock.desc);
Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/transport/transport.conf.in 2013-09-27 09:49:39 UTC (rev
29645)
@@ -9,7 +9,7 @@
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
PLUGINS = tcp udp
-UNIXPATH = $SERVICEHOME/gnunet-service-transport.sock
+UNIXPATH = /tmp/gnunet-service-transport.sock
BLACKLIST_FILE = $SERVICEHOME/blacklist
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/client.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -251,9 +251,7 @@
struct sockaddr_un s_un;
unixpath = NULL;
- if ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg, service_name,
- "UNIXPATH", &unixpath)) &&
+ if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
"UNIXPATH", &unixpath)) &&
(0 < strlen (unixpath)))
{
/* We have a non-NULL unixpath, need to validate it */
@@ -301,8 +299,7 @@
#if AF_UNIX
char *unixpath = NULL;
- if ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg, service_name, "UNIXPATH",
&unixpath)) &&
+ if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, service_name,
"UNIXPATH", &unixpath)) &&
(0 < strlen (unixpath)))
ret = GNUNET_OK;
GNUNET_free_non_null (unixpath);
@@ -832,12 +829,11 @@
{
/* probe UNIX support */
struct sockaddr_un s_un;
+ size_t slen;
char *unixpath;
unixpath = NULL;
- if ((GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg, service, "UNIXPATH",
&unixpath)) &&
- (0 < strlen (unixpath))) /* We have a non-NULL unixpath, does that
mean it's valid? */
+ if ((GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (cfg, service,
"UNIXPATH", &unixpath)) && (0 < strlen (unixpath))) /* We have a non-NULL
unixpath, does that mean it's valid? */
{
if (strlen (unixpath) >= sizeof (s_un.sun_path))
{
@@ -856,13 +852,21 @@
{
memset (&s_un, 0, sizeof (s_un));
s_un.sun_family = AF_UNIX;
- strncpy (s_un.sun_path, unixpath, sizeof (s_un.sun_path) - 1);
+ slen = strlen (unixpath) + 1;
+ if (slen >= sizeof (s_un.sun_path))
+ slen = sizeof (s_un.sun_path) - 1;
+ memcpy (s_un.sun_path, unixpath, slen);
+ s_un.sun_path[slen] = '\0';
+ slen = sizeof (struct sockaddr_un);
+#if LINUX
+ s_un.sun_path[0] = '\0';
+#endif
#if HAVE_SOCKADDR_IN_SIN_LEN
- s_un.sun_len = (u_char) sizeof (struct sockaddr_un);
+ s_un.sun_len = (u_char) slen;
#endif
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) &s_un,
- sizeof (struct sockaddr_un)))
+ slen, GNUNET_BIND_EXCLUSIVE))
{
/* failed to bind => service must be running */
GNUNET_free (unixpath);
@@ -912,7 +916,7 @@
{
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) &s_in,
- sizeof (s_in)))
+ sizeof (s_in), GNUNET_BIND_EXCLUSIVE))
{
/* failed to bind => service must be running */
GNUNET_free (hostname);
@@ -945,7 +949,7 @@
{
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (sock, (const struct sockaddr *) &s_in6,
- sizeof (s_in6)))
+ sizeof (s_in6), GNUNET_BIND_EXCLUSIVE))
{
/* failed to bind => service must be running */
GNUNET_free (hostname);
Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/connection.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -828,14 +828,23 @@
#ifdef AF_UNIX
struct GNUNET_CONNECTION_Handle *connection;
struct sockaddr_un *un;
+ size_t slen;
GNUNET_assert (0 < strlen (unixpath)); /* sanity check */
un = GNUNET_new (struct sockaddr_un);
un->sun_family = AF_UNIX;
- strncpy(un->sun_path, unixpath, sizeof(un->sun_path) - 1);
+ slen = strlen (unixpath);
+ if (slen >= sizeof (un->sun_path))
+ slen = sizeof (un->sun_path) - 1;
+ memcpy (un->sun_path, unixpath, slen);
+ un->sun_path[slen] = '\0';
+ slen = sizeof (struct sockaddr_un);
#if HAVE_SOCKADDR_IN_SIN_LEN
- un->sun_len = (u_char) sizeof (struct sockaddr_un);
+ un->sun_len = (u_char) slen;
#endif
+#if LINUX
+ un->sun_path[0] = '\0';
+#endif
connection = GNUNET_new (struct GNUNET_CONNECTION_Handle);
connection->cfg = cfg;
connection->write_buffer_size = GNUNET_SERVER_MIN_BUFFER_SIZE;
@@ -843,7 +852,7 @@
connection->port = 0;
connection->hostname = NULL;
connection->addr = (struct sockaddr *) un;
- connection->addrlen = sizeof (struct sockaddr_un);
+ connection->addrlen = slen;
connection->sock = GNUNET_NETWORK_socket_create (AF_UNIX, SOCK_STREAM, 0);
if (NULL == connection->sock)
{
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/disk.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -759,12 +759,13 @@
/**
- * Create the directory structure for storing a file.
+ * Create the directory structure for storing
+ * a file.
*
* @param filename name of a file in the directory
- * @returns #GNUNET_OK on success,
- * #GNUNET_SYSERR on failure,
- * #GNUNET_NO if the directory
+ * @returns GNUNET_OK on success,
+ * GNUNET_SYSERR on failure,
+ * GNUNET_NO if the directory
* exists but is not writeable for us
*/
int
@@ -791,11 +792,10 @@
/**
* Read the contents of a binary file into a buffer.
- *
* @param h handle to an open file
* @param result the buffer to write the result to
* @param len the maximum number of bytes to read
- * @return the number of bytes read on success, #GNUNET_SYSERR on failure
+ * @return the number of bytes read on success, GNUNET_SYSERR on failure
*/
ssize_t
GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle * h, void *result,
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/network.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -87,9 +87,7 @@
{
if (EAFNOSUPPORT == errno)
return GNUNET_NO;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- "Failed to create test socket: %s\n",
- STRERROR (errno));
+ fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
return GNUNET_SYSERR;
}
#if WINDOWS
@@ -385,18 +383,20 @@
* @param desc socket to bind
* @param address address to be bound
* @param address_len length of @a address
+ * @param flags flags affecting bind behaviour
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address,
- socklen_t address_len)
+ socklen_t address_len,
+ int flags)
{
int ret;
socklen_t bind_address_len = address_len;
#ifdef LINUX
- if (AF_UNIX == address->sa_family)
+ if (address->sa_family == AF_UNIX)
{
const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
if (address_un->sun_path[0] == '\0')
@@ -431,6 +431,16 @@
LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
}
#endif
+#ifndef LINUX
+#ifndef MINGW
+ if (address->sa_family == AF_UNIX && (flags & GNUNET_BIND_EXCLUSIVE) == 0)
+ {
+ const struct sockaddr_un *un = (const struct sockaddr_un *) address;
+
+ (void) unlink (un->sun_path);
+ }
+#endif
+#endif
ret = bind (desc->fd, address, bind_address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
@@ -439,10 +449,12 @@
if (ret != 0)
return GNUNET_SYSERR;
#ifndef MINGW
+#ifndef LINUX
desc->addr = GNUNET_malloc (address_len);
memcpy (desc->addr, address, address_len);
desc->addrlen = address_len;
#endif
+#endif
return GNUNET_OK;
}
@@ -471,17 +483,17 @@
#else
ret = close (desc->fd);
#endif
+#ifndef LINUX
#ifndef MINGW
if ((desc->af == AF_UNIX) && (NULL != desc->addr))
{
const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr;
if (0 != unlink (un->sun_path))
- LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- un->sun_path);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", un->sun_path);
}
#endif
+#endif
GNUNET_NETWORK_socket_free_memory_only_ (desc);
return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
}
Modified: gnunet/src/util/resolver.conf.in
===================================================================
--- gnunet/src/util/resolver.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/resolver.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-resolver.sock
+UNIXPATH = /tmp/gnunet-service-resolver.sock
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = NO
# DISABLE_SOCKET_FORWARDING = NO
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/server.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -469,7 +469,7 @@
return NULL;
}
/* bind the socket */
- if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen))
+ if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen, 0))
{
eno = errno;
if (EADDRINUSE != errno)
Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/service.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -841,15 +841,24 @@
{
#ifdef AF_UNIX
struct sockaddr_un *un;
+ size_t slen;
un = GNUNET_malloc (sizeof (struct sockaddr_un));
un->sun_family = AF_UNIX;
- strncpy (un->sun_path, unixpath, sizeof (un->sun_path) - 1);
+ slen = strlen (unixpath) + 1;
+ if (slen >= sizeof (un->sun_path))
+ slen = sizeof (un->sun_path) - 1;
+ memcpy (un->sun_path, unixpath, slen);
+ un->sun_path[slen] = '\0';
+ slen = sizeof (struct sockaddr_un);
+#if LINUX
+ un->sun_path[0] = '\0';
+#endif
#if HAVE_SOCKADDR_IN_SIN_LEN
- un->sun_len = (u_char) sizeof (struct sockaddr_un);
+ un->sun_len = (u_char) slen;
#endif
*saddrs = (struct sockaddr *) un;
- *saddrlens = sizeof (struct sockaddr_un);
+ *saddrlens = slen;
#else
/* this function should never be called
* unless AF_UNIX is defined! */
@@ -971,8 +980,8 @@
if ((GNUNET_YES ==
GNUNET_CONFIGURATION_have_value (cfg, service_name, "UNIXPATH")) &&
(GNUNET_OK ==
- GNUNET_CONFIGURATION_get_value_filename (cfg, service_name, "UNIXPATH",
- &unixpath)) &&
+ GNUNET_CONFIGURATION_get_value_string (cfg, service_name, "UNIXPATH",
+ &unixpath)) &&
(0 < strlen (unixpath)))
{
/* probe UNIX support */
@@ -987,11 +996,6 @@
LOG (GNUNET_ERROR_TYPE_INFO,
_("Using `%s' instead\n"), unixpath);
}
- if (GNUNET_OK !=
- GNUNET_DISK_directory_create_for_file (unixpath))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
- "mkdir",
- unixpath);
}
if (NULL != unixpath)
{
Modified: gnunet/src/util/test_connection.c
===================================================================
--- gnunet/src/util/test_connection.c 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/util/test_connection.c 2013-09-27 09:49:39 UTC (rev 29645)
@@ -65,9 +65,9 @@
if (GNUNET_NETWORK_socket_setsockopt
(desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_OK ==
- GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *)
&sa,
- sizeof (sa)));
+ GNUNET_assert (GNUNET_NETWORK_socket_bind
+ (desc, (const struct sockaddr *) &sa,
+ sizeof (sa), 0) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
Modified: gnunet/src/util/test_connection_addressing.c
===================================================================
--- gnunet/src/util/test_connection_addressing.c 2013-09-27 09:10:45 UTC
(rev 29644)
+++ gnunet/src/util/test_connection_addressing.c 2013-09-27 09:49:39 UTC
(rev 29645)
@@ -68,7 +68,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
if (GNUNET_OK !=
GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *) &sa,
- sizeof (sa)))
+ sizeof (sa), 0))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"bind");
Modified: gnunet/src/util/test_connection_receive_cancel.c
===================================================================
--- gnunet/src/util/test_connection_receive_cancel.c 2013-09-27 09:10:45 UTC
(rev 29644)
+++ gnunet/src/util/test_connection_receive_cancel.c 2013-09-27 09:49:39 UTC
(rev 29645)
@@ -64,9 +64,9 @@
if (GNUNET_NETWORK_socket_setsockopt
(desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_OK ==
- GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *)
&sa,
- sizeof (sa)));
+ GNUNET_assert (GNUNET_NETWORK_socket_bind
+ (desc, (const struct sockaddr *) &sa,
+ sizeof (sa), 0) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
Modified: gnunet/src/util/test_connection_timeout.c
===================================================================
--- gnunet/src/util/test_connection_timeout.c 2013-09-27 09:10:45 UTC (rev
29644)
+++ gnunet/src/util/test_connection_timeout.c 2013-09-27 09:49:39 UTC (rev
29645)
@@ -61,9 +61,9 @@
if (GNUNET_NETWORK_socket_setsockopt
(desc, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)) != GNUNET_OK)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
- GNUNET_assert (GNUNET_OK ==
- GNUNET_NETWORK_socket_bind (desc, (const struct sockaddr *)
&sa,
- sizeof (sa)));
+ GNUNET_assert (GNUNET_NETWORK_socket_bind
+ (desc, (const struct sockaddr *) &sa,
+ sizeof (sa), 0) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
Modified: gnunet/src/util/test_server_with_client_unix.c
===================================================================
--- gnunet/src/util/test_server_with_client_unix.c 2013-09-27 09:10:45 UTC
(rev 29644)
+++ gnunet/src/util/test_server_with_client_unix.c 2013-09-27 09:49:39 UTC
(rev 29645)
@@ -134,15 +134,20 @@
{
struct sockaddr_un un;
const char *unixpath = "/tmp/testsock";
+ size_t slen = strlen (unixpath);
struct sockaddr *sap[2];
socklen_t slens[2];
memset (&un, 0, sizeof (un));
un.sun_family = AF_UNIX;
- strncpy(un.sun_path, unixpath, sizeof (un.sun_path) - 1);
+ memcpy (un.sun_path, unixpath, slen);
+ un.sun_path[slen] = '\0';
#if HAVE_SOCKADDR_IN_SIN_LEN
un.sun_len = (u_char) sizeof (un);
#endif
+#if LINUX
+ un.sun_path[0] = '\0';
+#endif
sap[0] = (struct sockaddr *) &un;
slens[0] = sizeof (un);
Modified: gnunet/src/vpn/vpn.conf.in
===================================================================
--- gnunet/src/vpn/vpn.conf.in 2013-09-27 09:10:45 UTC (rev 29644)
+++ gnunet/src/vpn/vpn.conf.in 2013-09-27 09:49:39 UTC (rev 29645)
@@ -6,7 +6,7 @@
BINARY = gnunet-service-vpn
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-vpn.sock
+UNIXPATH = /tmp/gnunet-service-vpn.sock
UNIX_MATCH_UID = YES
UNIX_MATCH_GID = YES
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29645 - in gnunet/src: arm ats consensus core datastore dht dns dv experimentation fs gns identity include lockmanager mesh multicast namestore nat nse peerinfo psyc psycstore regex scalarproduct set statistics testbed testing transport util vpn,
gnunet <=