/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+ (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 "disk.h"
-#include "gnunet_container_lib.h"
+#include "gnunet_util_lib.h"
#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
#define DEBUG_NETWORK GNUNET_EXTRA_LOGGING
-#define DEBUG_W32_CYCLES GNUNET_EXTRA_LOGGING
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
{
#ifndef MINGW
int fd;
-
#else
SOCKET fd;
#endif
*/
int af;
+ /**
+ * Type of the socket
+ */
+ int type;
+
/**
* Number of bytes in addr.
*/
};
+/**
+ * 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;
+
+ s = socket (pf, SOCK_STREAM, 0);
+ if (-1 == s)
+ {
+ if (EAFNOSUPPORT == errno)
+ return GNUNET_NO;
+ fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
+ return GNUNET_SYSERR;
+ }
+#if WINDOWS
+ closesocket (s);
+#else
+ close (s);
+#endif
+ return GNUNET_OK;
+}
+
+
+/**
+ * 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 (sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) +
+ 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);
+ strcat (unixpath, (char*) ae.encoding);
+ return unixpath;
+}
+
+
#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
+ * @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
}
-#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);
if (i < 0)
return GNUNET_SYSERR;
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
int abs_value = 1;
if (0 !=
- setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, &abs_value,
+ setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE,
+ (const void *) &abs_value,
sizeof (abs_value)))
LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
}
const char *abs_value = "1";
if (0 !=
- setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, abs_value,
+ 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)
+{
+ h->af = af;
+ h->type = type;
+ if (h->fd == INVALID_SOCKET)
+ {
+#ifdef MINGW
+ SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ GNUNET_free (h);
+ 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))
+ {
+ GNUNET_break (0);
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (h));
+ 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;
+}
+
+
/**
* accept a new connection on a socket
*
}
#endif
ret->fd = accept (desc->fd, address, address_len);
- if (address != NULL)
- ret->af = address->sa_family;
- else
- ret->af = desc->af;
- if (ret->fd == INVALID_SOCKET)
- {
-#ifdef MINGW
- SetErrnoFromWinsockError (WSAGetLastError ());
-#endif
- GNUNET_free (ret);
+ if (GNUNET_OK != initialize_network_handle (ret,
+ (NULL != address) ? address->sa_family : desc->af,
+ SOCK_STREAM))
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;
- }
-
-#ifndef MINGW
- if (GNUNET_OK != socket_set_inheritable (ret))
- 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 (ret->af != AF_UNIX)
-#endif
- socket_set_nodelay (ret);
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 flags flags affecting bind behaviour
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address,
- socklen_t address_len)
+ socklen_t address_len,
+ int flags)
{
int ret;
#ifdef IPV6_V6ONLY
#ifdef IPPROTO_IPV6
- const int on = 1;
+ {
+ const int on = 1;
- if (desc->af == AF_INET6)
- if (0 != setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)))
- LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
+ if (desc->af == AF_INET6)
+ if (setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY,
+ (const void *) &on,
+ sizeof (on)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
+ }
#endif
#endif
#ifndef WINDOWS
- /* This is required, and required here, but only on UNIX */
- if (0 != setsockopt (desc->fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof (on)))
- LOG_STRERROR (GNUNET_ERROR_TYPE_DEBUG, "setsockopt");
+ {
+ 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)
+ if (address->sa_family == AF_UNIX && (flags & GNUNET_BIND_EXCLUSIVE) == 0)
{
const struct sockaddr_un *un = (const struct sockaddr_un *) address;
/**
* 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)
#ifdef MINGW
DWORD error = 0;
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Closing 0x%x\n",
- desc->fd);
-#endif
SetLastError (0);
ret = closesocket (desc->fd);
error = WSAGetLastError ();
SetErrnoFromWinsockError (error);
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Closed 0x%x, closesocket() returned %d, GLE is %u\n", desc->fd, ret,
error);
-#endif
#else
ret = close (desc->fd);
#endif
}
#endif
#endif
+ 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);
- return (ret == 0) ? GNUNET_OK : GNUNET_SYSERR;
}
/**
- * 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
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
* @param optname identifier of the option
* @param optval options
* @param optlen length of optval
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
/**
* 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,
/**
* 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 *
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);
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 addrlen length of the addr
*/
ssize_t
-GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc,
+GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
void *buffer, size_t length,
- struct sockaddr * src_addr, socklen_t * addrlen)
+ struct sockaddr *src_addr, socklen_t *addrlen)
{
int ret;
int flags;
/**
* Read data from a connected socket (always non-blocking).
+ *
* @param desc socket
* @param buffer buffer
* @param length length of buffer
* @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
+ * @return number of bytes sent, #GNUNET_SYSERR on error
*/
ssize_t
GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
/**
* 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
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd, int level,
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));
+ if (GNUNET_OK !=
+ initialize_network_handle (ret, domain, type))
return NULL;
- }
-
-#ifndef MINGW
- if (GNUNET_OK != socket_set_inheritable (ret))
- 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;
}
* reduces the OS send buffers to zero.
*
* @param desc socket
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_disable_corking (struct GNUNET_NETWORK_Handle *desc)
/**
* Reset FD set
+ *
* @param fds fd set
*/
void
#endif
}
+
/**
* Add a socket to the FD set
+ *
* @param fds fd set
* @param desc socket to add
*/
/**
* 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
/**
* 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 (nfds + 1 > dst->nsds)
dst->nsds = nfds + 1;
}
-#ifdef MINGW
+#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).
+ */
+ int i;
+ for (i = 0; i < src->sds.fd_count; i++)
+ FD_SET (src->sds.fd_array[i], &dst->sds);
+ if (src->nsds > dst->nsds)
+ dst->nsds = src->nsds;
+
GNUNET_CONTAINER_slist_append (dst->handles, src->handles);
#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
*
*
* @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
GNUNET_NETWORK_fdset_test_native (const struct GNUNET_NETWORK_FDSet *to,
* 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,
* 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,
if (GNUNET_CONTAINER_slist_contains
(fds2->handles, h, sizeof (struct GNUNET_DISK_FileHandle)))
{
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Match!\n");
-#endif
return GNUNET_YES;
}
GNUNET_CONTAINER_slist_next (&it);
/**
* Creates an fd set
+ *
* @return a new fd set
*/
struct GNUNET_NETWORK_FDSet *
/**
* Releases the associated memory of an fd set
+ *
* @param fds fd set
*/
void
GNUNET_free (fds);
}
+#if MINGW
+struct _select_params
+{
+ fd_set *r;
+ fd_set *w;
+ fd_set *e;
+ struct timeval *tv;
+ HANDLE wakeup;
+ HANDLE standby;
+ SOCKET wakeup_socket;
+ int status;
+};
+
+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;
+}
+#endif
+
+
/**
- * 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
+ * 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 = 0;
-
#ifdef MINGW
int handles = 0;
int ex_handles = 0;
int i = 0;
int retcode = 0;
- DWORD ms_total = 0;
+ uint64_t mcs_total = 0;
+ DWORD ms_rounded = 0;
- int nsock = 0, nhandles = 0, nSockEvents = 0;
+ int nhandles = 0;
- static HANDLE hEventRead = 0;
- static HANDLE hEventWrite = 0;
- static HANDLE hEventException = 0;
static HANDLE hEventPipeWrite = 0;
static HANDLE hEventReadReady = 0;
+ static struct _select_params sp;
+ static HANDLE select_thread = NULL;
+ static HANDLE select_finished_event = NULL;
+ static HANDLE select_standby_event = NULL;
+ static SOCKET select_wakeup_socket = -1;
+ static SOCKET select_send_socket = -1;
+ static struct timeval select_timeout;
+
int readPipes = 0;
int writePipePos = 0;
HANDLE handle_array[FD_SETSIZE + 2];
int returncode = -1;
- DWORD newretcode = 0;
int returnedpos = 0;
- struct GNUNET_CONTAINER_SList *handles_read, *handles_write, *handles_except;
+ struct GNUNET_CONTAINER_SList *handles_read;
+ struct GNUNET_CONTAINER_SList *handles_write;
+ struct GNUNET_CONTAINER_SList *handles_except;
- fd_set aread, awrite, aexcept;
+ int selectret = 0;
+
+ fd_set aread;
+ fd_set awrite;
+ fd_set aexcept;
#if DEBUG_NETWORK
- fd_set bread, bwrite, bexcept;
+ fd_set bread;
+ fd_set bwrite;
+ fd_set bexcept;
#endif
/* TODO: Make this growable */
}
if ((nfds == 0) &&
- (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
+ (timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
#ifdef MINGW
&& handles == 0
#endif
)
{
+ GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_ERROR,
_
("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
"select");
- GNUNET_break (0);
}
#ifndef MINGW
- tv.tv_sec = timeout.rel_value / GNUNET_TIME_UNIT_SECONDS.rel_value;
+ tv.tv_sec = timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
tv.tv_usec =
- 1000 * (timeout.rel_value -
- (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value));
- 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);
+ (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
#define SAFE_FD_ISSET(fd, set) (set != NULL && FD_ISSET(fd, set))
- /* calculate how long we need to wait in milliseconds */
- if (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
- ms_total = INFINITE;
+ /* 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);
+ Sleep (ms_rounded);
return 0;
}
- /* Events for sockets */
- if (!hEventRead)
- hEventRead = CreateEvent (NULL, TRUE, FALSE, NULL);
+ if (NULL == 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);
+ }
+
+
+ handles_read = GNUNET_CONTAINER_slist_create ();
+ handles_write = GNUNET_CONTAINER_slist_create ();
+ handles_except = GNUNET_CONTAINER_slist_create ();
+ FD_ZERO (&aread);
+ FD_ZERO (&awrite);
+ FD_ZERO (&aexcept);
+#if DEBUG_NETWORK
+ FD_ZERO (&bread);
+ FD_ZERO (&bwrite);
+ FD_ZERO (&bexcept);
+#endif
+ if (rfds)
+ {
+ FD_COPY (&rfds->sds, &aread);
+#if DEBUG_NETWORK
+ FD_COPY (&rfds->sds, &bread);
+#endif
+ }
+ if (wfds)
+ {
+ FD_COPY (&wfds->sds, &awrite);
+#if DEBUG_NETWORK
+ FD_COPY (&wfds->sds, &bwrite);
+#endif
+ }
+ if (efds)
+ {
+ FD_COPY (&efds->sds, &aexcept);
+#if DEBUG_NETWORK
+ FD_COPY (&efds->sds, &bexcept);
+#endif
+ }
+
+ /* 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, (rfds != NULL) ? &aread : NULL,
+ (wfds != NULL) ? &awrite : NULL, &aexcept, &select_timeout);
else
- ResetEvent (hEventRead);
+ selectret = 0;
+ if (selectret == -1)
+ {
+ /* 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_abort ();
+ }
+
+ /* Check aexcept, add its contents to awrite
+ This is technically wrong (aexcept might have its own descriptors), we should
+ have checked that descriptors were in awrite originally before re-adding them from
+ aexcept. Luckily, GNUnet never uses aexcept for anything, so this does not become a problem (yet). */
+ for (i = 0; i < aexcept.fd_count; i++)
+ FD_SET (aexcept.fd_array[i], &awrite);
+
+ /* 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) || (mcs_total == 0))
+ {
+ /* Read Pipes */
+ if (rfds && read_handles)
+ {
+ struct GNUNET_CONTAINER_SList_Iterator i;
+ int c;
+
+ for (c = 0, i = GNUNET_CONTAINER_slist_begin (rfds->handles);
+ GNUNET_CONTAINER_slist_end (&i) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (&i), c++)
+ {
+ struct GNUNET_DISK_FileHandle *fh;
+
+ fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&i,NULL);
+ if (fh->type == GNUNET_DISK_HANLDE_TYPE_PIPE)
+ {
+ DWORD error;
+ BOOL bret;
+
+ SetLastError (0);
+ DWORD waitstatus = 0;
+ bret = PeekNamedPipe (fh->h, NULL, 0, NULL, &waitstatus, NULL);
+ error = GetLastError ();
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Peek at read pipe %d (0x%x) returned %d (%d bytes available) GLE %u\n",
+ c, fh->h, bret, waitstatus, error);
+ if (bret == 0)
+ {
+ /* 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)
+ continue;
+ }
+ else if (waitstatus <= 0)
+ continue;
+ GNUNET_CONTAINER_slist_add (handles_read, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh, sizeof (struct GNUNET_DISK_FileHandle));
+ retcode++;
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Added read Pipe 0x%x (0x%x)\n",
+ fh, fh->h);
+ }
+ else
+ {
+ GNUNET_CONTAINER_slist_add (handles_read, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh, sizeof (struct GNUNET_DISK_FileHandle));
+ retcode++;
+ }
+ }
+ }
+ if (wfds && write_handles)
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding the write ready event to the array as %d\n", nhandles);
+ GNUNET_CONTAINER_slist_append (handles_write, wfds->handles);
+ retcode += write_handles;
+ }
+ if (efds && ex_handles)
+ {
+ 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_DISK_HANLDE_TYPE_PIPE)
+ {
+ if (PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
+ continue;
+ GNUNET_CONTAINER_slist_add (handles_except, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh, sizeof (struct GNUNET_DISK_FileHandle));
+ retcode++;
+ }
+ }
+ }
+
+ /* Add our select() result.*/
+ if (selectret >= 0)
+ retcode += selectret;
+
+ if (rfds)
+ {
+ GNUNET_NETWORK_fdset_zero (rfds);
+ if (selectret != -1)
+ GNUNET_NETWORK_fdset_copy_native (rfds, &aread, selectret);
+ GNUNET_CONTAINER_slist_append (rfds->handles, handles_read);
+ }
+ if (wfds)
+ {
+ GNUNET_NETWORK_fdset_zero (wfds);
+ if (selectret != -1)
+ GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, selectret);
+ GNUNET_CONTAINER_slist_append (wfds->handles, handles_write);
+ }
+ if (efds)
+ {
+ GNUNET_NETWORK_fdset_zero (efds);
+ if (selectret != -1)
+ GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, selectret);
+ 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);
+
+ if (selectret == -1)
+ return -1;
+ return retcode;
+ }
+
+ /* If we got this far, use slower implementation that is able to do a waiting select
+ on both sockets and pipes simultaneously */
+
+ /* Events for pipes */
if (!hEventReadReady)
hEventReadReady = CreateEvent (NULL, TRUE, TRUE, NULL);
- if (!hEventWrite)
- hEventWrite = CreateEvent (NULL, TRUE, FALSE, NULL);
- else
- ResetEvent (hEventWrite);
- if (!hEventException)
- hEventException = CreateEvent (NULL, TRUE, FALSE, NULL);
- else
- ResetEvent (hEventException);
-
- /* Event for pipes */
if (!hEventPipeWrite)
hEventPipeWrite = CreateEvent (NULL, TRUE, TRUE, NULL);
readPipes = 0;
writePipePos = -1;
- handles_read = GNUNET_CONTAINER_slist_create ();
- handles_write = GNUNET_CONTAINER_slist_create ();
- handles_except = GNUNET_CONTAINER_slist_create ();
+ retcode = 0;
+
FD_ZERO (&aread);
FD_ZERO (&awrite);
FD_ZERO (&aexcept);
fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&i,
NULL);
- if (fh->type == GNUNET_PIPE)
+ if (fh->type == GNUNET_DISK_HANLDE_TYPE_PIPE)
{
/* Read zero bytes to check the status of the pipe */
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG, "Reading 0 bytes from the pipe 0x%x\n",
fh->h);
-#endif
if (!ReadFile (fh->h, NULL, 0, NULL, fh->oOverlapRead))
{
DWORD error_code = GetLastError ();
if (error_code == ERROR_IO_PENDING)
{
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Adding the pipe's 0x%x overlapped event to the array as %d\n",
fh->h, nhandles);
-#endif
handle_array[nhandles++] = fh->oOverlapRead->hEvent;
readArray[readPipes++] = fh;
}
- /*
- * else
- * {
- * SetErrnoFromWinError (error_code);
- * }
- */
+ else
+ {
+ LOG (GNUNET_ERROR_TYPE_DEBUG,
+ "Read failed, adding the read ready event to the array as %d\n", nhandles);
+ handle_array[nhandles++] = hEventReadReady;
+ readArray[readPipes++] = fh;
+ }
}
else
{
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Adding the read ready event to the array as %d\n", nhandles);
-#endif
handle_array[nhandles++] = hEventReadReady;
readArray[readPipes++] = fh;
}
}
if (wfds && write_handles)
{
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Adding the write ready event to the array as %d\n", nhandles);
-#endif
handle_array[nhandles++] = hEventPipeWrite;
writePipePos = nhandles;
}
fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&i,
NULL);
- if (fh->type == GNUNET_PIPE)
+ if (fh->type == GNUNET_DISK_HANLDE_TYPE_PIPE)
{
if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
{
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
fh,
sizeof (struct GNUNET_DISK_FileHandle));
- newretcode++;
}
}
}
}
+
+ sp.status = 0;
+
if (nfds > 0)
{
- if (rfds)
+ 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
{
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the socket read event to the array as %d\n", nhandles);
-#endif
- handle_array[nhandles++] = hEventRead;
- nSockEvents++;
- for (i = 0; i < rfds->sds.fd_count; i++)
- {
- WSAEventSelect (rfds->sds.fd_array[i], hEventRead,
- FD_ACCEPT | FD_READ | FD_CLOSE);
- nsock++;
- }
+ 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;
}
- if (wfds)
+ FD_SET (select_wakeup_socket, &aread);
+ do
{
- int wakeup = 0;
+ 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 DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the socket write event to the array as %d\n", nhandles);
-#endif
- handle_array[nhandles++] = hEventWrite;
- nSockEvents++;
- for (i = 0; i < wfds->sds.fd_count; i++)
- {
- DWORD error;
- int status;
+ 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);
+ }
- status = send (wfds->sds.fd_array[i], NULL, 0, 0);
- error = GetLastError ();
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "pre-send to the socket %d returned %d (%u)\n", i, status, error);
-#endif
- if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN))
- wakeup = 1;
- WSAEventSelect (wfds->sds.fd_array[i], hEventWrite,
- FD_WRITE | FD_CONNECT | FD_CLOSE);
- nsock++;
- }
- if (wakeup)
- SetEvent (hEventWrite);
- }
- if (efds)
+ if (nfds > 0)
+ {
+ /* Don't wake up select-thread when delay is 0, it should return immediately
+ * and wake up by itself.
+ */
+ if (mcs_total != 0)
+ 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 (mcs_total != 0)
{
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "Adding the socket error event to the array as %d\n", nhandles);
-#endif
- handle_array[nhandles++] = hEventException;
- nSockEvents++;
- for (i = 0; i < efds->sds.fd_count; i++)
+ do
{
- WSAEventSelect (efds->sds.fd_array[i], hEventException,
- FD_OOB | FD_CLOSE);
- nsock++;
- }
+ i = recv (select_wakeup_socket, (char *) &returnedpos, 1, 0);
+ } while (i == 1);
}
+ /* Check aexcept, add its contents to awrite */
+ for (i = 0; i < aexcept.fd_count; i++)
+ FD_SET (aexcept.fd_array[i], &awrite);
}
- handle_array[nhandles] = NULL;
-
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Number nfds : %d\n", nfds);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Number of handles : %d\n", nhandles);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "retcode : %d\n", newretcode);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Will wait : %d\n", ms_total);
-#endif
-
- if (nhandles)
- returncode =
- WaitForMultipleObjects (nhandles, handle_array, FALSE, ms_total);
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "WaitForMultipleObjects Returned : %d\n",
- returncode);
-#endif
-
returnedpos = returncode - WAIT_OBJECT_0;
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG, "return pos is : %d\n", returnedpos);
-#endif
- /* FIXME: THIS LINE IS WRONG !! We should add to handles only handles that fired the events, not all ! */
- /*
- * if(rfds)
- * GNUNET_CONTAINER_slist_append (handles_read, rfds->handles);
- */
if (nhandles && (returnedpos < nhandles))
{
DWORD waitstatus;
- /* Do the select */
- if (nfds)
- {
- struct timeval tvslice;
+ if (sp.status > 0)
+ retcode += sp.status;
- tvslice.tv_sec = 0;
- tvslice.tv_usec = 10;
- retcode = select (nfds, &aread, &awrite, &aexcept, &tvslice);
- if (retcode == -1)
- retcode = 0;
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Select retcode : %d\n", retcode);
-#endif
- }
- /* FIXME: <= writePipePos? Really? */
- if ((writePipePos != -1) && (returnedpos <= writePipePos))
+ if ((writePipePos != -1) && (returnedpos < writePipePos))
{
GNUNET_CONTAINER_slist_append (handles_write, wfds->handles);
retcode += write_handles;
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG, "Added write pipe\n");
-#endif
}
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG, "ReadPipes is : %d\n", readPipes);
-#endif
/* We have some pipes ready for read. */
- /* FIXME: it is supposed to work !! Only choose the Pipes who fired the event, but it is not working */
-
if (returnedpos < readPipes)
{
- /*
- * for (i = 0; i < readPipes; i++)
- * {
- * waitstatus = WaitForSingleObject (handle_array[i], 0);
- * LOG (GNUNET_ERROR_TYPE_DEBUG, "Read pipe %d wait status is : %d\n", i, waitstatus);
- * if (waitstatus != WAIT_OBJECT_0)
- * continue;
- * GNUNET_CONTAINER_slist_add (handles_read,
- * GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- * readArray[i], sizeof (struct GNUNET_DISK_FileHandle));
- * retcode++;
- * LOG (GNUNET_ERROR_TYPE_DEBUG, "Added read Pipe\n");
- * }
- */
for (i = 0; i < readPipes; i++)
{
DWORD error;
bret =
PeekNamedPipe (readArray[i]->h, NULL, 0, NULL, &waitstatus, NULL);
error = GetLastError ();
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Peek at read pipe %d (0x%x) returned %d (%d bytes available) GLE %u\n",
i, readArray[i]->h, bret, waitstatus, error);
-#endif
if (bret == 0)
{
- if (error != ERROR_BROKEN_PIPE)
+ /* 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)
continue;
}
else if (waitstatus <= 0)
readArray[i],
sizeof (struct GNUNET_DISK_FileHandle));
retcode++;
-#if DEBUG_NETWORK
LOG (GNUNET_ERROR_TYPE_DEBUG, "Added read Pipe 0x%x (0x%x)\n",
readArray[i], readArray[i]->h);
-#endif
- }
- }
- waitstatus = WaitForSingleObject (hEventWrite, 0);
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Wait for the write event returned %d\n",
- waitstatus);
-#endif
- if (waitstatus == WAIT_OBJECT_0)
- {
- for (i = 0; i < wfds->sds.fd_count; i++)
- {
- DWORD error;
- int status;
- int so_error = 0;
- int sizeof_so_error = sizeof (so_error);
- int gso_result =
- getsockopt (wfds->sds.fd_array[i], SOL_SOCKET, SO_ERROR,
- (char *) &so_error, &sizeof_so_error);
-
- status = send (wfds->sds.fd_array[i], NULL, 0, 0);
- error = GetLastError ();
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG,
- "send to the socket %d returned %d (%u)\n", i, status, error);
-#endif
- if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) ||
- (status == -1 && gso_result == 0 && error == WSAENOTCONN &&
- so_error == WSAECONNREFUSED))
- {
- FD_SET (wfds->sds.fd_array[i], &awrite);
- retcode += 1;
- }
}
}
}
-#if DEBUG_NETWORK
if (!nhandles || (returnedpos >= nhandles))
LOG (GNUNET_ERROR_TYPE_DEBUG, "Returning from _select() with nothing!\n");
-#endif
if (rfds)
{
struct GNUNET_CONTAINER_SList_Iterator t;
- for (i = 0; i < rfds->sds.fd_count; i++)
- {
- WSAEventSelect (rfds->sds.fd_array[i], hEventRead, 0);
- nsock++;
- }
for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
GNUNET_CONTAINER_slist_next (&t))
fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&t,
NULL);
- if (fh->type == GNUNET_PIPE)
+ if (fh->type == GNUNET_DISK_HANLDE_TYPE_PIPE)
{
CancelIo (fh->h);
}
}
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing rfds\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing rfds%s\n", (retcode != -1 && nhandles && (returnedpos < nhandles)) ? ", copying fdset" : "");
GNUNET_NETWORK_fdset_zero (rfds);
if (retcode != -1 && nhandles && (returnedpos < nhandles))
GNUNET_NETWORK_fdset_copy_native (rfds, &aread, retcode);
}
if (wfds)
{
- for (i = 0; i < wfds->sds.fd_count; i++)
- {
- WSAEventSelect (wfds->sds.fd_array[i], hEventWrite, 0);
- nsock++;
- }
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing wfds\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing wfds%s\n", (retcode != -1 && nhandles && (returnedpos < nhandles)) ? ", copying fdset" : "");
GNUNET_NETWORK_fdset_zero (wfds);
if (retcode != -1 && nhandles && (returnedpos < nhandles))
GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, retcode);
}
if (efds)
{
- for (i = 0; i < efds->sds.fd_count; i++)
- {
- WSAEventSelect (efds->sds.fd_array[i], hEventException, 0);
- nsock++;
- }
-#if DEBUG_NETWORK
- LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing efds\n");
-#endif
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing efds%s\n", (retcode != -1 && nhandles && (returnedpos < nhandles)) ? ", copying fdset" : "");
GNUNET_NETWORK_fdset_zero (efds);
if (retcode != -1 && nhandles && (returnedpos < nhandles))
GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, retcode);
{
struct GNUNET_CONTAINER_SList_Iterator t;
- for (i = 0; i < bread.fd_count; i++)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "rfds:\n");
+ for (i = 0; i < rfds->sds.fd_count; i++)
{
- if (bread.fd_array[i] != 0)
- LOG (GNUNET_ERROR_TYPE_DEBUG, "FD 0x%x is %s in rfds\n",
- bread.fd_array[i],
- (SAFE_FD_ISSET (bread.fd_array[i], rfds)) ? "SET" : "NOT SET");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%d\n", rfds->sds.fd_array[i]);
}
for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&t,
NULL);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "FD 0x%x is SET in rfds\n", fh->h);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%d\n", fh->h);
}
}
if (wfds)
{
- for (i = 0; i < bwrite.fd_count; i++)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "wfds:\n");
+ for (i = 0; i < wfds->sds.fd_count; i++)
{
- if (bwrite.fd_array[i] != 0)
- LOG (GNUNET_ERROR_TYPE_DEBUG, "FD 0x%x is %s in wfds\n",
- bwrite.fd_array[i],
- (SAFE_FD_ISSET (bwrite.fd_array[i], rfds)) ? "SET" : "NOT SET");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%d\n", wfds->sds.fd_array[i]);
}
}
if (efds)
{
- for (i = 0; i < bexcept.fd_count; i++)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "efds:\n");
+ for (i = 0; i < efds->sds.fd_count; i++)
{
- if (bexcept.fd_array[i] != 0)
- LOG (GNUNET_ERROR_TYPE_DEBUG, "FD 0x%x is %s in efds\n",
- bexcept.fd_array[i],
- (SAFE_FD_ISSET (bexcept.fd_array[i], rfds)) ? "SET" : "NOT SET");
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "%d\n", efds->sds.fd_array[i]);
}
}
LOG (GNUNET_ERROR_TYPE_DEBUG, "Returning %d or 0\n", retcode);
projects / oweals / gnunet.git / blobdiff