-/*\r
- This file is part of GNUnet.\r
- (C) 2009 Christian Grothoff (and other contributing authors)\r
-\r
- GNUnet is free software; you can redistribute it and/or modify\r
- it under the terms of the GNU General Public License as published\r
- by the Free Software Foundation; either version 2, or (at your\r
- option) any later version.\r
-\r
- GNUnet is distributed in the hope that it will be useful, but\r
- WITHOUT ANY WARRANTY; without even the implied warranty of\r
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
- General Public License for more details.\r
-\r
- You should have received a copy of the GNU General Public License\r
- along with GNUnet; see the file COPYING. If not, write to the\r
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,\r
- Boston, MA 02111-1307, USA.\r
-*/ \r
- \r
-/**\r
- * @file util/network.c\r
- * @brief basic, low-level networking interface\r
- * @author Nils Durner\r
- */ \r
- \r
-#include "platform.h"\r
-#include "gnunet_disk_lib.h"\r
-#include "disk.h"\r
-#include "gnunet_container_lib.h"\r
- \r
-#define DEBUG_NETWORK GNUNET_NO\r
- \r
-#ifndef INVALID_SOCKET\r
-#define INVALID_SOCKET -1\r
-#endif /* \r */
-\rstruct GNUNET_NETWORK_Handle \r
+/*
+ This file is part of GNUnet.
+ (C) 2009 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
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file util/network.c
+ * @brief basic, low-level networking interface
+ * @author Nils Durner
+ */
+
+#include "platform.h"
+#include "gnunet_disk_lib.h"
+#include "disk.h"
+#include "gnunet_container_lib.h"
+
+#define DEBUG_NETWORK GNUNET_NO
+
+#ifndef INVALID_SOCKET
+#define INVALID_SOCKET -1
+#endif
+
+
+struct GNUNET_NETWORK_Handle
{
- \rint fd;
- \r};
-\r\rstruct GNUNET_NETWORK_FDSet \r
+#ifndef MINGW
+ int fd;
+
+#else
+ SOCKET fd;
+#endif
+
+};
+
+
+struct GNUNET_NETWORK_FDSet
{
- \r
- /* socket descriptors */ \r
+
+ /**
+ * Maximum number of any socket socket descriptor in the set
+ */
int nsds;
- \rfd_set sds;
- \r
-#ifdef WINDOWS\r
- /* handles */ \r
+
+ /**
+ * Bitset with the descriptors.
+ */
+ fd_set sds;
+
+#ifdef WINDOWS
+ /**
+ * Linked list of handles
+ */
struct GNUNET_CONTAINER_SList *handles;
- \r
-#endif /* \r */
+#endif
+
};
-\r\r
-#ifndef FD_COPY\r
-#define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))\r
-#endif /* \r */
- \r\r\r
-/**\r
- * Set if a socket should use blocking or non-blocking IO.\r
- * @param fd socket\r
- * @param doBlock blocking mode\r
- * @return GNUNET_OK on success, GNUNET_SYSERR on error\r
- */ \r
-static int \r
-socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, \rint doBlock) \r
+
+#ifndef FD_COPY
+#define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))
+#endif
+
+
+/**
+ * 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
+ */
+static int
+socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int doBlock)
{
- \r
-#if MINGW\r
- u_long mode;
- \rmode = !doBlock;
- \rif (ioctlsocket (fd->fd, FIONBIO, &mode) == SOCKET_ERROR)
- \r
+
+#if MINGW
+ u_long mode;
+ mode = !doBlock;
+ if (ioctlsocket (fd->fd, FIONBIO, &mode) == SOCKET_ERROR)
+
{
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "ioctlsocket");
- \rreturn GNUNET_SYSERR;
- \r}
- \rreturn GNUNET_OK;
- \r\r
-#else /* \r */
- /* not MINGW */ \r
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "ioctlsocket");
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+
+#else
+ /* not MINGW */
int flags = fcntl (fd->fd, F_GETFL);
- \rif (flags == -1)
- \r
+ if (flags == -1)
+
{
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
- \rreturn GNUNET_SYSERR;
- \r}
- \rif (doBlock)
- \rflags &= ~O_NONBLOCK;
- \r
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
+ return GNUNET_SYSERR;
+ }
+ if (doBlock)
+ flags &= ~O_NONBLOCK;
+
else
- \rflags |= O_NONBLOCK;
- \rif (0 != fcntl (fd->fd, F_SETFL, flags))
- \r
+ flags |= O_NONBLOCK;
+ if (0 != fcntl (fd->fd, F_SETFL, flags))
+
{
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
- \rreturn GNUNET_SYSERR;
- \r}
- \rreturn GNUNET_OK;
- \r
-#endif /* \r */
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
+#endif
}
-\r\r\r
-#ifndef MINGW\r
-/**\r
- * Make a socket non-inheritable to child processes\r
- *\r
- * @param h the socket to make non-inheritable\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- * @warning Not implemented on Windows\r
- */ \r
-static int \r
-socket_set_inheritable (const struct GNUNET_NETWORK_Handle \r*h) \r
+
+#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
+ * @warning Not implemented on Windows
+ */
+static int
+socket_set_inheritable (const struct GNUNET_NETWORK_Handle *h)
{
- \rint i;
- \r\ri = fcntl (h->fd, F_GETFD);
- \rif (i == (i | FD_CLOEXEC))
- \rreturn GNUNET_OK;
- \rreturn (fcntl (h->fd, F_SETFD, i | FD_CLOEXEC) == 0) \r
- ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r
-#endif /* \r */
- \r\r\r
-#ifdef DARWIN\r
-/**\r
- * The MSG_NOSIGNAL equivalent on Mac OS X\r
- *\r
- * @param h the socket to make non-delaying\r
- */ \r
-static void \r
-socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle \r*h) \r
+ int i;
+
+ i = fcntl (h->fd, F_GETFD);
+ if (i < 0)
+ return GNUNET_SYSERR;
+ if (i == (i | FD_CLOEXEC))
+ return GNUNET_OK;
+ i |= FD_CLOEXEC;
+ if (fcntl (h->fd, F_SETFD, i) < 0)
+ return GNUNET_SYSERR;
+ return GNUNET_OK;
+}
+#endif
+
+
+#ifdef DARWIN
+/**
+ * The MSG_NOSIGNAL equivalent on Mac OS X
+ *
+ * @param h the socket to make non-delaying
+ */
+static void
+socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h)
{
- \rint value = 1;
- \rif (0 !=
- setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof (value)))
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, \r"setsockopt");
-\r}
-
-\r
-#endif /* \r */
- \r\r\r
-/**\r
- * Disable delays when sending data via the socket.\r
- * (GNUnet makes sure that messages are as big as\r
- * possible already).\r
- *\r
- * @param h the socket to make non-delaying\r
- */ \r
-static void \r
-socket_set_nodelay (const struct GNUNET_NETWORK_Handle \r*h) \r
+ int value = 1;
+ if (0 !=
+ setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof (value)))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+}
+#endif
+
+
+/**
+ * Disable delays when sending data via the socket.
+ * (GNUnet makes sure that messages are as big as
+ * possible already).
+ *
+ * @param h the socket to make non-delaying
+ */
+static void
+socket_set_nodelay (const struct GNUNET_NETWORK_Handle *h)
{
- \rint value = 1;
- \rif (0 !=
- setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value)))
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, \r"setsockopt");
-\r\r}
-
-\r\r\r\r
-/**\r
- * accept a new connection on a socket\r
- *\r
- * @param desc bound socket\r
- * @param address address of the connecting peer, may be NULL\r
- * @param address_len length of address\r
- * @return client socket\r
- */ \r
-struct GNUNET_NETWORK_Handle *\r
+ int value = 1;
+ if (0 !=
+ setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value)))
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+}
+
+
+/**
+ * accept a new connection on a socket
+ *
+ * @param desc bound socket
+ * @param address address of the connecting peer, may be NULL
+ * @param address_len length of address
+ * @return client socket
+ */
+struct GNUNET_NETWORK_Handle *
GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
- \rstruct sockaddr *address,
- \rsocklen_t * address_len) \r
+ struct sockaddr *address,
+ socklen_t * address_len)
{
- \rstruct GNUNET_NETWORK_Handle *ret;
- \r\rret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
- \rret->fd = accept (desc->fd, address, address_len);
- \rif (ret->fd == INVALID_SOCKET)
- \r
+ struct GNUNET_NETWORK_Handle *ret;
+
+ ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret->fd = accept (desc->fd, address, address_len);
+ if (ret->fd == INVALID_SOCKET)
{
- \r
-#ifdef MINGW\r
- SetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- GNUNET_free (ret);
- \rreturn NULL;
- \r}
- \r
-#ifndef MINGW\r
- if (ret->fd >= FD_SETSIZE)
- \r
+#ifdef MINGW
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ GNUNET_free (ret);
+ return NULL;
+ }
+#ifndef MINGW
+ if (ret->fd >= FD_SETSIZE)
{
- \rGNUNET_break (0 == close (ret->fd));
- \rGNUNET_free (ret);
- \rerrno = EMFILE;
- \rreturn NULL;
- \r}
- \r
-#endif /* \r */
- if (GNUNET_SYSERR == socket_set_blocking (ret, GNUNET_NO))
- \r
+ GNUNET_break (0 == close (ret->fd));
+ GNUNET_free (ret);
+ errno = EMFILE;
+ return NULL;
+ }
+#endif
+ if (GNUNET_SYSERR == socket_set_blocking (ret, GNUNET_NO))
+
{
- \r
- /* we might want to treat this one as fatal... */ \r
- GNUNET_break (0);
- \rGNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ret));
- \rreturn NULL;
- \r}
- \r
-#ifndef MINGW\r
- if (GNUNET_OK != socket_set_inheritable (ret))
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- \r"socket_set_inheritable");
- \r
-#endif /* \r */
-#ifdef DARWIN\r
- socket_set_nosigpipe (ret);
- \r
-#endif /* \r */
+
+ /* we might want to treat this one as fatal... */
+ GNUNET_break (0);
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ret));
+ return NULL;
+ }
+
+#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);
- \rreturn ret;
-\r}
-
-\r\r
-/**\r
- * Bind to a connected socket\r
- * @param desc socket\r
- * @param address address to be bound\r
- * @param address_len length of address\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
+ return ret;
+}
+
+
+/**
+ * Bind to a connected socket
+ * @param desc socket
+ * @param address address to be bound
+ * @param address_len length of address
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
- \rconst struct sockaddr *address,
- \rsocklen_t address_len) \r
+ const struct sockaddr *address,
+ socklen_t address_len)
+{
+ int ret;
+
+ ret = bind (desc->fd, address, address_len);
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#else
+#ifndef LINUX
+ if ( (ret == 0) && (address->sa_family == AF_UNIX))
+ {
+ const struct sockaddr_un *un = (const struct sockaddr_un*) address;
+ if (0 != unlink (un->sun_path))
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "unlink",
+ un->sun_path);
+ }
+#endif
+#endif
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Close a socket
+ * @param desc socket
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
+GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
{
- \rint ret;
- \r\rret = bind (desc->fd, address, address_len);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r\r
-/**\r
- * Close a socket\r
- * @param desc socket\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
-GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc) \r
+ int ret;
+
+#ifdef MINGW
+ ret = closesocket (desc->fd);
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#else
+ ret = close (desc->fd);
+#endif
+ GNUNET_free (desc);
+ return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Box a native socket (and check that it is a socket).
+ *
+ * @param fd socket to box
+ * @return NULL on error (including not supported on target platform)
+ */
+struct GNUNET_NETWORK_Handle *
+GNUNET_NETWORK_socket_box_native (int fd)
{
- \rint ret;
- \rint eno;
- \r\r
-#ifdef MINGW\r
- ret = closesocket (desc->fd);
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#else /* \r */
- ret = close (desc->fd);
- \r
-#endif /* \r */
- eno = errno;
- \rGNUNET_free (desc);
- \rerrno = eno;
- \rreturn (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r
-/**\r
- * Connect a socket\r
- * @param desc socket\r
- * @param address peer address\r
- * @param address_len length of address\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
+#if MINGW
+ return NULL;
+#else
+ struct GNUNET_NETWORK_Handle *ret;
+
+ if (fcntl (fd, F_GETFD) < 0)
+ return NULL; /* invalid FD */
+ ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret->fd = fd;
+ return ret;
+#endif
+}
+
+
+/**
+ * Connect a socket
+ * @param desc socket
+ * @param address peer address
+ * @param address_len length of address
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
- \rconst struct sockaddr *address,
- \rsocklen_t address_len) \r
+ const struct sockaddr *address,
+ socklen_t address_len)
{
- \rint ret;
- \r\rret = connect (desc->fd, address, address_len);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \r
+ int ret;
+ ret = connect (desc->fd, address, address_len);
+
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+
{
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \rif (errno == EWOULDBLOCK)
- \rerrno = EINPROGRESS;
- \r}
- \r
-#endif /* \r */
- return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r
-/**\r
- * Get socket options\r
- *\r
- * @param desc socket\r
- * @param level protocol level of the option\r
- * @param optname identifier of the option\r
- * @param optval options\r
- * @param optlen length of optval\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ if (errno == EWOULDBLOCK)
+ errno = EINPROGRESS;
+ }
+#endif
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Get socket options
+ *
+ * @param desc socket
+ * @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
+ */
+int
GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
- \rint level, int optname, void *optval,
- \rsocklen_t * optlen) \r
+ int level, int optname, void *optval,
+ socklen_t * optlen)
{
- \rint ret;
- \r\rret = getsockopt (desc->fd, level, optname, optval, optlen);
- \r
-#ifdef MINGW\r
- if (ret == 0 && level == SOL_SOCKET && optname == SO_ERROR)
- \r*((int *) optval) = GetErrnoFromWinsockError (*((int *) optval));
- \r
+ int ret;
+ ret = getsockopt (desc->fd, level, optname, optval, optlen);
+
+#ifdef MINGW
+ if (ret == 0 && level == SOL_SOCKET && optname == SO_ERROR)
+ *((int *) optval) = GetErrnoFromWinsockError (*((int *) optval));
+
else if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r
-/**\r
- * Listen on a socket\r
- * @param desc socket\r
- * @param backlog length of the listen queue\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
+ 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
+ */
+int
GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
- \rint backlog) \r
+ int backlog)
+{
+ int ret;
+ 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
+ */
+ssize_t
+GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle
+ *desc)
+{
+ int error;
+ int pending;
+
+ /* How much is there to be read? */
+#ifndef WINDOWS
+ error = ioctl (desc->fd, FIONREAD, &pending);
+ if (error == 0)
+#else
+ error = ioctlsocket (desc->fd, FIONREAD, &pending);
+ if (error != SOCKET_ERROR)
+#endif
+ return pending;
+ else
+ return GNUNET_NO;
+}
+
+/**
+ * Read data from a connected socket (always non-blocking).
+ * @param desc socket
+ * @param buffer buffer
+ * @param length length of 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
+ */
+ssize_t
+GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc,
+ void *buffer, size_t length,
+ struct sockaddr * src_addr,
+ socklen_t * addrlen)
{
- \rint ret;
- \r\rret = listen (desc->fd, backlog);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- \rreturn ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r
-/**\r
- * Read data from a connected socket (always non-blocking).\r
- * @param desc socket\r
- * @param buffer buffer\r
- * @param length length of buffer\r
- */ \r
- ssize_t \r
+ int ret;
+ int flags;
+ flags = 0;
+
+#ifdef MSG_DONTWAIT
+ flags |= MSG_DONTWAIT;
+
+#endif
+ ret = recvfrom (desc->fd, buffer, length, flags, src_addr, addrlen);
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ return ret;
+}
+
+
+/**
+ * Read data from a connected socket (always non-blocking).
+ * @param desc socket
+ * @param buffer buffer
+ * @param length length of buffer
+ */
+ssize_t
GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc,
- \rvoid *buffer, size_t length) \r
+ void *buffer, size_t length)
{
- \rint ret;
- \rint flags;
- \r\rflags = 0;
- \r
-#ifdef MSG_DONTWAIT\r
- flags |= MSG_DONTWAIT;
- \r
-#endif /* \r */
- ret = recv (desc->fd, buffer, length, flags);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- \rreturn ret;
-\r}
-
-\r\r
-/**\r
- * Send data (always non-blocking).\r
- *\r
- * @param desc socket\r
- * @param buffer data to send\r
- * @param length size of the buffer\r
- * @return number of bytes sent, GNUNET_SYSERR on error\r
- */ \r
- ssize_t \r
+ int ret;
+ int flags;
+ flags = 0;
+
+#ifdef MSG_DONTWAIT
+ flags |= MSG_DONTWAIT;
+#endif
+ ret = recv (desc->fd, buffer, length, flags);
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ return ret;
+}
+
+
+/**
+ * Send data (always non-blocking).
+ *
+ * @param desc socket
+ * @param buffer data to send
+ * @param length size of the buffer
+ * @return number of bytes sent, GNUNET_SYSERR on error
+ */
+ssize_t
GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc,
- \rconst void *buffer, size_t length) \r
+ const void *buffer, size_t length)
{
- \rint ret;
- \rint flags;
- \r\rflags = 0;
- \r
-#ifdef MSG_DONTWAIT\r
- flags |= MSG_DONTWAIT;
- \r
-#endif /* \r */
-#ifdef MSG_NOSIGNAL\r
- flags |= MSG_NOSIGNAL;
- \r
-#endif /* \r */
- ret = send (desc->fd, buffer, length, flags);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- \rreturn ret;
-\r}
-
-\r\r\r
-/**\r
- * Send data to a particular destination (always non-blocking).\r
- * This function only works for UDP sockets.\r
- *\r
- * @param desc socket\r
- * @param message data to send\r
- * @param length size of the data\r
- * @param dest_addr destination address\r
- * @param dest_len length of address\r
- * @return number of bytes sent, GNUNET_SYSERR on error\r
- */ \r
- ssize_t \r
+ int ret;
+ int flags;
+ flags = 0;
+
+#ifdef MSG_DONTWAIT
+ flags |= MSG_DONTWAIT;
+
+#endif /* */
+#ifdef MSG_NOSIGNAL
+ flags |= MSG_NOSIGNAL;
+
+#endif /* */
+ ret = send (desc->fd, buffer, length, flags);
+
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+
+#endif /* */
+ return ret;
+}
+
+
+/**
+ * Send data to a particular destination (always non-blocking).
+ * This function only works for UDP sockets.
+ *
+ * @param desc socket
+ * @param message data to send
+ * @param length size of the data
+ * @param dest_addr destination address
+ * @param dest_len length of address
+ * @return number of bytes sent, GNUNET_SYSERR on error
+ */
+ssize_t
GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
- \rconst void *message, size_t length,
- \rconst struct sockaddr * dest_addr,
- \rsocklen_t dest_len) \r
+ const void *message, size_t length,
+ const struct sockaddr * dest_addr,
+ socklen_t dest_len)
{
- \rint ret;
- \rint flags;
- \r\rflags = 0;
- \r
-#ifdef MSG_DONTWAIT\r
- flags |= MSG_DONTWAIT;
- \r
-#endif /* \r */
-#ifdef MSG_NOSIGNAL\r
- flags |= MSG_NOSIGNAL;
- \r
-#endif /* \r */
- ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- \rreturn ret;
-\r}
-
-\r\r
-/**\r
- * Set socket option\r
- * @param fd socket\r
- * @param level protocol level of the option\r
- * @param option_name option identifier\r
- * @param option_value value to set\r
- * @param option_len size of option_value\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
+ int ret;
+ int flags;
+ flags = 0;
+
+#ifdef MSG_DONTWAIT
+ flags |= MSG_DONTWAIT;
+#endif
+#ifdef MSG_NOSIGNAL
+ flags |= MSG_NOSIGNAL;
+#endif
+ ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len);
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ return ret;
+}
+
+
+/**
+ * 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
+ */
+int
GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
- \rint level, int option_name,
- \rconst void *option_value,
- \rsocklen_t option_len) \r
+ int level, int option_name,
+ const void *option_value,
+ socklen_t option_len)
{
- \rint ret;
- \r\rret = setsockopt (fd->fd, level, option_name, option_value, option_len);
- \r
-#ifdef MINGW\r
- if (SOCKET_ERROR == ret)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- \rreturn ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r\r\r
-/**\r
- * Create a new socket. Configure it for non-blocking IO and\r
- * mark it as non-inheritable to child processes (set the\r
- * close-on-exec flag).\r
- *\r
- * @param domain domain of the socket\r
- * @param type socket type\r
- * @param protocol network protocol\r
- * @return new socket, NULL on error\r
- */ \r
-struct GNUNET_NETWORK_Handle *\r
-GNUNET_NETWORK_socket_create (int domain, int type, int protocol) \r
+ int ret;
+
+ ret = setsockopt (fd->fd, level, option_name, option_value, option_len);
+#ifdef MINGW
+ if (SOCKET_ERROR == ret)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+}
+
+
+/**
+ * Create a new socket. Configure it for non-blocking IO and
+ * mark it as non-inheritable to child processes (set the
+ * close-on-exec flag).
+ *
+ * @param domain domain of the socket
+ * @param type socket type
+ * @param protocol network protocol
+ * @return new socket, NULL on error
+ */
+struct GNUNET_NETWORK_Handle *
+GNUNET_NETWORK_socket_create (int domain, int type, int protocol)
{
- \rstruct GNUNET_NETWORK_Handle *ret;
- \r\rret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
- \rret->fd = socket (domain, type, protocol);
- \rif (INVALID_SOCKET == ret->fd)
- \r
+ struct GNUNET_NETWORK_Handle *ret;
+ ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret->fd = socket (domain, type, protocol);
+ if (INVALID_SOCKET == ret->fd)
{
- \r
-#ifdef MINGW\r
- SetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- GNUNET_free (ret);
- \rreturn NULL;
- \r}
- \r
-#ifndef MINGW\r
- if (ret->fd >= FD_SETSIZE)
- \r
+#ifdef MINGW
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ GNUNET_free (ret);
+ return NULL;
+ }
+
+#ifndef MINGW
+ if (ret->fd >= FD_SETSIZE)
{
- \rGNUNET_break (0 == close (ret->fd));
- \rGNUNET_free (ret);
- \rerrno = EMFILE;
- \rreturn NULL;
- \r}
- \r
-#endif /* \r */
- \rif (GNUNET_SYSERR == socket_set_blocking (ret, GNUNET_NO))
- \r
+ GNUNET_break (0 == close (ret->fd));
+ GNUNET_free (ret);
+ errno = EMFILE;
+ return NULL;
+ }
+
+#endif
+ if (GNUNET_SYSERR == socket_set_blocking (ret, GNUNET_NO))
{
- \r
- /* we might want to treat this one as fatal... */ \r
- GNUNET_break (0);
- \rGNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ret));
- \rreturn NULL;
- \r}
- \r
-#ifndef MINGW\r
- if (GNUNET_OK != socket_set_inheritable (ret))
- \rGNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- \r"socket_set_inheritable");
- \r
-#endif /* \r */
-#ifdef DARWIN\r
- socket_set_nosigpipe (ret);
- \r
-#endif /* \r */
- if (type == SOCK_STREAM)
- \rsocket_set_nodelay (ret);
- \r\rreturn ret;
-\r}
-
-\r\r
-/**\r
- * Shut down socket operations\r
- * @param desc socket\r
- * @param how type of shutdown\r
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
- */ \r
-int \r
-GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
- \rint how) \r
+ /* we might want to treat this one as fatal... */
+ GNUNET_break (0);
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (ret));
+ return NULL;
+ }
+
+#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);
+ return ret;
+}
+
+
+/**
+ * Shut down socket operations
+ * @param desc socket
+ * @param how type of shutdown
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
+GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how)
{
- \rint ret;
- \r\rret = shutdown (desc->fd, how);
- \r
-#ifdef MINGW\r
- if (ret != 0)
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \r
-#endif /* \r */
- \rreturn ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
-\r}
-
-\r\r\r
-/**\r
- * Reset FD set\r
- * @param fds fd set\r
- */ \r
-void \r
-GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds) \r
+ int ret;
+
+ ret = shutdown (desc->fd, how);
+#ifdef MINGW
+ if (ret != 0)
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#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)
{
- \rFD_ZERO (&fds->sds);
- \rfds->nsds = 0;
- \r
-#ifdef MINGW\r
- GNUNET_CONTAINER_slist_clear (fds->handles);
- \r
-#endif /* \r */
-} \r\r\r
-
-/**\r
- * Add a socket to the FD set\r
- * @param fds fd set\r
- * @param desc socket to add\r
- */ \r
-void \r
+ FD_ZERO (&fds->sds);
+ fds->nsds = 0;
+#ifdef MINGW
+ GNUNET_CONTAINER_slist_clear (fds->handles);
+#endif
+}
+
+/**
+ * Add a socket to the FD set
+ * @param fds fd set
+ * @param desc socket to add
+ */
+void
GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
- \rconst struct GNUNET_NETWORK_Handle *desc) \r
+ const struct GNUNET_NETWORK_Handle *desc)
{
- \rFD_SET (desc->fd, &fds->sds);
- \r\rif (desc->fd + 1 > fds->nsds)
- \rfds->nsds = desc->fd + 1;
-\r}
-
-\r\r\r
-/**\r
- * Check whether a socket is part of the fd set\r
- * @param fds fd set\r
- * @param desc socket\r
- * @return 0 if the FD is not set\r
- */ \r
-int \r
+ FD_SET (desc->fd, &fds->sds);
+ if (desc->fd + 1 > fds->nsds)
+ 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
+ */
+int
GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,
- \rconst struct GNUNET_NETWORK_Handle *desc) \r
+ const struct GNUNET_NETWORK_Handle *desc)
{
- \rreturn FD_ISSET (desc->fd, &fds->sds);
-\r}
-
-\r\r\r
-/**\r
- * Add one fd set to another\r
- * @param dst the fd set to add to\r
- * @param src the fd set to add from\r
- */ \r
-void \r
+ 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
+ */
+void
GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,
- \rconst struct GNUNET_NETWORK_FDSet *src) \r
+ const struct GNUNET_NETWORK_FDSet *src)
{
- \rint nfds;
- \r\rfor (nfds = src->nsds; nfds > 0; nfds--)
- \rif (FD_ISSET (nfds, &src->sds))
- \r
+ int nfds;
+ for (nfds = src->nsds; nfds > 0; nfds--)
+ if (FD_ISSET (nfds, &src->sds))
+
{
- \rFD_SET (nfds, &dst->sds);
- \rif (nfds + 1 > dst->nsds)
- \rdst->nsds = nfds + 1;
- \r}
-\r}
-
-\r\r\r
-/**\r
- * Copy one fd set to another\r
- * @param to destination\r
- * @param from source\r
- */ \r
-void \r
+ FD_SET (nfds, &dst->sds);
+ if (nfds + 1 > dst->nsds)
+ dst->nsds = nfds + 1;
+ }
+#ifdef MINGW
+ GNUNET_CONTAINER_slist_append (dst->handles, src->handles);
+#endif
+}
+
+
+/**
+ * Copy one fd set to another
+ *
+ * @param to destination
+ * @param from source
+ */
+void
GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to,
- \rconst struct GNUNET_NETWORK_FDSet *from) \r
+ const struct GNUNET_NETWORK_FDSet *from)
{
- \rFD_COPY (&from->sds, &to->sds);
- \rto->nsds = from->nsds;
- \r
-#ifdef MINGW\r
- struct GNUNET_CONTAINER_SList_Iterator *iter;
- \r\r\rGNUNET_CONTAINER_slist_clear (to->handles);
- \r\rfor (iter = GNUNET_CONTAINER_slist_begin (from->handles);
- \rGNUNET_CONTAINER_slist_end (iter) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (iter))
- \r
- {
- \rvoid *handle;
- \rsize_t len;
- \r\rhandle = GNUNET_CONTAINER_slist_get (iter, &len);
- \rGNUNET_CONTAINER_slist_add (to->handles,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- handle, len);
- \r} \r
-#endif /* \r */
-} \r\r\r
-
-/**\r
- * Copy a native fd set\r
- * @param to destination\r
- * @param from native source set\r
- * @param nfds the biggest socket number in from + 1\r
- */ \r
-void \r
+ 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);
+#endif
+}
+
+int
+GNUNET_NETWORK_get_fd (struct GNUNET_NETWORK_Handle *desc)
+{
+ return desc->fd;
+}
+
+/**
+ * Copy a native fd set
+ *
+ * @param to destination
+ * @param from native source set
+ * @param nfds the biggest socket number in from + 1
+ */
+void
GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to,
- \rconst fd_set * from, int nfds) \r
+ const fd_set * from, int nfds)
+{
+ FD_COPY (from, &to->sds);
+ to->nsds = nfds;
+}
+
+
+/**
+ * Set a native fd in a set
+ *
+ * @param to destination
+ * @param nfd native FD to set
+ */
+void GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to,
+ int nfd)
+{
+ FD_SET (nfd, &to->sds);
+ to->nsds = GNUNET_MAX (nfd + 1, to->nsds);
+}
+
+
+/**
+ * Test native fd in a set
+ *
+ * @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
+ */
+int
+GNUNET_NETWORK_fdset_test_native (const struct GNUNET_NETWORK_FDSet *to,
+ int nfd)
{
- \rFD_COPY (from, &to->sds);
- \rto->nsds = nfds;
-\r} \r\r\r
-
-/**\r
- * Add a file handle to the fd set\r
- * @param fds fd set\r
- * @param h the file handle to add\r
- */ \r
-void \r
+ if ( (nfd == -1) || (to == NULL) )
+ return GNUNET_NO;
+ return FD_ISSET (nfd, &to->sds) ? GNUNET_YES : GNUNET_NO;
+}
+
+
+/**
+ * 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 (struct GNUNET_NETWORK_FDSet *fds,
- \rconst struct GNUNET_DISK_FileHandle *h) \r
+ const struct GNUNET_DISK_FileHandle *h)
{
- \r
-#ifdef MINGW\r
- HANDLE hw;
- \r\rGNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE));
- \rGNUNET_CONTAINER_slist_add (fds->handles, GNUNET_NO, &hw, sizeof (HANDLE));
- \r
-#else /* \r */
+
+#ifdef MINGW
+ HANDLE hw;
+ GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE));
+ GNUNET_CONTAINER_slist_add (fds->handles,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ &hw, sizeof (HANDLE));
+
+#else
int fd;
- \r\rGNUNET_DISK_internal_file_handle_ (h, &fd, sizeof (int));
- \rFD_SET (fd, &fds->sds);
- \rif (fd + 1 > fds->nsds)
- \rfds->nsds = fd + 1;
- \r
-#endif /* \r */
+ GNUNET_DISK_internal_file_handle_ (h, &fd, sizeof (int));
+ FD_SET (fd, &fds->sds);
+ if (fd + 1 > fds->nsds)
+ fds->nsds = fd + 1;
+
+#endif
}
-\r\r
-/**\r
- * Check if a file handle is part of an fd set\r
- * @param fds fd set\r
- * @param h file handle\r
- * @return GNUNET_YES if the file handle is part of the set\r
- */ \r
-int \r
+
+/**
+ * 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
+ */
+int
GNUNET_NETWORK_fdset_handle_isset (const struct GNUNET_NETWORK_FDSet *fds,
- \rconst struct GNUNET_DISK_FileHandle *h) \r
+ const struct GNUNET_DISK_FileHandle *h)
{
- \r
-#ifdef MINGW\r
- return GNUNET_CONTAINER_slist_contains (fds->handles, h->h,
- sizeof (HANDLE));
- \r
-#else /* \r */
- return FD_ISSET (h->fd, &fds->sds);
- \r
-#endif /* \r */
+
+#ifdef MINGW
+ return GNUNET_CONTAINER_slist_contains (fds->handles, &h->h,
+ sizeof (HANDLE));
+#else
+ return FD_ISSET (h->fd, &fds->sds);
+#endif
}
-\r\r
-/**\r
- * Checks if two fd sets overlap\r
- * @param fds1 first fd set\r
- * @param fds2 second fd set\r
- * @return GNUNET_YES if they do overlap, GNUNET_NO otherwise\r
- */ \r
-int \r
+
+/**
+ * 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
+ */
+int
GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1,
- \rconst struct GNUNET_NETWORK_FDSet *fds2) \r
+ const struct GNUNET_NETWORK_FDSet *fds2)
{
- \rint nfds;
- \r\rnfds = fds1->nsds;
- \rif (nfds < fds2->nsds)
- \rnfds = fds2->nsds;
- \r\rfor (; nfds >= 0; nfds--)
- \rif (FD_ISSET (nfds, &fds1->sds) && FD_ISSET (nfds, &fds2->sds))
- \rreturn GNUNET_YES;
- \r\rreturn GNUNET_NO;
-\r}
-
-\r\r
-/**\r
- * Creates an fd set\r
- * @return a new fd set\r
- */ \r
-struct GNUNET_NETWORK_FDSet *\r
-GNUNET_NETWORK_fdset_create () \r
+ int nfds;
+ nfds = fds1->nsds;
+ if (nfds < fds2->nsds)
+ nfds = fds2->nsds;
+ for (; nfds >= 0; nfds--)
+ if (FD_ISSET (nfds, &fds1->sds) && FD_ISSET (nfds, &fds2->sds))
+ return GNUNET_YES;
+#ifdef MINGW
+ {
+ struct GNUNET_CONTAINER_SList_Iterator *it;
+
+ for (it = GNUNET_CONTAINER_slist_begin (fds1->handles);
+ GNUNET_CONTAINER_slist_end (it) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (it))
+ {
+ HANDLE *h;
+
+ h = GNUNET_CONTAINER_slist_get (it, NULL);
+ if (GNUNET_CONTAINER_slist_contains
+ (fds2->handles, h, sizeof (HANDLE)))
+ {
+ GNUNET_CONTAINER_slist_iter_destroy (it);
+ return GNUNET_YES;
+ }
+ }
+ GNUNET_CONTAINER_slist_iter_destroy (it);
+ }
+#endif
+ return GNUNET_NO;
+}
+
+
+/**
+ * Creates an fd set
+ * @return a new fd set
+ */
+struct GNUNET_NETWORK_FDSet *
+GNUNET_NETWORK_fdset_create ()
{
- \rstruct GNUNET_NETWORK_FDSet *fds;
- \r\rfds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));
- \r
-#ifdef MINGW\r
- fds->handles = GNUNET_CONTAINER_slist_create ();
- \r
-#endif /* \r */
- GNUNET_NETWORK_fdset_zero (fds);
- \rreturn fds;
-\r}
-
-\r\r\r
-/**\r
- * Releases the associated memory of an fd set\r
- * @param fds fd set\r
- */ \r
-void \r
-GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds) \r
+ struct GNUNET_NETWORK_FDSet *fds;
+ fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));
+#ifdef MINGW
+ fds->handles = GNUNET_CONTAINER_slist_create ();
+#endif
+ 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)
{
- \r
-#ifdef MINGW\r
- GNUNET_CONTAINER_slist_destroy (fds->handles);
- \r
-#endif /* \r */
- GNUNET_free (fds);
-\r} \r\r\r
-
-/**\r
- * Check if sockets meet certain conditions\r
- * @param rfds set of sockets to be checked for readability\r
- * @param wfds set of sockets to be checked for writability\r
- * @param efds set of sockets to be checked for exceptions\r
- * @param timeout relative value when to return\r
- * @return number of selected sockets, GNUNET_SYSERR on error\r
- */ \r
-int \r
+#ifdef MINGW
+ GNUNET_CONTAINER_slist_destroy (fds->handles);
+#endif
+ GNUNET_free (fds);
+}
+
+/**
+ * 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
+ * @param timeout relative value when to return
+ * @return number of selected sockets, GNUNET_SYSERR on error
+ */
+int
GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
- \rstruct GNUNET_NETWORK_FDSet *wfds,
- \rstruct GNUNET_NETWORK_FDSet *efds,
- \rconst struct GNUNET_TIME_Relative timeout) \r
+ struct GNUNET_NETWORK_FDSet *wfds,
+ struct GNUNET_NETWORK_FDSet *efds,
+ const struct GNUNET_TIME_Relative timeout)
{
- \rint nfds;
- \r\rnfds = 0;
- \rif (NULL != rfds)
- \rnfds = rfds->nsds;
- \rif (NULL != wfds)
- \rnfds = GNUNET_MAX (nfds, wfds->nsds);
- \rif (NULL != efds)
- \rnfds = GNUNET_MAX (nfds, efds->nsds);
- \r\r
-#ifndef MINGW\r
+ int nfds;
+#ifdef MINGW
+ int handles;
+#endif
+ nfds = 0;
+#ifdef MINGW
+ handles = 0;
+#endif
+ if (NULL != rfds)
+ {
+ nfds = rfds->nsds;
+#ifdef MINGW
+ handles = GNUNET_CONTAINER_slist_count (rfds->handles);
+#endif
+ }
+ if (NULL != wfds)
+ {
+ nfds = GNUNET_MAX (nfds, wfds->nsds);
+#ifdef MINGW
+ handles += GNUNET_CONTAINER_slist_count (wfds->handles);
+#endif
+ }
+ if (NULL != efds)
+ {
+ nfds = GNUNET_MAX (nfds, efds->nsds);
+#ifdef MINGW
+ handles += GNUNET_CONTAINER_slist_count (efds->handles);
+#endif
+ }
+
struct timeval tv;
- \r\rtv.tv_sec = timeout.value / GNUNET_TIME_UNIT_SECONDS.value;
- \rtv.tv_usec =
+ tv.tv_sec = timeout.value / GNUNET_TIME_UNIT_SECONDS.value;
+ tv.tv_usec =
1000 * (timeout.value - (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.value));
- \rif ((nfds == 0) && \r(timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value))
- \r
+ if ((nfds == 0) && (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value)
+#ifdef MINGW
+ && handles == 0
+#endif
+ )
{
- \rGNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- \r_
- ("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
- \r"select");
- \rGNUNET_break (0);
- \r}
- \rreturn select (nfds + 1, \r
- (rfds != NULL) ? &rfds->sds : NULL, \r
- (wfds != NULL) ? &wfds->sds : NULL, \r
- (efds != NULL) ? &efds->sds : NULL, \r
- (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value) \r
- ? NULL \r : &tv);
- \r
-#else /* \r */
- DWORD limit;
- \rfd_set sock_read, sock_write, sock_except;
- \rfd_set aread, awrite, aexcept;
- \rint i;
- \rstruct timeval tvslice;
- \rint retcode;
- \rDWORD ms_total;
- \r\r
-#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set))\r
- \r
- /* calculate how long we need to wait in milliseconds */ \r
- if (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value)
- \rms_total = INFINITE;
- \r
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
+ "select");
+ GNUNET_break (0);
+ }
+#ifndef MINGW
+ return select (nfds + 1,
+ (rfds != NULL) ? &rfds->sds : NULL,
+ (wfds != NULL) ? &wfds->sds : NULL,
+ (efds != NULL) ? &efds->sds : NULL,
+ (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value)
+ ? NULL : &tv);
+
+#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;
+ int retcode;
+ DWORD ms_total;
+
+#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set))
+
+ /* calculate how long we need to wait in milliseconds */
+ if (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value)
+ ms_total = INFINITE;
+
else
- \rms_total = timeout.value / GNUNET_TIME_UNIT_MILLISECONDS.value;
- \r\r
- /* select() may be used as a portable way to sleep */ \r
- if (!(rfds || wfds || efds))
- \r
+ ms_total = timeout.value / GNUNET_TIME_UNIT_MILLISECONDS.value;
+
+ /* select() may be used as a portable way to sleep */
+ if (!(rfds || wfds || efds))
+
{
- \rSleep (ms_total);
- \rreturn 0;
- \r}
- \r\rif (rfds)
- \rsock_read = rfds->sds;
- \r
+ Sleep (ms_total);
+ return 0;
+ }
+
+ handles_read = GNUNET_CONTAINER_slist_create ();
+ handles_write = GNUNET_CONTAINER_slist_create ();
+ handles_except = GNUNET_CONTAINER_slist_create ();
+
+ if (rfds)
+ sock_read = rfds->sds;
else
- \rFD_ZERO (&sock_read);
- \r\rif (wfds)
- \rsock_write = wfds->sds;
- \r
+ FD_ZERO (&sock_read);
+ if (wfds)
+ sock_write = wfds->sds;
else
- \rFD_ZERO (&sock_write);
- \r\rif (efds)
- \rsock_except = efds->sds;
- \r
+ FD_ZERO (&sock_write);
+ if (efds)
+ sock_except = efds->sds;
else
- \rFD_ZERO (&sock_except);
- \r\r
- /* multiplex between winsock select() and waiting on the handles */ \r
- \rFD_ZERO (&aread);
- \rFD_ZERO (&awrite);
- \rFD_ZERO (&aexcept);
- \r\rlimit = GetTickCount () + ms_total;
- \r
+ FD_ZERO (&sock_except);
+
+ /* multiplex between winsock select() and waiting on the handles */
+ FD_ZERO (&aread);
+ FD_ZERO (&awrite);
+ FD_ZERO (&aexcept);
+ limit = GetTickCount () + ms_total;
+
do
- \r
{
- \rretcode = 0;
- \r\rif (nfds > 0)
- \r
+ retcode = 0;
+ if (nfds > 0)
+
{
- \r
- /* overwrite the zero'd sets here; the select call\r
- * will clear those that are not active */ \r
- \rFD_COPY (&sock_read, &aread);
- \rFD_COPY (&sock_write, &awrite);
- \rFD_COPY (&sock_except, &aexcept);
- \r\rtvslice.tv_sec = 0;
- \rtvslice.tv_usec = 100000;
- \r\rif ((retcode =
- \rselect (nfds + 1, &aread, &awrite, &aexcept,
- \r&tvslice)) == SOCKET_ERROR)
- \r
+
+ /* 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)
+
{
- \rSetErrnoFromWinsockError (WSAGetLastError ());
- \rif (errno == ENOTSOCK)
- \rerrno = EBADF;
- \r\r
-#if DEBUG_NETWORK\r
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "select");
- \r
-#endif /* \r */
- \rgoto select_loop_end;
- \r}
- \r}
- \r\r
- /* Poll read pipes */ \r
- if (rfds)
- \r
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ if (errno == ENOTSOCK)
+ errno = EBADF;
+
+#if DEBUG_NETWORK
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "select");
+
+#endif
+ goto select_loop_end;
+ }
+ }
+
+ /* Poll read pipes */
+ if (rfds)
+
{
- \rstruct GNUNET_CONTAINER_SList_Iterator *i;
- \rint on_next;
- \r\ron_next = GNUNET_NO;
- \rfor (i = GNUNET_CONTAINER_slist_begin (rfds->handles);
- \rGNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
- \ron_next || GNUNET_CONTAINER_slist_next (i))
- \r
+ 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))
+
{
- \rHANDLE h;
- \rDWORD dwBytes;
- \r\rh = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);
- \ron_next = GNUNET_NO;
- \r\rif (!PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))
- \r
+ HANDLE h;
+ DWORD dwBytes;
+ h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);
+ if (!PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))
{
- \rGNUNET_CONTAINER_slist_erase (i);
- \ron_next = GNUNET_YES;
- \r\rretcode = -1;
- \rSetErrnoFromWinError (GetLastError ());
- \r
-#if DEBUG_NETWORK\r
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
- "PeekNamedPipe");
- \r
-#endif /* \r */
- goto select_loop_end;
- \r}
- \r
+ retcode = -1;
+ SetErrnoFromWinError (GetLastError ());
+
+#if DEBUG_NETWORK
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
+ "PeekNamedPipe");
+
+#endif
+ goto select_loop_end;
+ }
else if (dwBytes)
- \r
- {
- \rretcode++;
- \r}
- \r
- else
- \r
+
{
- \rGNUNET_CONTAINER_slist_erase (i);
- \ron_next = GNUNET_YES;
- \r}
- \r}
- \r}
- \r\r
- /* Poll for faulty pipes */ \r
- if (efds)
- \r
+ GNUNET_CONTAINER_slist_add (handles_read,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ &h, sizeof (HANDLE));
+ retcode++;
+ }
+ }
+ GNUNET_CONTAINER_slist_iter_destroy (i);
+ }
+
+ /* Poll for faulty pipes */
+ if (efds)
+
{
- \rstruct GNUNET_CONTAINER_SList_Iterator *i;
- \rint on_next;
- \r\ron_next = GNUNET_NO;
- \rfor (i = GNUNET_CONTAINER_slist_begin (efds->handles);
- \rGNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
- \ron_next || GNUNET_CONTAINER_slist_next (i))
- \r
+ 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))
+
{
- \rHANDLE h;
- \rDWORD dwBytes;
- \r\rh = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);
- \r\rif (PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))
- \r
+ HANDLE h;
+ DWORD dwBytes;
+ h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);
+ if (!PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))
+
{
- \rGNUNET_CONTAINER_slist_erase (i);
- \ron_next = GNUNET_YES;
- \r\rretcode++;
- \r}
- \r
- else
- \ron_next = GNUNET_NO;
- \r}
- \r}
- \r\r
- /* FIXME */ \r
- if (wfds)
- \rGNUNET_assert (GNUNET_CONTAINER_slist_count (wfds->handles) == 0);
- \r\r
- /* Check for closed sockets */ \r
- for (i = 0; i < nfds; i++)
- \r
+ GNUNET_CONTAINER_slist_add (handles_except,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ &h, sizeof (HANDLE));
+ retcode++;
+ }
+ }
+ GNUNET_CONTAINER_slist_iter_destroy (i);
+ }
+
+ if (wfds)
{
- \rif (SAFE_FD_ISSET (i, &sock_read))
- \r
+ GNUNET_CONTAINER_slist_append (handles_write, wfds->handles);
+ retcode += GNUNET_CONTAINER_slist_count (wfds->handles);
+ }
+
+ /* Check for closed sockets */
+ for (i = 0; i < nfds; i++)
+
+ {
+ if (SAFE_FD_ISSET (i, &sock_read))
+
{
- \rstruct sockaddr addr;
- \rint len;
- \r\rif (getpeername (i, &addr, &len) == SOCKET_ERROR)
- \r
+ struct sockaddr addr;
+ int len;
+ if (getpeername (i, &addr, &len) == SOCKET_ERROR)
+
{
- \rint err, len;
- \r\rlen = sizeof (err);
- \rif (getsockopt \r
- (i, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == 0 \r
- &&err == WSAENOTCONN)
- \r
+ int err, len;
+ len = sizeof (err);
+ if (getsockopt
+ (i, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == 0
+ && err == WSAENOTCONN)
+
{
- \rif (!SAFE_FD_ISSET (i, &aread))
- \r
+ if (!SAFE_FD_ISSET (i, &aread))
+
{
- \rFD_SET (i, &aread);
- \rretcode++;
- \r}
- \r}
- \r}
- \r}
- \r}
- \r\rselect_loop_end:;
- \r}
- \rwhile (retcode == 0 && (ms_total == INFINITE || GetTickCount () < limit));
- \r\rif (retcode != -1)
- \r
+ FD_SET (i, &aread);
+ retcode++;
+ }
+ }
+ }
+ }
+ }
+ select_loop_end:
+ if (retcode == 0 && nfds == 0)
+ Sleep (GNUNET_MIN (100, limit - GetTickCount ()));
+ }
+ while (retcode == 0 && (ms_total == INFINITE || GetTickCount () < limit));
+
+ if (retcode != -1)
{
- \rif (rfds)
- \r
+ if (rfds)
{
- \rGNUNET_NETWORK_fdset_zero (rfds);
- \rGNUNET_NETWORK_fdset_copy_native (rfds, &aread, retcode);
- \r}
- \r\rif (wfds)
- \r
+ 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)
{
- \rGNUNET_NETWORK_fdset_zero (wfds);
- \rGNUNET_NETWORK_fdset_copy_native (wfds, &awrite, retcode);
- \r}
- \r\rif (efds)
- \r
+ 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)
{
- \rGNUNET_NETWORK_fdset_zero (efds);
- \rGNUNET_NETWORK_fdset_copy_native (efds, &aexcept, retcode);
- \r}
- \r}
- \r\rreturn retcode;
- \r
-#endif /* \r */
+ 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);
+ }
+ }
+
+ GNUNET_CONTAINER_slist_destroy (handles_read);
+ GNUNET_CONTAINER_slist_destroy (handles_write);
+ GNUNET_CONTAINER_slist_destroy (handles_except);
+
+ return retcode;
+#endif
}
-\r\r\r
-/* end of network.c */ \r
+
+/* end of network.c */
projects / oweals / gnunet.git / blobdiff