* @author Christian Grothoff
*/
#include "platform.h"
-#include "disk.h"
#include "gnunet_util_lib.h"
+#include "disk.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
{
if (EAFNOSUPPORT == errno)
return GNUNET_NO;
- fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create test socket: %s\n",
+ STRERROR (errno));
return GNUNET_SYSERR;
}
#if WINDOWS
struct GNUNET_CRYPTO_HashAsciiEncoded ae;
size_t upm;
- upm = sizeof (dummy.sun_path);
+ upm = sizeof (dummy.sun_path);
slen = strlen (unixpath);
if (slen < upm)
return unixpath; /* no shortening required */
int abs_value = 1;
if (0 !=
- setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
+ setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
(const void *) &abs_value,
sizeof (abs_value)))
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
const char *abs_value = "1";
if (0 !=
- setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
+ setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
(const void *) abs_value,
sizeof (abs_value)))
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
#ifdef DARWIN
socket_set_nosigpipe (h);
#endif
- if ( (type == SOCK_STREAM)
+ if ( (type == SOCK_STREAM)
#ifdef AF_UNIX
&& (af != AF_UNIX)
#endif
*/
struct GNUNET_NETWORK_Handle *
GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
- struct sockaddr *address,
+ struct sockaddr *address,
socklen_t *address_len)
{
struct GNUNET_NETWORK_Handle *ret;
int gsn = getsockname (desc->fd, &name, &namelen);
if (gsn == 0)
- LOG (GNUNET_ERROR_TYPE_DEBUG,
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
"Accepting connection on `%s'\n",
GNUNET_a2s (&name, namelen));
}
* @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,
- int flags)
+ socklen_t address_len)
{
int ret;
- socklen_t bind_address_len = address_len;
-
-#ifdef LINUX
- if (address->sa_family == AF_UNIX)
- {
- const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
- if (address_un->sun_path[0] == '\0')
- bind_address_len = \
- sizeof (struct sockaddr_un) \
- - sizeof (address_un->sun_path) \
- + strnlen (address_un->sun_path + 1, sizeof (address_un->sun_path) - 1) \
- + 1;
- }
-#endif
#ifdef IPV6_V6ONLY
#ifdef IPPROTO_IPV6
{
const int on = 1;
- if (desc->af == AF_INET6)
- if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
- (const void *) &on,
+ if (AF_INET6 == desc->af)
+ if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
+ (const void *) &on,
sizeof (on)))
LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
}
#ifndef WINDOWS
{
const int on = 1;
-
+
/* This is required here for TCP sockets, but only on UNIX */
- if ((SOCK_STREAM == desc->type)
+ if ((SOCK_STREAM == desc->type)
&& (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on))))
LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
}
#endif
-#ifndef LINUX
-#ifndef MINGW
- if (address->sa_family == AF_UNIX && (flags & GNUNET_BIND_EXCLUSIVE) == 0)
+#ifndef WINDOWS
{
- const struct sockaddr_un *un = (const struct sockaddr_un *) address;
+ /* set permissions of newly created UNIX domain socket to "user-only"; applications
+ can choose to relax this later */
+ mode_t old_mask = 0; /* assigned to make compiler happy */
- (void) unlink (un->sun_path);
- }
+ if (AF_UNIX == address->sa_family)
+ old_mask = umask (S_IWGRP | S_IRGRP | S_IXGRP | S_IWOTH | S_IROTH | S_IXOTH);
#endif
+
+ ret = bind (desc->fd, address, address_len);
+#ifndef WINDOWS
+ if (AF_UNIX == address->sa_family)
+ (void) umask (old_mask);
+ }
#endif
- ret = bind (desc->fd, address, bind_address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
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;
}
#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;
{
int ret;
-#ifdef LINUX
- if (address->sa_family == AF_UNIX)
- {
- const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
- if(address_un->sun_path[0] == '\0')
- address_len = \
- sizeof (struct sockaddr_un) \
- - sizeof (address_un->sun_path) \
- + strnlen (address_un->sun_path + 1, sizeof (address_un->sun_path) - 1) \
- + 1;
- }
-#endif
ret = connect (desc->fd, address, address_len);
#ifdef MINGW
#endif
#ifdef MSG_NOSIGNAL
flags |= MSG_NOSIGNAL;
-#endif
-#ifdef LINUX
- if (dest_addr->sa_family == AF_UNIX)
- {
- const struct sockaddr_un *dest_addr_un = (const struct sockaddr_un *)dest_addr;
- if (dest_addr_un->sun_path[0] == '\0')
- dest_len = \
- sizeof (struct sockaddr) \
- - sizeof (dest_addr_un->sun_path) \
- + strnlen (dest_addr_un->sun_path + 1, sizeof (dest_addr_un->sun_path) - 1) \
- + 1;
- }
#endif
ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len);
#ifdef MINGW
tv.tv_usec =
(timeout.rel_value_us -
(tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
- return select (nfds,
+ return select (nfds,
(NULL != rfds) ? &rfds->sds : NULL,
(NULL != wfds) ? &wfds->sds : NULL,
(NULL != efds) ? &efds->sds : NULL,