/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
* @file util/network.c
* @brief basic, low-level networking interface
* @author Nils Durner
+ * @author Christian Grothoff
*/
-
#include "platform.h"
-#include "gnunet_disk_lib.h"
+#include "gnunet_util_lib.h"
#include "disk.h"
-#include "gnunet_container_lib.h"
-#define DEBUG_NETWORK GNUNET_YES
+#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)
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
+#define DEBUG_NETWORK GNUNET_EXTRA_LOGGING
+
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
#endif
+/**
+ * @brief handle to a socket
+ */
struct GNUNET_NETWORK_Handle
{
#ifndef MINGW
int fd;
-
#else
SOCKET fd;
#endif
*/
int af;
+ /**
+ * Type of the socket
+ */
+ int type;
+
/**
* Number of bytes in addr.
*/
};
-struct GNUNET_NETWORK_FDSet
+/**
+ * Test if the given protocol family is supported by this system.
+ *
+ * @param pf protocol family to test (PF_INET, PF_INET6, PF_UNIX)
+ * @return #GNUNET_OK if the PF is supported
+ */
+int
+GNUNET_NETWORK_test_pf (int pf)
{
+ int s;
- /**
- * Maximum number of any socket socket descriptor in the set (plus one)
- */
- int nsds;
+ s = socket (pf, SOCK_STREAM, 0);
+ if (-1 == s)
+ {
+ if (EAFNOSUPPORT == errno)
+ return GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Failed to create test socket: %s\n",
+ STRERROR (errno));
+ return GNUNET_SYSERR;
+ }
+#if WINDOWS
+ closesocket (s);
+#else
+ close (s);
+#endif
+ return GNUNET_OK;
+}
- /**
- * Bitset with the descriptors.
- */
- fd_set sds;
-#ifdef WINDOWS
- /**
- * Linked list of handles
- */
- struct GNUNET_CONTAINER_SList *handles;
-#endif
+/**
+ * Given a unixpath that is too long (larger than UNIX_PATH_MAX),
+ * shorten it to an acceptable length while keeping it unique
+ * and making sure it remains a valid filename (if possible).
+ *
+ * @param unixpath long path, will be freed (or same pointer returned
+ * with moved 0-termination).
+ * @return shortened unixpath, NULL on error
+ */
+char *
+GNUNET_NETWORK_shorten_unixpath (char *unixpath)
+{
+ struct sockaddr_un dummy;
+ size_t slen;
+ char *end;
+ struct GNUNET_HashCode sh;
+ struct GNUNET_CRYPTO_HashAsciiEncoded ae;
+ size_t upm;
+
+ upm = sizeof (dummy.sun_path);
+ slen = strlen (unixpath);
+ if (slen < upm)
+ return unixpath; /* no shortening required */
+ GNUNET_CRYPTO_hash (unixpath, slen, &sh);
+ while (16 +
+ strlen (unixpath) >= upm)
+ {
+ if (NULL == (end = strrchr (unixpath, '/')))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unable to shorten unix path `%s' while keeping name unique\n"),
+ unixpath);
+ GNUNET_free (unixpath);
+ return NULL;
+ }
+ *end = '\0';
+ }
+ GNUNET_CRYPTO_hash_to_enc (&sh, &ae);
+ strncat (unixpath, (char*) ae.encoding, 16);
+ return unixpath;
+}
-};
#ifndef FD_COPY
#define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))
/**
* Set if a socket should use blocking or non-blocking IO.
+ *
* @param fd socket
* @param doBlock blocking mode
- * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
-static int
-socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int doBlock)
+int
+GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
+ int doBlock)
{
#if MINGW
u_long mode;
+
mode = !doBlock;
- if (ioctlsocket (fd->fd, FIONBIO, &mode) == SOCKET_ERROR)
+ if (SOCKET_ERROR ==
+ ioctlsocket (fd->fd,
+ FIONBIO,
+ &mode))
- {
- SetErrnoFromWinsockError (WSAGetLastError ());
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "ioctlsocket");
- return GNUNET_SYSERR;
- }
+ {
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "ioctlsocket");
+ return GNUNET_SYSERR;
+ }
return GNUNET_OK;
#else
/* not MINGW */
int flags = fcntl (fd->fd, F_GETFL);
+
if (flags == -1)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
- return GNUNET_SYSERR;
- }
+ {
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "fcntl");
+ return GNUNET_SYSERR;
+ }
if (doBlock)
flags &= ~O_NONBLOCK;
else
flags |= O_NONBLOCK;
- if (0 != fcntl (fd->fd, F_SETFL, flags))
+ if (0 != fcntl (fd->fd,
+ F_SETFL,
+ flags))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
- return GNUNET_SYSERR;
- }
+ {
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "fcntl");
+ return GNUNET_SYSERR;
+ }
return GNUNET_OK;
#endif
}
-#ifndef MINGW
/**
* Make a socket non-inheritable to child processes
*
* @param h the socket to make non-inheritable
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
* @warning Not implemented on Windows
*/
static int
socket_set_inheritable (const struct GNUNET_NETWORK_Handle *h)
{
+#ifndef MINGW
int i;
-
- i = fcntl (h->fd, F_GETFD);
+ i = fcntl (h->fd, F_GETFD);
if (i < 0)
return GNUNET_SYSERR;
if (i == (i | FD_CLOEXEC))
i |= FD_CLOEXEC;
if (fcntl (h->fd, F_SETFD, i) < 0)
return GNUNET_SYSERR;
+#else
+ BOOL b;
+ SetLastError (0);
+ b = SetHandleInformation ((HANDLE) h->fd, HANDLE_FLAG_INHERIT, 0);
+ if (!b)
+ {
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ return GNUNET_SYSERR;
+ }
+#endif
return GNUNET_OK;
}
-#endif
#ifdef DARWIN
socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h)
{
int abs_value = 1;
+
if (0 !=
- setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, &abs_value, sizeof (abs_value)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+ setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
+ (const void *) &abs_value,
+ sizeof (abs_value)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
}
#endif
static void
socket_set_nodelay (const struct GNUNET_NETWORK_Handle *h)
{
-#ifndef WINDOWS
+#ifndef WINDOWS
int value = 1;
- if (0 != setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+
+ if (0 !=
+ setsockopt (h->fd,
+ IPPROTO_TCP,
+ TCP_NODELAY,
+ &value, sizeof (value)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "setsockopt");
#else
- const char * abs_value = "1";
- if (0 != setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, abs_value, sizeof (abs_value)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
-#endif
+ const char *abs_value = "1";
+
+ if (0 !=
+ setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY,
+ (const void *) abs_value,
+ sizeof (abs_value)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "setsockopt");
+#endif
+}
+
+
+/**
+ * Perform proper canonical initialization for a network handle.
+ * Set it to non-blocking, make it non-inheritable to child
+ * processes, disable SIGPIPE, enable "nodelay" (if non-UNIX
+ * stream socket) and check that it is smaller than FD_SETSIZE.
+ *
+ * @param h socket to initialize
+ * @param af address family of the socket
+ * @param type socket type
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if initialization
+ * failed and the handle was destroyed
+ */
+static int
+initialize_network_handle (struct GNUNET_NETWORK_Handle *h,
+ int af,
+ int type)
+{
+ int eno;
+
+ h->af = af;
+ h->type = type;
+ if (h->fd == INVALID_SOCKET)
+ {
+#ifdef MINGW
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ eno = errno;
+ GNUNET_free (h);
+ errno = eno;
+ return GNUNET_SYSERR;
+ }
+#ifndef MINGW
+ if (h->fd >= FD_SETSIZE)
+ {
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (h));
+ errno = EMFILE;
+ return GNUNET_SYSERR;
+ }
+#endif
+ if (GNUNET_OK != socket_set_inheritable (h))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "socket_set_inheritable");
+
+ if (GNUNET_SYSERR == GNUNET_NETWORK_socket_set_blocking (h, GNUNET_NO))
+ {
+ eno = errno;
+ GNUNET_break (0);
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (h));
+ errno = eno;
+ return GNUNET_SYSERR;
+ }
+#ifdef DARWIN
+ socket_set_nosigpipe (h);
+#endif
+ if ( (type == SOCK_STREAM)
+#ifdef AF_UNIX
+ && (af != AF_UNIX)
+#endif
+ )
+ socket_set_nodelay (h);
+ return GNUNET_OK;
}
*
* @param desc bound socket
* @param address address of the connecting peer, may be NULL
- * @param address_len length of address
+ * @param address_len length of @a address
* @return client socket
*/
struct GNUNET_NETWORK_Handle *
GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
struct sockaddr *address,
- socklen_t * address_len)
+ socklen_t *address_len)
{
struct GNUNET_NETWORK_Handle *ret;
+ int eno;
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
- ret->fd = accept (desc->fd, address, address_len);
- ret->af = address->sa_family;
- if (ret->fd == INVALID_SOCKET)
- {
-#ifdef MINGW
- SetErrnoFromWinsockError (WSAGetLastError ());
-#endif
- GNUNET_free (ret);
- return NULL;
- }
-#ifndef MINGW
- if (ret->fd >= FD_SETSIZE)
- {
- GNUNET_break (0 == close (ret->fd));
- GNUNET_free (ret);
- errno = EMFILE;
- return NULL;
- }
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
+#if DEBUG_NETWORK
+ {
+ struct sockaddr_storage name;
+ socklen_t namelen = sizeof (name);
+
+ int gsn = getsockname (desc->fd,
+ (struct sockaddr *) &name,
+ &namelen);
+
+ if (0 == gsn)
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Accepting connection on `%s'\n",
+ GNUNET_a2s ((const struct sockaddr *) &name,
+ namelen));
+ }
#endif
- if (GNUNET_SYSERR == socket_set_blocking (ret, GNUNET_NO))
-
- {
-
- /* we might want to treat this one as fatal... */
- GNUNET_break (0);
- GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ret));
- return NULL;
- }
+ ret->fd = accept (desc->fd,
+ address,
+ address_len);
+ if (-1 == ret->fd)
+ {
+ eno = errno;
+ GNUNET_free (ret);
+ errno = eno;
+ return NULL;
+ }
+ if (GNUNET_OK !=
+ initialize_network_handle (ret,
+ (NULL != address) ? address->sa_family : desc->af,
+ SOCK_STREAM))
+ {
-#ifndef MINGW
- if (GNUNET_OK != socket_set_inheritable (ret))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "socket_set_inheritable");
-#endif
-#ifdef DARWIN
- socket_set_nosigpipe (ret);
-#endif
-#ifdef AF_UNIX
- if (address->sa_family != AF_UNIX)
-#endif
- socket_set_nodelay (ret);
+ return NULL;
+ }
return ret;
}
/**
- * Bind to a connected socket
- * @param desc socket
+ * Bind a socket to a particular address.
+ *
+ * @param desc socket to bind
* @param address address to be bound
- * @param address_len length of address
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @param address_len length of @a address
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
socklen_t address_len)
{
int ret;
-
-#ifdef IPV6_V6ONLY
+
+#ifdef IPV6_V6ONLY
#ifdef IPPROTO_IPV6
- const int on = 1;
- if (desc->af == AF_INET6)
- if (0 != setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
-#if 0
- /* is this needed or desired? or done elsewhere? */
- if (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
+ {
+ const int on = 1;
+
+ 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");
+ }
#endif
#endif
+#ifndef WINDOWS
+ {
+ const int on = 1;
+
+ /* This is required here for TCP sockets, but only on UNIX */
+ 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)
- {
- const struct sockaddr_un *un = (const struct sockaddr_un*) address;
- (void) unlink (un->sun_path);
- }
+#ifndef WINDOWS
+ {
+ /* set permissions of newly created non-abstract UNIX domain socket to
+ "user-only"; applications can choose to relax this later */
+ mode_t old_mask = 0; /* assigned to make compiler happy */
+ const struct sockaddr_un *un;
+ int not_abstract = 0;
+
+ if ((AF_UNIX == address->sa_family)
+ && (NULL != (un = (const struct sockaddr_un *) address)->sun_path)
+ && ('\0' != un->sun_path[0]) ) /* Not an abstract socket */
+ not_abstract = 1;
+ if (not_abstract)
+ 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 (not_abstract)
+ (void) umask (old_mask);
+ }
#endif
- ret = bind (desc->fd, address, address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
#endif
if (ret != 0)
- return GNUNET_SYSERR;
+ 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;
}
/**
* Close a socket
+ *
* @param desc socket
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
{
int ret;
-#ifdef MINGW
+#ifdef WINDOWS
+ DWORD error = 0;
+
+ SetLastError (0);
ret = closesocket (desc->fd);
- SetErrnoFromWinsockError (WSAGetLastError ());
+ error = WSAGetLastError ();
+ SetErrnoFromWinsockError (error);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Closed 0x%x, closesocket() returned %d, GLE is %u\n",
+ desc->fd,
+ ret,
+ error);
#else
ret = close (desc->fd);
#endif
-#ifndef LINUX
-#ifndef MINGW
- if ( (desc->af == AF_UNIX) && (NULL != desc->addr) )
+#ifndef WINDOWS
+ const struct sockaddr_un *un;
+
+ /* Cleanup the UNIX domain socket and its parent directories in case of non
+ abstract sockets */
+ if ( (AF_UNIX == desc->af) &&
+ (NULL != desc->addr) &&
+ (NULL != (un = (const struct sockaddr_un *) desc->addr)->sun_path) &&
+ ('\0' != un->sun_path[0]) )
+ {
+ char *dirname = GNUNET_strndup (un->sun_path,
+ sizeof (un->sun_path));
+
+ if (0 != unlink (dirname))
{
- const struct sockaddr_un *un = (const struct sockaddr_un*) desc->addr;
- if (0 != unlink (un->sun_path))
- GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
- "unlink",
- un->sun_path);
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ dirname);
}
+ else
+ {
+ size_t len;
+
+ len = strlen (dirname);
+ while ((len > 0) && (dirname[len] != DIR_SEPARATOR))
+ len--;
+ dirname[len] = '\0';
+ if ((0 != len) && (0 != rmdir (dirname)))
+ {
+ switch (errno)
+ {
+ case EACCES:
+ case ENOTEMPTY:
+ case EPERM:
+ /* these are normal and can just be ignored */
+ break;
+ default:
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "rmdir",
+ dirname);
+ break;
+ }
+ }
+ }
+ GNUNET_free (dirname);
+ }
#endif
-#endif
- GNUNET_free_non_null (desc->addr);
- GNUNET_free (desc);
+ GNUNET_NETWORK_socket_free_memory_only_ (desc);
return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
}
+/**
+ * Only free memory of a socket, keep the file descriptor untouched.
+ *
+ * @param desc socket
+ */
+void
+GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc)
+{
+ GNUNET_free_non_null (desc->addr);
+ GNUNET_free (desc);
+}
+
+
/**
* Box a native socket (and check that it is a socket).
*
* @return NULL on error (including not supported on target platform)
*/
struct GNUNET_NETWORK_Handle *
-GNUNET_NETWORK_socket_box_native (int fd)
+GNUNET_NETWORK_socket_box_native (SOCKTYPE fd)
{
+ struct GNUNET_NETWORK_Handle *ret;
#if MINGW
- return NULL;
+ unsigned long i;
+ DWORD d;
+ /* FIXME: Find a better call to check that FD is valid */
+ if (0 !=
+ WSAIoctl (fd, FIONBIO,
+ (void *) &i, sizeof (i),
+ NULL, 0, &d,
+ NULL, NULL))
+ return NULL; /* invalid FD */
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
+ ret->fd = fd;
+ ret->af = AF_UNSPEC;
+ return ret;
#else
- struct GNUNET_NETWORK_Handle *ret;
-
if (fcntl (fd, F_GETFD) < 0)
- return NULL; /* invalid FD */
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ return NULL; /* invalid FD */
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
ret->fd = fd;
ret->af = AF_UNSPEC;
return ret;
/**
- * Connect a socket
+ * Connect a socket to some remote address.
+ *
* @param desc socket
* @param address peer address
- * @param address_len length of address
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @param address_len length of @a address
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
socklen_t address_len)
{
int ret;
- ret = connect (desc->fd, address, address_len);
+ ret = connect (desc->fd,
+ address,
+ address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
-
- {
- SetErrnoFromWinsockError (WSAGetLastError ());
- if (errno == EWOULDBLOCK)
- errno = EINPROGRESS;
- }
+ {
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ if (errno == EWOULDBLOCK)
+ errno = EINPROGRESS;
+ }
#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
* @param level protocol level of the option
* @param optname identifier of the option
* @param optval options
- * @param optlen length of optval
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @param optlen length of @a optval
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
- int level, int optname, void *optval,
- socklen_t * optlen)
+ int level,
+ int optname,
+ void *optval,
+ socklen_t *optlen)
{
int ret;
- ret = getsockopt (desc->fd, level, optname, optval, optlen);
+
+ ret = getsockopt (desc->fd,
+ level,
+ optname,
+ optval, optlen);
#ifdef MINGW
- if (ret == 0 && level == SOL_SOCKET && optname == SO_ERROR)
+ if ( (0 == ret) &&
+ (SOL_SOCKET == level) &&
+ (SO_ERROR == optname) )
*((int *) optval) = GetErrnoFromWinsockError (*((int *) optval));
-
else if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
/**
* Listen on a socket
+ *
* @param desc socket
* @param backlog length of the listen queue
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
int backlog)
{
int ret;
- ret = listen (desc->fd, backlog);
+ ret = listen (desc->fd,
+ backlog);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
/**
* How much data is available to be read on this descriptor?
*
- * Returns GNUNET_NO if no data is available, or on error!
* @param desc socket
+ * @returns #GNUNET_NO if no data is available, or on error!
*/
ssize_t
-GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle
- *desc)
+GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc)
{
int error;
/* How much is there to be read? */
#ifndef WINDOWS
int pending;
- error = ioctl (desc->fd, FIONREAD, &pending);
+
+ error = ioctl (desc->fd,
+ FIONREAD,
+ &pending);
if (error == 0)
+ return (ssize_t) pending;
+ return GNUNET_NO;
#else
u_long pending;
- error = ioctlsocket (desc->fd, FIONREAD, &pending);
+
+ error = ioctlsocket (desc->fd,
+ FIONREAD,
+ &pending);
if (error != SOCKET_ERROR)
+ return (ssize_t) pending;
+ return GNUNET_NO;
#endif
- return pending;
- else
- return GNUNET_NO;
}
/**
- * Read data from a connected socket (always non-blocking).
+ * Read data from a socket (always non-blocking).
+ *
* @param desc socket
* @param buffer buffer
- * @param length length of buffer
+ * @param length length of @a buffer
* @param src_addr either the source to recv from, or all zeroes
* to be filled in by recvfrom
- * @param addrlen length of the addr
+ * @param addrlen length of the @a src_addr
*/
ssize_t
-GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc,
- void *buffer, size_t length,
- struct sockaddr * src_addr,
- socklen_t * addrlen)
+GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
+ void *buffer,
+ size_t length,
+ struct sockaddr *src_addr,
+ socklen_t *addrlen)
{
int ret;
int flags;
+
flags = 0;
#ifdef MSG_DONTWAIT
flags |= MSG_DONTWAIT;
#endif
- ret = recvfrom (desc->fd, buffer, length, flags, src_addr, addrlen);
+ ret = recvfrom (desc->fd,
+ buffer,
+ length,
+ flags,
+ src_addr,
+ addrlen);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-#endif
+#endif
return ret;
}
/**
* Read data from a connected socket (always non-blocking).
+ *
* @param desc socket
* @param buffer buffer
- * @param length length of buffer
+ * @param length length of @a buffer
+ * @return number of bytes received, -1 on error
*/
ssize_t
-GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc,
- void *buffer, size_t length)
+GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc,
+ void *buffer,
+ size_t length)
{
int ret;
int flags;
+
flags = 0;
#ifdef MSG_DONTWAIT
flags |= MSG_DONTWAIT;
#endif
- ret = recv (desc->fd, buffer, length, flags);
+ ret = recv (desc->fd,
+ buffer,
+ length,
+ flags);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
*
* @param desc socket
* @param buffer data to send
- * @param length size of the buffer
- * @return number of bytes sent, GNUNET_SYSERR on error
+ * @param length size of the @a buffer
+ * @return number of bytes sent, #GNUNET_SYSERR on error
*/
ssize_t
-GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc,
- const void *buffer, size_t length)
+GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
+ const void *buffer,
+ size_t length)
{
int ret;
int flags;
- flags = 0;
+ flags = 0;
#ifdef MSG_DONTWAIT
flags |= MSG_DONTWAIT;
flags |= MSG_NOSIGNAL;
#endif
- ret = send (desc->fd, buffer, length, flags);
-
+ ret = send (desc->fd,
+ buffer,
+ length,
+ flags);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
*
* @param desc socket
* @param message data to send
- * @param length size of the data
+ * @param length size of the @a message
* @param dest_addr destination address
- * @param dest_len length of address
- * @return number of bytes sent, GNUNET_SYSERR on error
+ * @param dest_len length of @a address
+ * @return number of bytes sent, #GNUNET_SYSERR on error
*/
ssize_t
-GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
- const void *message, size_t length,
- const struct sockaddr * dest_addr,
+GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc,
+ const void *message,
+ size_t length,
+ const struct sockaddr *dest_addr,
socklen_t dest_len)
{
int ret;
int flags;
+
flags = 0;
#ifdef MSG_DONTWAIT
/**
* Set socket option
+ *
* @param fd socket
* @param level protocol level of the option
* @param option_name option identifier
* @param option_value value to set
- * @param option_len size of option_value
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @param option_len size of @a option_value
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
- int level, int option_name,
+ int level,
+ int option_name,
const void *option_value,
socklen_t option_len)
{
int ret;
- ret = setsockopt (fd->fd, level, option_name, option_value, option_len);
+ ret = setsockopt (fd->fd,
+ level,
+ option_name,
+ option_value,
+ option_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
* @return new socket, NULL on error
*/
struct GNUNET_NETWORK_Handle *
-GNUNET_NETWORK_socket_create (int domain, int type, int protocol)
+GNUNET_NETWORK_socket_create (int domain,
+ int type,
+ int protocol)
{
struct GNUNET_NETWORK_Handle *ret;
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
- ret->af = domain;
- ret->fd = socket (domain, type, protocol);
- if (INVALID_SOCKET == ret->fd)
- {
-#ifdef MINGW
- SetErrnoFromWinsockError (WSAGetLastError ());
-#endif
- GNUNET_free (ret);
- return NULL;
- }
-
-#ifndef MINGW
- if (ret->fd >= FD_SETSIZE)
- {
- GNUNET_break (0 == close (ret->fd));
- GNUNET_free (ret);
- errno = EMFILE;
- return NULL;
- }
-
-#endif
- if (GNUNET_SYSERR == socket_set_blocking (ret, GNUNET_NO))
- {
- /* we might want to treat this one as fatal... */
- GNUNET_break (0);
- GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ret));
- return NULL;
- }
+ int fd;
-#ifndef MINGW
- if (GNUNET_OK != socket_set_inheritable (ret))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "socket_set_inheritable");
-#endif
-#ifdef DARWIN
- socket_set_nosigpipe (ret);
-#endif
- if ( (type == SOCK_STREAM)
-#ifdef AF_UNIX
- && (domain != AF_UNIX)
-#endif
- )
- socket_set_nodelay (ret);
+ fd = socket (domain, type, protocol);
+ if (-1 == fd)
+ return NULL;
+ ret = GNUNET_new (struct GNUNET_NETWORK_Handle);
+ ret->fd = fd;
+ if (GNUNET_OK !=
+ initialize_network_handle (ret,
+ domain,
+ type))
+ return NULL;
return ret;
}
* Shut down socket operations
* @param desc socket
* @param how type of shutdown
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
-GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how)
+GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
+ int how)
{
int ret;
ret = shutdown (desc->fd, how);
#ifdef MINGW
- if (ret != 0)
+ if (0 != ret)
SetErrnoFromWinsockError (WSAGetLastError ());
#endif
- return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+ return (0 == ret) ? GNUNET_OK : GNUNET_SYSERR;
}
/**
- * Reset FD set
- * @param fds fd set
+ * Disable the "CORK" feature for communication with the given socket,
+ * forcing the OS to immediately flush the buffer on transmission
+ * instead of potentially buffering multiple messages. Essentially
+ * reduces the OS send buffers to zero.
+ *
+ * @param desc socket
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
-void
-GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds)
+int
+GNUNET_NETWORK_socket_disable_corking (struct GNUNET_NETWORK_Handle *desc)
{
- FD_ZERO (&fds->sds);
- fds->nsds = 0;
-#ifdef MINGW
- GNUNET_CONTAINER_slist_clear (fds->handles);
-#endif
-}
+ int ret = 0;
+
+#if WINDOWS
+ int value = 0;
+
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd,
+ SOL_SOCKET,
+ SO_SNDBUF,
+ (char *) &value,
+ sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "setsockopt");
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd,
+ SOL_SOCKET,
+ SO_RCVBUF,
+ (char *) &value,
+ sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "setsockopt");
+#elif LINUX
+ int value = 0;
+
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd,
+ SOL_SOCKET,
+ SO_SNDBUF,
+ &value,
+ sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "setsockopt");
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd,
+ SOL_SOCKET,
+ SO_RCVBUF,
+ &value,
+ sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING,
+ "setsockopt");
+#endif
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Reset FD set
+ *
+ * @param fds fd set
+ */
+void
+GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds)
+{
+ FD_ZERO (&fds->sds);
+ fds->nsds = 0;
+#ifdef MINGW
+ fds->handles_pos = 0;
+#endif
+}
+
/**
* Add a socket to the FD set
+ *
* @param fds fd set
* @param desc socket to add
*/
GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
const struct GNUNET_NETWORK_Handle *desc)
{
- FD_SET (desc->fd, &fds->sds);
- if (desc->fd + 1 > fds->nsds)
- fds->nsds = desc->fd + 1;
+ FD_SET (desc->fd,
+ &fds->sds);
+ fds->nsds = GNUNET_MAX (fds->nsds,
+ desc->fd + 1);
}
/**
* Check whether a socket is part of the fd set
+ *
* @param fds fd set
* @param desc socket
* @return 0 if the FD is not set
GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,
const struct GNUNET_NETWORK_Handle *desc)
{
- return FD_ISSET (desc->fd, &fds->sds);
+ return FD_ISSET (desc->fd,
+ &fds->sds);
}
/**
* Add one fd set to another
+ *
* @param dst the fd set to add to
* @param src the fd set to add from
*/
GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,
const struct GNUNET_NETWORK_FDSet *src)
{
+#ifndef MINGW
int nfds;
- for (nfds = src->nsds; nfds > 0; nfds--)
- if (FD_ISSET (nfds, &src->sds))
- {
- FD_SET (nfds, &dst->sds);
- if (nfds + 1 > dst->nsds)
- dst->nsds = nfds + 1;
- }
-#ifdef MINGW
- GNUNET_CONTAINER_slist_append (dst->handles, src->handles);
+ for (nfds = src->nsds; nfds >= 0; nfds--)
+ if (FD_ISSET (nfds, &src->sds))
+ FD_SET (nfds, &dst->sds);
+ dst->nsds = GNUNET_MAX (dst->nsds,
+ src->nsds);
+#else
+ /* This is MinGW32-specific implementation that relies on the code that
+ * winsock2.h defines for FD_SET. Namely, it relies on FD_SET checking
+ * that fd being added is not already in the set.
+ * Also relies on us knowing what's inside fd_set (fd_count and fd_array).
+ *
+ * NOTE: I don't understand why the UNIX-logic wouldn't work
+ * for the first part here as well. -CG
+ */
+ unsigned int i;
+
+ for (i = 0; i < src->sds.fd_count; i++)
+ FD_SET (src->sds.fd_array[i],
+ &dst->sds);
+ dst->nsds = GNUNET_MAX (src->nsds,
+ dst->nsds);
+
+ /* also copy over `struct GNUNET_DISK_FileHandle` array */
+ if (dst->handles_pos + src->handles_pos > dst->handles_size)
+ GNUNET_array_grow (dst->handles,
+ dst->handles_size,
+ ((dst->handles_pos + src->handles_pos) << 1));
+ for (i = 0; i < src->handles_pos; i++)
+ dst->handles[dst->handles_pos++] = src->handles[i];
#endif
}
GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to,
const struct GNUNET_NETWORK_FDSet *from)
{
- FD_COPY (&from->sds, &to->sds);
+ FD_COPY (&from->sds,
+ &to->sds);
to->nsds = from->nsds;
-
#ifdef MINGW
- GNUNET_CONTAINER_slist_clear (to->handles);
- GNUNET_CONTAINER_slist_append (to->handles, from->handles);
+ if (from->handles_pos > to->handles_size)
+ GNUNET_array_grow (to->handles,
+ to->handles_size,
+ from->handles_pos * 2);
+ memcpy (to->handles,
+ from->handles,
+ from->handles_pos * sizeof (struct GNUNET_NETWORK_Handle *));
+ to->handles_pos = from->handles_pos;
#endif
}
}
+/**
+ * Return sockaddr for this network handle
+ *
+ * @param desc wrapper to process
+ * @return sockaddr
+ */
+struct sockaddr*
+GNUNET_NETWORK_get_addr (struct GNUNET_NETWORK_Handle *desc)
+{
+ return desc->addr;
+}
+
+
+/**
+ * Return sockaddr length for this network handle
+ *
+ * @param desc wrapper to process
+ * @return socklen_t for sockaddr
+ */
+socklen_t
+GNUNET_NETWORK_get_addrlen (struct GNUNET_NETWORK_Handle *desc)
+{
+ return desc->addrlen;
+}
+
+
/**
* Copy a native fd set
*
*/
void
GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to,
- const fd_set * from, int nfds)
+ const fd_set *from,
+ int nfds)
{
- FD_COPY (from, &to->sds);
+ FD_COPY (from,
+ &to->sds);
to->nsds = nfds;
}
* @param to destination
* @param nfd native FD to set
*/
-void GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to,
- int nfd)
+void
+GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to,
+ int nfd)
{
- GNUNET_assert(nfd >= 0);
+ GNUNET_assert ((nfd >= 0) && (nfd < FD_SETSIZE));
FD_SET (nfd, &to->sds);
- to->nsds = GNUNET_MAX (nfd + 1, to->nsds);
+ to->nsds = GNUNET_MAX (nfd + 1,
+ to->nsds);
}
*
* @param to set to test, NULL for empty set
* @param nfd native FD to test, or -1 for none
- * @return GNUNET_YES if FD is set in the set
+ * @return #GNUNET_YES if FD is set in the set
*/
-int
+int
GNUNET_NETWORK_fdset_test_native (const struct GNUNET_NETWORK_FDSet *to,
- int nfd)
+ int nfd)
{
- if ( (nfd == -1) || (to == NULL) )
+ if ( (-1 == nfd) ||
+ (NULL == to) )
return GNUNET_NO;
return FD_ISSET (nfd, &to->sds) ? GNUNET_YES : GNUNET_NO;
}
const struct GNUNET_DISK_FileHandle *h)
{
#ifdef MINGW
- GNUNET_CONTAINER_slist_add (fds->handles,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- h, sizeof (struct GNUNET_DISK_FileHandle));
-
+ if (fds->handles_pos == fds->handles_size)
+ GNUNET_array_grow (fds->handles,
+ fds->handles_size,
+ fds->handles_size * 2 + 2);
+ fds->handles[fds->handles_pos++] = h;
#else
int fd;
- GNUNET_DISK_internal_file_handle_ (h, &fd, sizeof (int));
- FD_SET (fd, &fds->sds);
- if (fd + 1 > fds->nsds)
- fds->nsds = fd + 1;
+ GNUNET_DISK_internal_file_handle_ (h,
+ &fd,
+ sizeof (int));
+ FD_SET (fd,
+ &fds->sds);
+ fds->nsds = GNUNET_MAX (fd + 1,
+ fds->nsds);
+#endif
+}
+
+
+/**
+ * Add a file handle to the fd set
+ * @param fds fd set
+ * @param h the file handle to add
+ */
+void
+GNUNET_NETWORK_fdset_handle_set_first (struct GNUNET_NETWORK_FDSet *fds,
+ const struct GNUNET_DISK_FileHandle *h)
+{
+#ifdef MINGW
+ if (fds->handles_pos == fds->handles_size)
+ GNUNET_array_grow (fds->handles,
+ fds->handles_size,
+ fds->handles_size * 2 + 2);
+ fds->handles[fds->handles_pos] = h;
+ if (fds->handles[0] != h)
+ {
+ const struct GNUNET_DISK_FileHandle *bak = fds->handles[0];
+ fds->handles[0] = h;
+ fds->handles[fds->handles_pos] = bak;
+ }
+ fds->handles_pos++;
+#else
+ GNUNET_NETWORK_fdset_handle_set (fds, h);
#endif
}
/**
* Check if a file handle is part of an fd set
+ *
* @param fds fd set
* @param h file handle
- * @return GNUNET_YES if the file handle is part of the set
+ * @return #GNUNET_YES if the file handle is part of the set
*/
int
GNUNET_NETWORK_fdset_handle_isset (const struct GNUNET_NETWORK_FDSet *fds,
const struct GNUNET_DISK_FileHandle *h)
{
-
#ifdef MINGW
- return GNUNET_CONTAINER_slist_contains (fds->handles, h,
- sizeof (struct GNUNET_DISK_FileHandle));
+ unsigned int i;
+
+ for (i=0;i<fds->handles_pos;i++)
+ if (fds->handles[i] == h)
+ return GNUNET_YES;
+ return GNUNET_NO;
#else
- return FD_ISSET (h->fd, &fds->sds);
+ return FD_ISSET (h->fd,
+ &fds->sds);
#endif
}
+#ifdef MINGW
+/**
+ * Numerically compare pointers to sort them.
+ * Used to test for overlap in the arrays.
+ *
+ * @param p1 a pointer
+ * @param p2 a pointer
+ * @return -1, 0 or 1, if the p1 < p2, p1==p2 or p1 > p2.
+ */
+static int
+ptr_cmp (const void *p1,
+ const void *p2)
+{
+ if (p1 == p2)
+ return 0;
+ if ((intptr_t) p1 < (intptr_t) p2)
+ return -1;
+ return 1;
+}
+#endif
+
+
/**
* Checks if two fd sets overlap
+ *
* @param fds1 first fd set
* @param fds2 second fd set
- * @return GNUNET_YES if they do overlap, GNUNET_NO otherwise
+ * @return #GNUNET_YES if they do overlap, #GNUNET_NO otherwise
*/
int
GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1,
#ifndef MINGW
int nfds;
- nfds = fds1->nsds;
- if (nfds > fds2->nsds)
- nfds = fds2->nsds;
+ nfds = GNUNET_MIN (fds1->nsds,
+ fds2->nsds);
while (nfds > 0)
- {
- nfds--;
- if (FD_ISSET (nfds, &fds1->sds) && FD_ISSET (nfds, &fds2->sds))
- return GNUNET_YES;
- }
+ {
+ nfds--;
+ if ( (FD_ISSET (nfds,
+ &fds1->sds)) &&
+ (FD_ISSET (nfds,
+ &fds2->sds)) )
+ return GNUNET_YES;
+ }
+ return GNUNET_NO;
#else
- struct GNUNET_CONTAINER_SList_Iterator *it;
- struct GNUNET_DISK_FileHandle *h;
- int i;
- int j;
-
- /*This code is somewhat hacky, we are not supposed to know what's
- inside of fd_set; also the O(n^2) is really bad... */
+ unsigned int i;
+ unsigned int j;
+ /* This code is somewhat hacky, we are not supposed to know what's
+ * inside of fd_set; also the O(n^2) is really bad... */
for (i = 0; i < fds1->sds.fd_count; i++)
- {
for (j = 0; j < fds2->sds.fd_count; j++)
- {
if (fds1->sds.fd_array[i] == fds2->sds.fd_array[j])
return GNUNET_YES;
- }
- }
- it = GNUNET_CONTAINER_slist_begin (fds1->handles);
- while (GNUNET_CONTAINER_slist_end (it) != GNUNET_YES)
+
+ /* take a short cut if possible */
+ if ( (0 == fds1->handles_pos) ||
+ (0 == fds2->handles_pos) )
+ return GNUNET_NO;
+
+ /* Sort file handles array to avoid quadratic complexity when
+ checking for overlap */
+ qsort (fds1->handles,
+ fds1->handles_pos,
+ sizeof (void *),
+ &ptr_cmp);
+ qsort (fds2->handles,
+ fds2->handles_pos,
+ sizeof (void *),
+ &ptr_cmp);
+ i = 0;
+ j = 0;
+ while ( (i < fds1->handles_pos) &&
+ (j < fds2->handles_pos) )
+ {
+ switch (ptr_cmp (fds1->handles[i],
+ fds2->handles[j]))
{
- h = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (it, NULL);
- if (GNUNET_CONTAINER_slist_contains
- (fds2->handles, h, sizeof (struct GNUNET_DISK_FileHandle)))
- {
- GNUNET_CONTAINER_slist_iter_destroy (it);
- return GNUNET_YES;
- }
- GNUNET_CONTAINER_slist_next (it);
+ case -1:
+ i++;
+ break;
+ case 0:
+ return GNUNET_YES;
+ case 1:
+ j++;
}
- GNUNET_CONTAINER_slist_iter_destroy (it);
-#endif
+ }
return GNUNET_NO;
+#endif
}
/**
* Creates an fd set
+ *
* @return a new fd set
*/
struct GNUNET_NETWORK_FDSet *
GNUNET_NETWORK_fdset_create ()
{
struct GNUNET_NETWORK_FDSet *fds;
- fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));
-#ifdef MINGW
- fds->handles = GNUNET_CONTAINER_slist_create ();
-#endif
+
+ fds = GNUNET_new (struct GNUNET_NETWORK_FDSet);
GNUNET_NETWORK_fdset_zero (fds);
return fds;
}
/**
* Releases the associated memory of an fd set
+ *
* @param fds fd set
*/
void
GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds)
{
#ifdef MINGW
- GNUNET_CONTAINER_slist_destroy (fds->handles);
+ GNUNET_array_grow (fds->handles,
+ fds->handles_size,
+ 0);
#endif
GNUNET_free (fds);
}
+
+#if MINGW
/**
- * Check if sockets meet certain conditions
- * @param rfds set of sockets to be checked for readability
- * @param wfds set of sockets to be checked for writability
- * @param efds set of sockets to be checked for exceptions
+ * FIXME.
+ */
+struct _select_params
+{
+ /**
+ * Read set.
+ */
+ fd_set *r;
+
+ /**
+ * Write set.
+ */
+ fd_set *w;
+
+ /**
+ * Except set.
+ */
+ fd_set *e;
+
+ /**
+ * Timeout for select().
+ */
+ struct timeval *tv;
+
+ /**
+ * FIXME.
+ */
+ HANDLE wakeup;
+
+ /**
+ * FIXME.
+ */
+ HANDLE standby;
+
+ /**
+ * FIXME.
+ */
+ SOCKET wakeup_socket;
+
+ /**
+ * Set to return value from select.
+ */
+ int status;
+};
+
+
+/**
+ * FIXME.
+ */
+static DWORD WINAPI
+_selector (LPVOID p)
+{
+ struct _select_params *sp = p;
+
+ while (1)
+ {
+ WaitForSingleObject (sp->standby,
+ INFINITE);
+ ResetEvent (sp->standby);
+ sp->status = select (1,
+ sp->r,
+ sp->w,
+ sp->e,
+ sp->tv);
+ if (FD_ISSET (sp->wakeup_socket,
+ sp->r))
+ {
+ FD_CLR (sp->wakeup_socket,
+ sp->r);
+ sp->status -= 1;
+ }
+ SetEvent (sp->wakeup);
+ }
+ return 0;
+}
+
+
+static HANDLE hEventPipeWrite;
+
+static HANDLE hEventReadReady;
+
+static struct _select_params sp;
+
+static HANDLE select_thread;
+
+static HANDLE select_finished_event;
+
+static HANDLE select_standby_event;
+
+static SOCKET select_wakeup_socket = -1;
+
+static SOCKET select_send_socket = -1;
+
+static struct timeval select_timeout;
+
+
+/**
+ * On W32, we actually use a thread to help with the
+ * event loop due to W32-API limitations. This function
+ * initializes that thread.
+ */
+static void
+initialize_select_thread ()
+{
+ SOCKET select_listening_socket = -1;
+ struct sockaddr_in s_in;
+ int alen;
+ int res;
+ unsigned long p;
+
+ select_standby_event = CreateEvent (NULL, TRUE, FALSE, NULL);
+ select_finished_event = CreateEvent (NULL, TRUE, FALSE, NULL);
+
+ select_wakeup_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+
+ select_listening_socket = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+
+ p = 1;
+ res = ioctlsocket (select_wakeup_socket, FIONBIO, &p);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Select thread initialization: ioctlsocket() returns %d\n",
+ res);
+
+ alen = sizeof (s_in);
+ s_in.sin_family = AF_INET;
+ s_in.sin_port = 0;
+ s_in.sin_addr.S_un.S_un_b.s_b1 = 127;
+ s_in.sin_addr.S_un.S_un_b.s_b2 = 0;
+ s_in.sin_addr.S_un.S_un_b.s_b3 = 0;
+ s_in.sin_addr.S_un.S_un_b.s_b4 = 1;
+ res = bind (select_listening_socket,
+ (const struct sockaddr *) &s_in,
+ sizeof (s_in));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Select thread initialization: bind() returns %d\n",
+ res);
+
+ res = getsockname (select_listening_socket,
+ (struct sockaddr *) &s_in,
+ &alen);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Select thread initialization: getsockname() returns %d\n",
+ res);
+
+ res = listen (select_listening_socket,
+ SOMAXCONN);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Select thread initialization: listen() returns %d\n",
+ res);
+ res = connect (select_wakeup_socket,
+ (const struct sockaddr *) &s_in,
+ sizeof (s_in));
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Select thread initialization: connect() returns %d\n",
+ res);
+
+ select_send_socket = accept (select_listening_socket,
+ (struct sockaddr *) &s_in,
+ &alen);
+
+ closesocket (select_listening_socket);
+
+ sp.wakeup = select_finished_event;
+ sp.standby = select_standby_event;
+ sp.wakeup_socket = select_wakeup_socket;
+
+ select_thread = CreateThread (NULL,
+ 0,
+ _selector,
+ &sp,
+ 0, NULL);
+}
+
+
+#endif
+
+
+#ifndef MINGW
+/**
+ * Check if sockets or pipes meet certain conditions
+ *
+ * @param rfds set of sockets or pipes to be checked for readability
+ * @param wfds set of sockets or pipes to be checked for writability
+ * @param efds set of sockets or pipes to be checked for exceptions
* @param timeout relative value when to return
- * @return number of selected sockets, GNUNET_SYSERR on error
+ * @return number of selected sockets or pipes, #GNUNET_SYSERR on error
*/
int
GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
const struct GNUNET_TIME_Relative timeout)
{
int nfds;
-#ifdef MINGW
- int handles;
-#endif
- nfds = 0;
-#ifdef MINGW
- handles = 0;
-#endif
+ struct timeval tv;
+
if (NULL != rfds)
+ nfds = rfds->nsds;
+ else
+ nfds = 0;
+ if (NULL != wfds)
+ nfds = GNUNET_MAX (nfds,
+ wfds->nsds);
+ if (NULL != efds)
+ nfds = GNUNET_MAX (nfds,
+ efds->nsds);
+ if ((0 == nfds) &&
+ (timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us))
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
+ "select");
+ }
+ tv.tv_sec = timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
+ tv.tv_usec =
+ (timeout.rel_value_us -
+ (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value_us));
+ return select (nfds,
+ (NULL != rfds) ? &rfds->sds : NULL,
+ (NULL != wfds) ? &wfds->sds : NULL,
+ (NULL != efds) ? &efds->sds : NULL,
+ (timeout.rel_value_us ==
+ GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us) ? NULL : &tv);
+}
+
+
+#else
+/* MINGW */
+
+
+/**
+ * Non-blocking test if a pipe is ready for reading.
+ *
+ * @param fh pipe handle
+ * @return #GNUNET_YES if the pipe is ready for reading
+ */
+static int
+pipe_read_ready (struct GNUNET_DISK_FileHandle *fh)
+{
+ DWORD error;
+ BOOL bret;
+ DWORD waitstatus = 0;
+
+ SetLastError (0);
+ bret = PeekNamedPipe (fh->h, NULL, 0, NULL, &waitstatus, NULL);
+ error = GetLastError ();
+ if (0 == bret)
+ {
+ /* TODO: either add more errors to this condition, or eliminate it
+ * entirely (failed to peek -> pipe is in serious trouble, should
+ * be selected as readable).
+ */
+ if ( (error != ERROR_BROKEN_PIPE) &&
+ (error != ERROR_INVALID_HANDLE) )
+ return GNUNET_NO;
+ }
+ else if (waitstatus <= 0)
+ return GNUNET_NO;
+ return GNUNET_YES;
+}
+
+
+/**
+ * Non-blocking test if a pipe is having an IO exception.
+ *
+ * @param fh pipe handle
+ * @return #GNUNET_YES if the pipe is having an IO exception.
+ */
+static int
+pipe_except_ready (struct GNUNET_DISK_FileHandle *fh)
+{
+ DWORD dwBytes;
+
+ if (PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
+ return GNUNET_NO;
+ return GNUNET_YES;
+}
+
+
+/**
+ * Iterate over handles in fds, destructively rewrite the
+ * handles array contents of fds so that it starts with the
+ * handles that are ready, and update handles_pos accordingly.
+ *
+ * @param fds set of handles (usually pipes) to be checked for readiness
+ * @param except GNUNET_NO if fds should be checked for readiness to read,
+ * GNUNET_YES if fds should be checked for exceptions
+ * (there is no way to check for write-readiness - pipes are always write-ready)
+ * @param set_for_sure a HANDLE that is known to be set already,
+ * because WaitForMultipleObjects() returned its index.
+ * @return number of ready handles
+ */
+static int
+check_handles_status (struct GNUNET_NETWORK_FDSet *fds,
+ int except,
+ HANDLE set_for_sure)
+{
+ const struct GNUNET_DISK_FileHandle *fh;
+ unsigned int roff;
+ unsigned int woff;
+
+ for (woff = 0, roff = 0; roff < fds->handles_pos; roff++)
+ {
+ fh = fds->handles[roff];
+ if (fh == set_for_sure)
{
- nfds = rfds->nsds;
-#ifdef MINGW
- handles = GNUNET_CONTAINER_slist_count (rfds->handles);
-#endif
+ fds->handles[woff++] = fh;
}
- if (NULL != wfds)
+ else if (fh->type == GNUNET_DISK_HANLDE_TYPE_PIPE)
{
- nfds = GNUNET_MAX (nfds, wfds->nsds);
-#ifdef MINGW
- handles += GNUNET_CONTAINER_slist_count (wfds->handles);
-#endif
+ if ((except && pipe_except_ready (fh)) ||
+ (!except && pipe_read_ready (fh)))
+ fds->handles[woff++] = fh;
}
- if (NULL != efds)
+ else if (fh->type == GNUNET_DISK_HANLDE_TYPE_FILE)
{
- nfds = GNUNET_MAX (nfds, efds->nsds);
-#ifdef MINGW
- handles += GNUNET_CONTAINER_slist_count (efds->handles);
-#endif
+ if (!except)
+ fds->handles[woff++] = fh;
}
-
- struct timeval tv;
- tv.tv_sec = timeout.rel_value / GNUNET_TIME_UNIT_SECONDS.rel_value;
- tv.tv_usec =
- 1000 * (timeout.rel_value - (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value));
- if ((nfds == 0) && (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
-#ifdef MINGW
- && handles == 0
-#endif
- )
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
- "select");
- GNUNET_break (0);
+ if (WAIT_OBJECT_0 == WaitForSingleObject (fh->h, 0))
+ fds->handles[woff++] = fh;
}
-#ifndef MINGW
- return select (nfds,
- (rfds != NULL) ? &rfds->sds : NULL,
- (wfds != NULL) ? &wfds->sds : NULL,
- (efds != NULL) ? &efds->sds : NULL,
- (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
- ? NULL : &tv);
+ }
+ fds->handles_pos = woff;
+ return woff;
+}
-#else
- DWORD limit;
- fd_set sock_read, sock_write, sock_except;
- fd_set aread, awrite, aexcept;
- struct GNUNET_CONTAINER_SList *handles_read, *handles_write,
- *handles_except;
- int i;
- struct timeval tvslice;
+/**
+ * Check if sockets or pipes meet certain conditions, version for W32.
+ *
+ * @param rfds set of sockets or pipes to be checked for readability
+ * @param wfds set of sockets or pipes to be checked for writability
+ * @param efds set of sockets or pipes to be checked for exceptions
+ * @param timeout relative value when to return
+ * @return number of selected sockets or pipes, #GNUNET_SYSERR on error
+ */
+int
+GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
+ struct GNUNET_NETWORK_FDSet *wfds,
+ struct GNUNET_NETWORK_FDSet *efds,
+ const struct GNUNET_TIME_Relative timeout)
+{
+ const struct GNUNET_DISK_FileHandle *fh;
+ int nfds;
+ int handles;
+ unsigned int i;
int retcode;
- DWORD ms_total;
-
-#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set))
+ uint64_t mcs_total;
+ DWORD ms_rounded;
+ int nhandles = 0;
+ int read_pipes_off;
+ HANDLE handle_array[FD_SETSIZE + 2];
+ int returncode;
+ int returnedpos = 0;
+ int selectret;
+ fd_set aread;
+ fd_set awrite;
+ fd_set aexcept;
- /* calculate how long we need to wait in milliseconds */
- if (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
- ms_total = INFINITE;
+ nfds = 0;
+ handles = 0;
+ if (NULL != rfds)
+ {
+ nfds = GNUNET_MAX (nfds, rfds->nsds);
+ handles += rfds->handles_pos;
+ }
+ if (NULL != wfds)
+ {
+ nfds = GNUNET_MAX (nfds, wfds->nsds);
+ handles += wfds->handles_pos;
+ }
+ if (NULL != efds)
+ {
+ nfds = GNUNET_MAX (nfds, efds->nsds);
+ handles += efds->handles_pos;
+ }
+ if ((0 == nfds) &&
+ (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == timeout.rel_value_us) &&
+ (0 == handles) )
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
+ "select");
+ }
+#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set))
+ /* calculate how long we need to wait in microseconds */
+ if (timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
+ {
+ mcs_total = INFINITE;
+ ms_rounded = INFINITE;
+ }
else
- ms_total = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
-
+ {
+ mcs_total = timeout.rel_value_us / GNUNET_TIME_UNIT_MICROSECONDS.rel_value_us;
+ ms_rounded = (DWORD) (mcs_total / GNUNET_TIME_UNIT_MILLISECONDS.rel_value_us);
+ if (mcs_total > 0 && ms_rounded == 0)
+ ms_rounded = 1;
+ }
/* select() may be used as a portable way to sleep */
- if (!(rfds || wfds || efds))
-
- {
- Sleep (ms_total);
- return 0;
- }
+ if (! (rfds || wfds || efds))
+ {
+ Sleep (ms_rounded);
+ return 0;
+ }
- handles_read = GNUNET_CONTAINER_slist_create ();
- handles_write = GNUNET_CONTAINER_slist_create ();
- handles_except = GNUNET_CONTAINER_slist_create ();
+ if (NULL == select_thread)
+ initialize_select_thread ();
+ FD_ZERO (&aread);
+ FD_ZERO (&awrite);
+ FD_ZERO (&aexcept);
if (rfds)
- sock_read = rfds->sds;
- else
- FD_ZERO (&sock_read);
+ FD_COPY (&rfds->sds, &aread);
if (wfds)
- sock_write = wfds->sds;
- else
- FD_ZERO (&sock_write);
+ FD_COPY (&wfds->sds, &awrite);
if (efds)
- sock_except = efds->sds;
+ FD_COPY (&efds->sds, &aexcept);
+
+ /* Start by doing a fast check on sockets and pipes (without
+ waiting). It is cheap, and is sufficient most of the time. By
+ profiling we detected that to be true in 90% of the cases.
+ */
+
+ /* Do the select now */
+ select_timeout.tv_sec = 0;
+ select_timeout.tv_usec = 0;
+
+ /* Copy all the writes to the except, so we can detect connect() errors */
+ for (i = 0; i < awrite.fd_count; i++)
+ FD_SET (awrite.fd_array[i],
+ &aexcept);
+ if ( (aread.fd_count > 0) ||
+ (awrite.fd_count > 0) ||
+ (aexcept.fd_count > 0) )
+ selectret = select (1,
+ (NULL != rfds) ? &aread : NULL,
+ (NULL != wfds) ? &awrite : NULL,
+ &aexcept,
+ &select_timeout);
else
- FD_ZERO (&sock_except);
+ selectret = 0;
+ if (-1 == selectret)
+ {
+ /* Throw an error early on, while we still have the context. */
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ "W32 select(%d, %d, %d) failed: %lu\n",
+ rfds ? aread.fd_count : 0,
+ wfds ? awrite.fd_count : 0,
+ aexcept.fd_count,
+ GetLastError ());
+ GNUNET_assert (0);
+ }
- /* multiplex between winsock select() and waiting on the handles */
- FD_ZERO (&aread);
- FD_ZERO (&awrite);
- FD_ZERO (&aexcept);
- limit = GetTickCount () + ms_total;
+ /* Check aexcept, if something is in there and we copied that
+ FD before to detect connect() errors, add it back to the
+ write set to report errors. */
+ if (NULL != wfds)
+ for (i = 0; i < aexcept.fd_count; i++)
+ if (FD_ISSET (aexcept.fd_array[i],
+ &wfds->sds))
+ FD_SET (aexcept.fd_array[i],
+ &awrite);
- do
- {
- retcode = 0;
- if (nfds > 0)
- {
+ /* If our select returned something or is a 0-timed request, then
+ also check the pipes and get out of here! */
+ /* Sadly, it means code duplication :( */
+ if ( (selectret > 0) || (0 == mcs_total) )
+ {
+ retcode = 0;
- /* overwrite the zero'd sets here; the select call
- * will clear those that are not active */
- FD_COPY (&sock_read, &aread);
- FD_COPY (&sock_write, &awrite);
- FD_COPY (&sock_except, &aexcept);
- tvslice.tv_sec = 0;
- tvslice.tv_usec = 100000;
- if ((retcode =
- select (nfds + 1, &aread, &awrite, &aexcept,
- &tvslice)) == SOCKET_ERROR)
-
- {
- SetErrnoFromWinsockError (WSAGetLastError ());
- if (errno == ENOTSOCK)
- errno = EBADF;
+ /* Read Pipes */
+ if (rfds && (rfds->handles_pos > 0))
+ retcode += check_handles_status (rfds, GNUNET_NO, NULL);
-#if DEBUG_NETWORK
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "select");
+ /* wfds handles remain untouched, on W32
+ we pretend our pipes are "always" write-ready */
-#endif
- goto select_loop_end;
- }
- }
+ /* except pipes */
+ if (efds && (efds->handles_pos > 0))
+ retcode += check_handles_status (efds, GNUNET_YES, NULL);
- /* Poll read pipes */
- if (rfds)
+ if (rfds)
+ {
+ GNUNET_NETWORK_fdset_zero (rfds);
+ if (selectret != -1)
+ GNUNET_NETWORK_fdset_copy_native (rfds, &aread, selectret);
+ }
+ if (wfds)
+ {
+ GNUNET_NETWORK_fdset_zero (wfds);
+ if (selectret != -1)
+ GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, selectret);
+ }
+ if (efds)
+ {
+ GNUNET_NETWORK_fdset_zero (efds);
+ if (selectret != -1)
+ GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, selectret);
+ }
+ if (-1 == selectret)
+ return -1;
+ /* Add our select() FDs to the total return value */
+ retcode += selectret;
+ return retcode;
+ }
- {
- struct GNUNET_CONTAINER_SList_Iterator *i;
- for (i = GNUNET_CONTAINER_slist_begin (rfds->handles);
- GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (i))
-
- {
- struct GNUNET_DISK_FileHandle *fh;
- DWORD dwBytes;
- fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (i, NULL);
- if (fh->type == GNUNET_PIPE)
- {
- if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
- {
- DWORD error_code = GetLastError ();
- switch (error_code)
- {
- case ERROR_BROKEN_PIPE:
- GNUNET_CONTAINER_slist_add (handles_read,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct GNUNET_DISK_FileHandle));
- retcode++;
- break;
- default:
- retcode = -1;
- SetErrnoFromWinError (error_code);
-
- #if DEBUG_NETWORK
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
- "PeekNamedPipe");
-
- #endif
- goto select_loop_end;
- }
- }
- else if (dwBytes)
-
- {
- GNUNET_CONTAINER_slist_add (handles_read,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct GNUNET_DISK_FileHandle));
- retcode++;
- }
- }
- else
- {
- /* Should we wait for more bytes to read here (in case of previous EOF)? */
- GNUNET_CONTAINER_slist_add (handles_read,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct GNUNET_DISK_FileHandle));
- }
- }
- GNUNET_CONTAINER_slist_iter_destroy (i);
- }
+ /* If we got this far, use slower implementation that is able to do a waiting select
+ on both sockets and pipes simultaneously */
- /* Poll for faulty pipes */
- if (efds)
+ /* Events for pipes */
+ if (! hEventReadReady)
+ hEventReadReady = CreateEvent (NULL, TRUE, TRUE, NULL);
+ if (! hEventPipeWrite)
+ hEventPipeWrite = CreateEvent (NULL, TRUE, TRUE, NULL);
+ retcode = 0;
+ FD_ZERO (&aread);
+ FD_ZERO (&awrite);
+ FD_ZERO (&aexcept);
+ if (rfds)
+ FD_COPY (&rfds->sds, &aread);
+ if (wfds)
+ FD_COPY (&wfds->sds, &awrite);
+ if (efds)
+ FD_COPY (&efds->sds, &aexcept);
+ /* We will first Add the PIPES to the events */
+ /* Track how far in `handle_array` the read pipes go,
+ so we may by-pass them quickly if none of them
+ are selected. */
+ read_pipes_off = 0;
+ if (rfds && (rfds->handles_pos > 0))
+ {
+ for (i = 0; i <rfds->handles_pos; i++)
+ {
+ fh = rfds->handles[i];
+ if (fh->type == GNUNET_DISK_HANLDE_TYPE_EVENT)
+ {
+ handle_array[nhandles++] = fh->h;
+ continue;
+ }
+ if (fh->type != GNUNET_DISK_HANLDE_TYPE_PIPE)
+ continue;
+ /* Read zero bytes to check the status of the pipe */
+ if (! ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
+ {
+ DWORD error_code = GetLastError ();
+
+ if (error_code == ERROR_IO_PENDING)
{
- struct GNUNET_CONTAINER_SList_Iterator *i;
- for (i = GNUNET_CONTAINER_slist_begin (efds->handles);
- GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (i))
-
- {
- struct GNUNET_DISK_FileHandle *fh;
- DWORD dwBytes;
-
- fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (i, NULL);
- if (fh->type == GNUNET_PIPE)
- {
- if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
-
- {
- GNUNET_CONTAINER_slist_add (handles_except,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- fh, sizeof (struct GNUNET_DISK_FileHandle));
- retcode++;
- }
- }
- }
- GNUNET_CONTAINER_slist_iter_destroy (i);
+ /* add as unready */
+ handle_array[nhandles++] = fh->oOverlapRead->hEvent;
+ read_pipes_off++;
}
-
- if (wfds)
+ else
{
- GNUNET_CONTAINER_slist_append (handles_write, wfds->handles);
- retcode += GNUNET_CONTAINER_slist_count (wfds->handles);
+ /* add as ready */
+ handle_array[nhandles++] = hEventReadReady;
+ read_pipes_off++;
}
+ }
+ else
+ {
+ /* error also counts as ready */
+ handle_array[nhandles++] = hEventReadReady;
+ read_pipes_off++;
+ }
+ }
+ }
- /* Check for closed sockets */
- for (i = 0; i < nfds; i++)
+ if (wfds && (wfds->handles_pos > 0))
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the write ready event to the array as %d\n",
+ nhandles);
+ handle_array[nhandles++] = hEventPipeWrite;
+ }
- {
- if (SAFE_FD_ISSET (i, &sock_read))
-
- {
- struct sockaddr addr;
- int len;
- if (getpeername (i, &addr, &len) == SOCKET_ERROR)
-
- {
- int err, len;
- len = sizeof (err);
- if (getsockopt
- (i, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == 0
- && err == WSAENOTCONN)
-
- {
- if (!SAFE_FD_ISSET (i, &aread))
-
- {
- FD_SET (i, &aread);
- retcode++;
- }
- }
- }
- }
- }
- select_loop_end:
- if (retcode == 0 && nfds == 0)
- Sleep (GNUNET_MIN (100, limit - GetTickCount ()));
+ sp.status = 0;
+ if (nfds > 0)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the socket event to the array as %d\n",
+ nhandles);
+ handle_array[nhandles++] = select_finished_event;
+ if (timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
+ {
+ sp.tv = NULL;
+ }
+ else
+ {
+ select_timeout.tv_sec = timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
+ select_timeout.tv_usec = (timeout.rel_value_us -
+ (select_timeout.tv_sec *
+ GNUNET_TIME_UNIT_SECONDS.rel_value_us));
+ sp.tv = &select_timeout;
}
- while (retcode == 0 && (ms_total == INFINITE || GetTickCount () < limit));
+ FD_SET (select_wakeup_socket, &aread);
+ do
+ {
+ i = recv (select_wakeup_socket,
+ (char *) &returnedpos,
+ 1,
+ 0);
+ } while (i == 1);
+ sp.r = &aread;
+ sp.w = &awrite;
+ sp.e = &aexcept;
+ /* Failed connections cause sockets to be set in errorfds on W32,
+ * but on POSIX it should set them in writefds.
+ * First copy all awrite sockets to aexcept, later we'll
+ * check aexcept and set its contents in awrite as well
+ * Sockets are also set in errorfds when OOB data is available,
+ * but we don't use OOB data.
+ */
+ for (i = 0; i < awrite.fd_count; i++)
+ FD_SET (awrite.fd_array[i],
+ &aexcept);
+ ResetEvent (select_finished_event);
+ SetEvent (select_standby_event);
+ }
- if (retcode != -1)
+ /* NULL-terminate array */
+ handle_array[nhandles] = NULL;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "nfds: %d, handles: %d, will wait: %llu mcs\n",
+ nfds,
+ nhandles,
+ mcs_total);
+ if (nhandles)
+ {
+ returncode
+ = WaitForMultipleObjects (nhandles,
+ handle_array,
+ FALSE,
+ ms_rounded);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "WaitForMultipleObjects Returned: %d\n",
+ returncode);
+ }
+ else if (nfds > 0)
+ {
+ GNUNET_break (0); /* This branch shouldn't actually be executed...*/
+ i = (int) WaitForSingleObject (select_finished_event,
+ INFINITE);
+ returncode = WAIT_TIMEOUT;
+ }
+ else
+ {
+ /* Shouldn't come this far. If it does - investigate. */
+ GNUNET_assert (0);
+ }
+
+ if (nfds > 0)
+ {
+ /* Don't wake up select-thread when delay is 0, it should return immediately
+ * and wake up by itself.
+ */
+ if (0 != mcs_total)
+ i = send (select_send_socket,
+ (const char *) &returnedpos,
+ 1,
+ 0);
+ i = (int) WaitForSingleObject (select_finished_event,
+ INFINITE);
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Finished waiting for the select thread: %d %d\n",
+ i,
+ sp.status);
+ if (0 != mcs_total)
{
- if (rfds)
- {
- GNUNET_NETWORK_fdset_zero (rfds);
- GNUNET_NETWORK_fdset_copy_native (rfds, &aread, retcode);
- GNUNET_CONTAINER_slist_clear (rfds->handles);
- GNUNET_CONTAINER_slist_append (rfds->handles, handles_read);
- }
- if (wfds)
- {
- GNUNET_NETWORK_fdset_zero (wfds);
- GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, retcode);
- GNUNET_CONTAINER_slist_clear (wfds->handles);
- GNUNET_CONTAINER_slist_append (wfds->handles, handles_write);
- }
- if (efds)
- {
- GNUNET_NETWORK_fdset_zero (efds);
- GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, retcode);
- GNUNET_CONTAINER_slist_clear (efds->handles);
- GNUNET_CONTAINER_slist_append (efds->handles, handles_except);
- }
+ do
+ {
+ i = recv (select_wakeup_socket,
+ (char *) &returnedpos,
+ 1, 0);
+ } while (1 == i);
+ }
+ /* Check aexcept, add its contents to awrite */
+ for (i = 0; i < aexcept.fd_count; i++)
+ FD_SET (aexcept.fd_array[i], &awrite);
+ }
+
+ returnedpos = returncode - WAIT_OBJECT_0;
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "return pos is: %d\n",
+ returnedpos);
+
+ if (rfds)
+ {
+ /* We queued a zero-long read on each pipe to check
+ * its state, now we must cancel these read operations.
+ * This must be done while rfds->handles_pos is still
+ * intact and matches the number of read handles that we
+ * got from the caller.
+ */
+ for (i = 0; i < rfds->handles_pos; i++)
+ {
+ fh = rfds->handles[i];
+ if (GNUNET_DISK_HANLDE_TYPE_PIPE == fh->type)
+ CancelIo (fh->h);
}
- GNUNET_CONTAINER_slist_destroy (handles_read);
- GNUNET_CONTAINER_slist_destroy (handles_write);
- GNUNET_CONTAINER_slist_destroy (handles_except);
+ /* We may have some pipes ready for reading. */
+ if (returnedpos < read_pipes_off)
+ retcode += check_handles_status (rfds, GNUNET_NO, handle_array[returnedpos]);
+ else
+ rfds->handles_pos = 0;
+
+ if (-1 != sp.status)
+ GNUNET_NETWORK_fdset_copy_native (rfds, &aread, retcode);
+ }
+ if (wfds)
+ {
+ retcode += wfds->handles_pos;
+ /* wfds handles remain untouched */
+ if (-1 != sp.status)
+ GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, retcode);
+ }
+ if (efds)
+ {
+ retcode += check_handles_status (rfds,
+ GNUNET_YES,
+ returnedpos < nhandles ? handle_array[returnedpos] : NULL);
+ if (-1 != sp.status)
+ GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, retcode);
+ }
+
+ if (sp.status > 0)
+ retcode += sp.status;
return retcode;
-#endif
}
+/* MINGW */
+#endif
/* end of network.c */
projects / oweals / gnunet.git / blobdiff