#include "disk.h"
#include "gnunet_container_lib.h"
-#define DEBUG_NETWORK GNUNET_NO
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+#define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
+
+#define DEBUG_NETWORK GNUNET_EXTRA_LOGGING
+
+#define DEBUG_W32_CYCLES GNUNET_EXTRA_LOGGING
#ifndef INVALID_SOCKET
#define INVALID_SOCKET -1
-#endif /* */
+#endif
+
+
struct GNUNET_NETWORK_Handle
{
+#ifndef MINGW
int fd;
-};
-struct GNUNET_NETWORK_FDSet
-{
- /* socket descriptors */
- int nsds;
- fd_set sds;
+#else
+ SOCKET fd;
+#endif
+
+ /**
+ * Address family / domain.
+ */
+ int af;
-#ifdef WINDOWS
- /* handles */
- struct GNUNET_CONTAINER_SList *handles;
+ /**
+ * Number of bytes in addr.
+ */
+ socklen_t addrlen;
+
+ /**
+ * Address we were bound to, or NULL.
+ */
+ struct sockaddr *addr;
-#endif /* */
};
+
#ifndef FD_COPY
#define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))
-#endif /* */
+#endif
+
/**
* Set if a socket should use blocking or non-blocking IO.
#if MINGW
u_long mode;
+
mode = !doBlock;
if (ioctlsocket (fd->fd, FIONBIO, &mode) == SOCKET_ERROR)
- {
- SetErrnoFromWinsockError (WSAGetLastError ());
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "ioctlsocket");
- return GNUNET_SYSERR;
- }
+ {
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "ioctlsocket");
+ return GNUNET_SYSERR;
+ }
return GNUNET_OK;
-#else /* */
+#else
/* not MINGW */
int flags = fcntl (fd->fd, F_GETFL);
+
if (flags == -1)
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
- return GNUNET_SYSERR;
- }
+ {
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "fcntl");
+ return GNUNET_SYSERR;
+ }
if (doBlock)
flags &= ~O_NONBLOCK;
flags |= O_NONBLOCK;
if (0 != fcntl (fd->fd, F_SETFL, flags))
- {
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "fcntl");
- return GNUNET_SYSERR;
- }
+ {
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "fcntl");
+ return GNUNET_SYSERR;
+ }
return GNUNET_OK;
-
-#endif /* */
+#endif
}
socket_set_inheritable (const struct GNUNET_NETWORK_Handle *h)
{
int i;
+
i = fcntl (h->fd, F_GETFD);
+ if (i < 0)
+ return GNUNET_SYSERR;
if (i == (i | FD_CLOEXEC))
return GNUNET_OK;
- return (fcntl (h->fd, F_SETFD, i | FD_CLOEXEC) == 0)
- ? GNUNET_OK : GNUNET_SYSERR;
+ i |= FD_CLOEXEC;
+ if (fcntl (h->fd, F_SETFD, i) < 0)
+ return GNUNET_SYSERR;
+ return GNUNET_OK;
}
+#endif
-#endif /* */
-
#ifdef DARWIN
/**
* The MSG_NOSIGNAL equivalent on Mac OS X
static void
socket_set_nosigpipe (const struct GNUNET_NETWORK_Handle *h)
{
- int value = 1;
+ int abs_value = 1;
+
if (0 !=
- setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, &value, sizeof (value)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+ setsockopt (h->fd, SOL_SOCKET, SO_NOSIGPIPE, &abs_value,
+ sizeof (abs_value)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
}
+#endif
-#endif /* */
-
/**
* Disable delays when sending data via the socket.
* (GNUnet makes sure that messages are as big as
static void
socket_set_nodelay (const struct GNUNET_NETWORK_Handle *h)
{
+#ifndef WINDOWS
int value = 1;
+
+ if (0 != setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+#else
+ const char *abs_value = "1";
+
if (0 !=
- setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, &value, sizeof (value)))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+ setsockopt (h->fd, IPPROTO_TCP, TCP_NODELAY, abs_value,
+ sizeof (abs_value)))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+#endif
}
*/
struct GNUNET_NETWORK_Handle *
GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
- struct sockaddr *address,
- socklen_t * address_len)
+ struct sockaddr *address, socklen_t * address_len)
{
struct GNUNET_NETWORK_Handle *ret;
+
ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+#if DEBUG_NETWORK
+ {
+ struct sockaddr name;
+ socklen_t namelen = sizeof (name);
+ int gsn = getsockname (desc->fd, &name, &namelen);
+
+ if (gsn == 0)
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Accepting connection on `%s'\n",
+ GNUNET_a2s (&name, namelen));
+ }
+#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);
- return NULL;
- }
-
+ 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 /* */
+ {
+ 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;
- }
+ /* 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 /* */
+ LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "socket_set_inheritable");
+#endif
#ifdef DARWIN
socket_set_nosigpipe (ret);
-
-#endif /* */
- socket_set_nodelay (ret);
+#endif
+#ifdef AF_UNIX
+ if (ret->af != AF_UNIX)
+#endif
+ socket_set_nodelay (ret);
return ret;
}
socklen_t address_len)
{
int ret;
- ret = bind (desc->fd, address, address_len);
+#ifdef IPV6_V6ONLY
+#ifdef IPPROTO_IPV6
+ const int on = 1;
+
+ if (desc->af == AF_INET6)
+ if (0 != setsockopt (desc->fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof (on)))
+ 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");
+#endif
+#ifndef LINUX
+#ifndef MINGW
+ if (address->sa_family == AF_UNIX)
+ {
+ const struct sockaddr_un *un = (const struct sockaddr_un *) address;
+
+ (void) unlink (un->sun_path);
+ }
+#endif
+#endif
+ ret = bind (desc->fd, address, address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
-#endif /* */
- return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+#endif
+ if (ret != 0)
+ return GNUNET_SYSERR;
+#ifndef MINGW
+#ifndef LINUX
+ desc->addr = GNUNET_malloc (address_len);
+ memcpy (desc->addr, address, address_len);
+ desc->addrlen = address_len;
+#endif
+#endif
+ return GNUNET_OK;
}
GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
{
int ret;
- int eno;
#ifdef MINGW
- ret = closesocket (desc->fd);
- SetErrnoFromWinsockError (WSAGetLastError ());
+ DWORD error = 0;
-#else /* */
+#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
+#ifndef LINUX
+#ifndef MINGW
+ if ((desc->af == AF_UNIX) && (NULL != desc->addr))
+ {
+ const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr;
-#endif /* */
- eno = errno;
+ if (0 != unlink (un->sun_path))
+ LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", un->sun_path);
+ }
+#endif
+#endif
+ GNUNET_free_non_null (desc->addr);
GNUNET_free (desc);
- errno = eno;
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)
+{
+#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;
+ ret->af = AF_UNSPEC;
+ return ret;
+#endif
+}
+
+
/**
* Connect a socket
* @param desc socket
socklen_t address_len)
{
int ret;
+
ret = connect (desc->fd, address, address_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
-
- {
- SetErrnoFromWinsockError (WSAGetLastError ());
- if (errno == EWOULDBLOCK)
- errno = EINPROGRESS;
- }
-
-#endif /* */
+ {
+ SetErrnoFromWinsockError (WSAGetLastError ());
+ if (errno == EWOULDBLOCK)
+ errno = EINPROGRESS;
+ }
+#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
socklen_t * optlen)
{
int ret;
+
ret = getsockopt (desc->fd, level, optname, optval, optlen);
#ifdef MINGW
else if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
-#endif /* */
+#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
int backlog)
{
int ret;
+
ret = listen (desc->fd, backlog);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-#endif /* */
+#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;
+
+ /* How much is there to be read? */
+#ifndef WINDOWS
+ int pending;
+
+ error = ioctl (desc->fd, FIONREAD, &pending);
+ if (error == 0)
+#else
+ u_long pending;
+
+ 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)
+{
+ 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
{
int ret;
int flags;
+
flags = 0;
#ifdef MSG_DONTWAIT
flags |= MSG_DONTWAIT;
-
-#endif /* */
+#endif
ret = recv (desc->fd, buffer, length, flags);
-
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
-#endif /* */
+#endif
return ret;
}
{
int ret;
int flags;
+
flags = 0;
#ifdef MSG_DONTWAIT
flags |= MSG_DONTWAIT;
-#endif /* */
+#endif
#ifdef MSG_NOSIGNAL
flags |= MSG_NOSIGNAL;
-#endif /* */
+#endif
ret = send (desc->fd, buffer, length, flags);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-#endif /* */
+#endif
return ret;
}
{
int ret;
int flags;
+
flags = 0;
#ifdef MSG_DONTWAIT
flags |= MSG_DONTWAIT;
-
-#endif /* */
+#endif
#ifdef MSG_NOSIGNAL
flags |= MSG_NOSIGNAL;
-
-#endif /* */
+#endif
ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len);
-
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
-#endif /* */
+#endif
return ret;
}
* @return GNUNET_OK on success, GNUNET_SYSERR otherwise
*/
int
-GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
- int level, int option_name,
- const void *option_value,
+GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd, int level,
+ int option_name, const void *option_value,
socklen_t option_len)
{
int ret;
- ret = setsockopt (fd->fd, level, option_name, option_value, option_len);
+ ret = setsockopt (fd->fd, level, option_name, option_value, option_len);
#ifdef MINGW
if (SOCKET_ERROR == ret)
SetErrnoFromWinsockError (WSAGetLastError ());
-
-#endif /* */
+#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
GNUNET_NETWORK_socket_create (int domain, int type, int protocol)
{
struct GNUNET_NETWORK_Handle *ret;
+
ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
+ ret->af = domain;
ret->fd = socket (domain, type, protocol);
if (INVALID_SOCKET == ret->fd)
-
- {
-
+ {
#ifdef MINGW
- SetErrnoFromWinsockError (WSAGetLastError ());
-
-#endif /* */
- GNUNET_free (ret);
- return NULL;
- }
+ 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;
+ }
- {
- GNUNET_break (0 == close (ret->fd));
- GNUNET_free (ret);
- errno = EMFILE;
- return NULL;
- }
-
-#endif /* */
+#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;
- }
+ {
+ /* 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 /* */
+ 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)
+#endif
+ if ((type == SOCK_STREAM)
+#ifdef AF_UNIX
+ && (domain != AF_UNIX)
+#endif
+ )
socket_set_nodelay (ret);
return ret;
}
GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how)
{
int ret;
- ret = shutdown (desc->fd, how);
+ ret = shutdown (desc->fd, how);
#ifdef MINGW
if (ret != 0)
SetErrnoFromWinsockError (WSAGetLastError ());
+#endif
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
+}
-#endif /* */
+
+/**
+ * Disable the "CORK" feature for communication with the given socket,
+ * forcing the OS to immediately flush the buffer on transmission
+ * instead of potentially buffering multiple messages. Essentially
+ * reduces the OS send buffers to zero.
+ *
+ * @param desc socket
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
+GNUNET_NETWORK_socket_disable_corking (struct GNUNET_NETWORK_Handle *desc)
+{
+ int ret = 0;
+
+#if WINDOWS
+ int value = 0;
+
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd, SOL_SOCKET, SO_SNDBUF, (char *) &value,
+ sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd, SOL_SOCKET, SO_RCVBUF, (char *) &value,
+ sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+#elif LINUX
+ int value = 0;
+
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+ if (0 !=
+ (ret =
+ setsockopt (desc->fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof (value))))
+ LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "setsockopt");
+#endif
return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;
}
{
FD_ZERO (&fds->sds);
fds->nsds = 0;
-
#ifdef MINGW
GNUNET_CONTAINER_slist_clear (fds->handles);
-
-#endif /* */
+#endif
}
/**
const struct GNUNET_NETWORK_FDSet *src)
{
int nfds;
+
for (nfds = src->nsds; nfds > 0; nfds--)
if (FD_ISSET (nfds, &src->sds))
- {
- FD_SET (nfds, &dst->sds);
- if (nfds + 1 > dst->nsds)
- dst->nsds = nfds + 1;
- }
+ {
+ 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
*/
to->nsds = from->nsds;
#ifdef MINGW
- struct GNUNET_CONTAINER_SList_Iterator *iter;
GNUNET_CONTAINER_slist_clear (to->handles);
- for (iter = GNUNET_CONTAINER_slist_begin (from->handles);
- GNUNET_CONTAINER_slist_end (iter) != GNUNET_YES;
- GNUNET_CONTAINER_slist_next (iter))
+ GNUNET_CONTAINER_slist_append (to->handles, from->handles);
+#endif
+}
- {
- void *handle;
- size_t len;
- handle = GNUNET_CONTAINER_slist_get (iter, &len);
- GNUNET_CONTAINER_slist_add (to->handles,
- GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
- handle, len);
- }
- GNUNET_CONTAINER_slist_iter_destroy (iter);
-#endif /* */
+
+/**
+ * Return file descriptor for this network handle
+ *
+ * @param desc wrapper to process
+ * @return POSIX file descriptor
+ */
+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
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)
+{
+ GNUNET_assert ((nfd >= 0) && (nfd < FD_SETSIZE));
+ 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)
+{
+ 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
GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds,
const struct GNUNET_DISK_FileHandle *h)
{
-
#ifdef MINGW
- HANDLE hw;
- GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE));
- GNUNET_CONTAINER_slist_add (fds->handles, GNUNET_NO, &hw, sizeof (HANDLE));
+ GNUNET_CONTAINER_slist_add (fds->handles,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, h,
+ sizeof (struct GNUNET_DISK_FileHandle));
-#else /* */
+#else
int fd;
+
GNUNET_DISK_internal_file_handle_ (h, &fd, sizeof (int));
FD_SET (fd, &fds->sds);
if (fd + 1 > fds->nsds)
fds->nsds = fd + 1;
-#endif /* */
+#endif
}
{
#ifdef MINGW
- return GNUNET_CONTAINER_slist_contains (fds->handles, h->h,
- sizeof (HANDLE));
-
-#else /* */
+ return GNUNET_CONTAINER_slist_contains (fds->handles, h,
+ sizeof (struct
+ GNUNET_DISK_FileHandle));
+#else
return FD_ISSET (h->fd, &fds->sds);
-
-#endif /* */
+#endif
}
GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1,
const struct GNUNET_NETWORK_FDSet *fds2)
{
+#ifndef MINGW
int nfds;
+
nfds = fds1->nsds;
- if (nfds < fds2->nsds)
+ if (nfds > fds2->nsds)
nfds = fds2->nsds;
- for (; nfds >= 0; nfds--)
+ while (nfds > 0)
+ {
+ nfds--;
if (FD_ISSET (nfds, &fds1->sds) && FD_ISSET (nfds, &fds2->sds))
return GNUNET_YES;
+ }
+#else
+ struct GNUNET_CONTAINER_SList_Iterator it;
+ struct GNUNET_DISK_FileHandle *h;
+ int i;
+ int j;
+
+ /*This code is somewhat hacky, we are not supposed to know what's
+ * inside of fd_set; also the O(n^2) is really bad... */
+
+ for (i = 0; i < fds1->sds.fd_count; i++)
+ {
+ for (j = 0; j < fds2->sds.fd_count; j++)
+ {
+ if (fds1->sds.fd_array[i] == fds2->sds.fd_array[j])
+ return GNUNET_YES;
+ }
+ }
+ it = GNUNET_CONTAINER_slist_begin (fds1->handles);
+ while (GNUNET_CONTAINER_slist_end (&it) != GNUNET_YES)
+ {
+#if DEBUG_NETWORK
+ struct GNUNET_CONTAINER_SList_Iterator t;
+#endif
+ h = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&it,
+ NULL);
+#if DEBUG_NETWORK
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Checking that FD 0x%x is in another set:\n",
+ h->h);
+ for (t = GNUNET_CONTAINER_slist_begin (fds2->handles);
+ GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (&t))
+ {
+ struct GNUNET_DISK_FileHandle *fh;
+
+ fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&t,
+ NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "0x%x\n", fh->h);
+ }
+#endif
+ 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);
+ }
+#endif
return GNUNET_NO;
}
GNUNET_NETWORK_fdset_create ()
{
struct GNUNET_NETWORK_FDSet *fds;
- fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));
+ fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));
#ifdef MINGW
fds->handles = GNUNET_CONTAINER_slist_create ();
-
-#endif /* */
+#endif
GNUNET_NETWORK_fdset_zero (fds);
return fds;
}
void
GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds)
{
-
#ifdef MINGW
GNUNET_CONTAINER_slist_destroy (fds->handles);
-
-#endif /* */
+#endif
GNUNET_free (fds);
}
struct GNUNET_NETWORK_FDSet *efds,
const struct GNUNET_TIME_Relative timeout)
{
- int nfds;
+ int nfds = 0;
+
#ifdef MINGW
- int handles;
+ int handles = 0;
+ int ex_handles = 0;
+ int read_handles = 0;
+ int write_handles = 0;
+
+ int i = 0;
+ int retcode = 0;
+ DWORD ms_total = 0;
+
+ int nsock = 0, nhandles = 0, nSockEvents = 0;
+
+ static HANDLE hEventRead = 0;
+ static HANDLE hEventWrite = 0;
+ static HANDLE hEventException = 0;
+ static HANDLE hEventPipeWrite = 0;
+ static HANDLE hEventReadReady = 0;
+
+ 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;
+
+ fd_set aread, awrite, aexcept;
+
+#if DEBUG_NETWORK
+ fd_set bread, bwrite, bexcept;
#endif
- nfds = 0;
-#ifdef MINGW
- handles = 0;
+
+ /* TODO: Make this growable */
+ struct GNUNET_DISK_FileHandle *readArray[50];
+#else
+ struct timeval tv;
#endif
if (NULL != rfds)
- {
- nfds = rfds->nsds;
+ {
+ nfds = rfds->nsds;
#ifdef MINGW
- handles = GNUNET_CONTAINER_slist_count (rfds->handles);
-#endif
+ handles += read_handles = GNUNET_CONTAINER_slist_count (rfds->handles);
+#if DEBUG_NETWORK
+ {
+ struct GNUNET_CONTAINER_SList_Iterator t;
+
+ for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
+ GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (&t))
+ {
+ struct GNUNET_DISK_FileHandle *fh;
+
+ fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&t,
+ NULL);
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "FD 0x%x (0x%x) is SET in rfds\n", fh->h,
+ fh);
+ }
}
+#endif
+#endif
+ }
if (NULL != wfds)
- {
- nfds = GNUNET_MAX (nfds, wfds->nsds);
+ {
+ nfds = GNUNET_MAX (nfds, wfds->nsds);
#ifdef MINGW
- handles += GNUNET_CONTAINER_slist_count (wfds->handles);
+ handles += write_handles = GNUNET_CONTAINER_slist_count (wfds->handles);
#endif
- }
+ }
if (NULL != efds)
- {
- nfds = GNUNET_MAX (nfds, efds->nsds);
+ {
+ nfds = GNUNET_MAX (nfds, efds->nsds);
#ifdef MINGW
- handles += GNUNET_CONTAINER_slist_count (efds->handles);
+ handles += ex_handles = GNUNET_CONTAINER_slist_count (efds->handles);
#endif
- }
+ }
- struct timeval tv;
- tv.tv_sec = timeout.value / GNUNET_TIME_UNIT_SECONDS.value;
- tv.tv_usec =
- 1000 * (timeout.value - (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.value));
- if ((nfds == 0) && (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value)
+ if ((nfds == 0) &&
+ (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
#ifdef MINGW
&& handles == 0
#endif
- )
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
- "select");
- 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
- return select (nfds + 1,
- (rfds != NULL) ? &rfds->sds : NULL,
+ tv.tv_sec = timeout.rel_value / GNUNET_TIME_UNIT_SECONDS.rel_value;
+ tv.tv_usec =
+ 1000 * (timeout.rel_value -
+ (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.rel_value));
+ return select (nfds, (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;
- int i;
- struct timeval tvslice;
- int retcode;
- DWORD ms_total;
+ (timeout.rel_value ==
+ GNUNET_TIME_UNIT_FOREVER_REL.rel_value) ? 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.value == GNUNET_TIME_UNIT_FOREVER_REL.value)
+ if (timeout.rel_value == GNUNET_TIME_UNIT_FOREVER_REL.rel_value)
ms_total = INFINITE;
-
else
- ms_total = timeout.value / GNUNET_TIME_UNIT_MILLISECONDS.value;
-
+ ms_total = timeout.rel_value / GNUNET_TIME_UNIT_MILLISECONDS.rel_value;
/* select() may be used as a portable way to sleep */
if (!(rfds || wfds || efds))
-
- {
- Sleep (ms_total);
- return 0;
- }
- if (rfds)
- sock_read = rfds->sds;
+ {
+ Sleep (ms_total);
+ return 0;
+ }
+
+ /* Events for sockets */
+ if (!hEventRead)
+ hEventRead = CreateEvent (NULL, TRUE, FALSE, NULL);
else
- FD_ZERO (&sock_read);
- if (wfds)
- sock_write = wfds->sds;
+ ResetEvent (hEventRead);
+ if (!hEventReadReady)
+ hEventReadReady = CreateEvent (NULL, TRUE, TRUE, NULL);
+ if (!hEventWrite)
+ hEventWrite = CreateEvent (NULL, TRUE, FALSE, NULL);
else
- FD_ZERO (&sock_write);
- if (efds)
- sock_except = efds->sds;
+ ResetEvent (hEventWrite);
+ if (!hEventException)
+ hEventException = CreateEvent (NULL, TRUE, FALSE, NULL);
else
- FD_ZERO (&sock_except);
+ ResetEvent (hEventException);
+
+ /* Event for pipes */
+ if (!hEventPipeWrite)
+ hEventPipeWrite = CreateEvent (NULL, TRUE, TRUE, NULL);
+ readPipes = 0;
+ writePipePos = -1;
- /* multiplex between winsock select() and waiting on the handles */
+ 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);
- limit = GetTickCount () + ms_total;
-
- do
-
+#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
+ }
+ /* We will first Add the PIPES to the events */
+ /* Read Pipes */
+ if (rfds && read_handles)
+ {
+ 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))
{
- retcode = 0;
- if (nfds > 0)
+ struct GNUNET_DISK_FileHandle *fh;
+ fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&i,
+ NULL);
+ if (fh->type == GNUNET_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 ();
- /* overwrite the zero'd sets here; the select call
- * will clear those that are not active */
- FD_COPY (&sock_read, &aread);
- FD_COPY (&sock_write, &awrite);
- FD_COPY (&sock_except, &aexcept);
- tvslice.tv_sec = 0;
- tvslice.tv_usec = 100000;
- if ((retcode =
- select (nfds + 1, &aread, &awrite, &aexcept,
- &tvslice)) == SOCKET_ERROR)
-
- {
- SetErrnoFromWinsockError (WSAGetLastError ());
- if (errno == ENOTSOCK)
- errno = EBADF;
-
+ if (error_code == ERROR_IO_PENDING)
+ {
#if DEBUG_NETWORK
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "select");
-
-#endif /* */
- goto select_loop_end;
- }
+ 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);
+ * }
+ */
}
-
- /* Poll read pipes */
- if (rfds)
-
+ else
{
- struct GNUNET_CONTAINER_SList_Iterator *i;
- int on_next;
- on_next = GNUNET_NO;
- for (i = GNUNET_CONTAINER_slist_begin (rfds->handles);
- GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
- on_next || GNUNET_CONTAINER_slist_next (i))
-
- {
- HANDLE h;
- DWORD dwBytes;
- h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);
- on_next = GNUNET_NO;
- if (!PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))
-
- {
- GNUNET_CONTAINER_slist_erase (i);
- on_next = GNUNET_YES;
- retcode = -1;
- SetErrnoFromWinError (GetLastError ());
-
#if DEBUG_NETWORK
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
- "PeekNamedPipe");
+ 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;
+ }
+ }
+ else
+ {
+ GNUNET_CONTAINER_slist_add (handles_read,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh, sizeof (struct GNUNET_DISK_FileHandle));
+ }
+ }
+ }
+ 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;
+ }
+ 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;
-#endif /* */
- goto select_loop_end;
- }
+ fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&i,
+ NULL);
+ if (fh->type == GNUNET_PIPE)
+ {
+ if (!PeekNamedPipe (fh->h, NULL, 0, NULL, &dwBytes, NULL))
+ {
+ GNUNET_CONTAINER_slist_add (handles_except,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ fh,
+ sizeof (struct GNUNET_DISK_FileHandle));
+ newretcode++;
+ }
+ }
+ }
+ }
+ if (nfds > 0)
+ {
+ if (rfds)
+ {
+#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++;
+ }
+ }
+ if (wfds)
+ {
+ int wakeup = 0;
- else if (dwBytes)
+#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;
- {
- retcode++;
- }
+ 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 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++)
+ {
+ WSAEventSelect (efds->sds.fd_array[i], hEventException,
+ FD_OOB | FD_CLOSE);
+ nsock++;
+ }
+ }
+ }
- else
+ handle_array[nhandles] = NULL;
- {
- GNUNET_CONTAINER_slist_erase (i);
- on_next = GNUNET_YES;
- }
- }
- GNUNET_CONTAINER_slist_iter_destroy (i);
- }
+#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
- /* Poll for faulty pipes */
- if (efds)
+ if (nhandles)
+ returncode =
+ WaitForMultipleObjects (nhandles, handle_array, FALSE, ms_total);
+#if DEBUG_NETWORK
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "WaitForMultipleObjects Returned : %d\n",
+ returncode);
+#endif
- {
- struct GNUNET_CONTAINER_SList_Iterator *i;
- int on_next;
- on_next = GNUNET_NO;
- for (i = GNUNET_CONTAINER_slist_begin (efds->handles);
- GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;
- on_next || GNUNET_CONTAINER_slist_next (i))
-
- {
- HANDLE h;
- DWORD dwBytes;
- h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);
- if (PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))
-
- {
- GNUNET_CONTAINER_slist_erase (i);
- on_next = GNUNET_YES;
- retcode++;
- }
-
- else
- on_next = GNUNET_NO;
- }
- GNUNET_CONTAINER_slist_iter_destroy (i);
- }
+ returnedpos = returncode - WAIT_OBJECT_0;
+#if DEBUG_NETWORK
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "return pos is : %d\n", returnedpos);
+#endif
- /* FIXME */
- if (wfds)
- GNUNET_assert (GNUNET_CONTAINER_slist_count (wfds->handles) == 0);
+ /* 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;
- /* Check for closed sockets */
- for (i = 0; i < nfds; i++)
+ 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))
+ {
+ 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;
+ BOOL bret;
+
+ SetLastError (0);
+ waitstatus = 0;
+ 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 (SAFE_FD_ISSET (i, &sock_read))
-
- {
- struct sockaddr addr;
- int len;
- if (getpeername (i, &addr, &len) == SOCKET_ERROR)
-
- {
- int err, len;
- len = sizeof (err);
- if (getsockopt
- (i, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == 0
- && err == WSAENOTCONN)
-
- {
- if (!SAFE_FD_ISSET (i, &aread))
-
- {
- FD_SET (i, &aread);
- retcode++;
- }
- }
- }
- }
+ if (error != ERROR_BROKEN_PIPE)
+ continue;
}
- select_loop_end:
- if (retcode == 0 && nfds == 0)
- Sleep (GNUNET_MIN (100, limit - GetTickCount ()));
+ else if (waitstatus <= 0)
+ continue;
+ GNUNET_CONTAINER_slist_add (handles_read,
+ GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT,
+ 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
+ }
}
- while (retcode == 0 && (ms_total == INFINITE || GetTickCount () < limit));
- if (retcode != -1)
-
+ 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)
{
- if (rfds)
-
+ 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))
{
- GNUNET_NETWORK_fdset_zero (rfds);
- GNUNET_NETWORK_fdset_copy_native (rfds, &aread, retcode);
+ FD_SET (wfds->sds.fd_array[i], &awrite);
+ retcode += 1;
}
- if (wfds)
+ }
+ }
+ }
+#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;
- {
- GNUNET_NETWORK_fdset_zero (wfds);
- GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, retcode);
- }
- if (efds)
+ 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))
+ {
+ struct GNUNET_DISK_FileHandle *fh;
- {
- GNUNET_NETWORK_fdset_zero (efds);
- GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, retcode);
- }
+ fh = (struct GNUNET_DISK_FileHandle *) GNUNET_CONTAINER_slist_get (&t,
+ NULL);
+ if (fh->type == GNUNET_PIPE)
+ {
+ CancelIo (fh->h);
+ }
}
- return retcode;
+#if DEBUG_NETWORK
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "Zeroing rfds\n");
+#endif
+ GNUNET_NETWORK_fdset_zero (rfds);
+ if (retcode != -1 && nhandles && (returnedpos < nhandles))
+ GNUNET_NETWORK_fdset_copy_native (rfds, &aread, retcode);
+ GNUNET_CONTAINER_slist_append (rfds->handles, handles_read);
+ }
+ 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
+ GNUNET_NETWORK_fdset_zero (wfds);
+ if (retcode != -1 && nhandles && (returnedpos < nhandles))
+ GNUNET_NETWORK_fdset_copy_native (wfds, &awrite, retcode);
+ GNUNET_CONTAINER_slist_append (wfds->handles, handles_write);
+ }
+ 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
+ GNUNET_NETWORK_fdset_zero (efds);
+ if (retcode != -1 && nhandles && (returnedpos < nhandles))
+ GNUNET_NETWORK_fdset_copy_native (efds, &aexcept, retcode);
+ 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 DEBUG_NETWORK
+ if (rfds)
+ {
+ struct GNUNET_CONTAINER_SList_Iterator t;
-#endif /* */
-}
+ for (i = 0; i < bread.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");
+ }
+ for (t = GNUNET_CONTAINER_slist_begin (rfds->handles);
+ GNUNET_CONTAINER_slist_end (&t) != GNUNET_YES;
+ GNUNET_CONTAINER_slist_next (&t))
+ {
+ struct GNUNET_DISK_FileHandle *fh;
+ 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);
+ }
+ }
+ if (wfds)
+ {
+ for (i = 0; i < bwrite.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");
+ }
+ }
+ if (efds)
+ {
+ for (i = 0; i < bexcept.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, "Returning %d or 0\n", retcode);
+#endif
+ if (nhandles && (returnedpos < nhandles))
+ return retcode;
+ else
+#endif
+ return 0;
+}
/* end of network.c */
projects / oweals / gnunet.git / blobdiff