#include "gnunet_disk_lib.h"
#include "gnunet_time_lib.h"
-
+/**
+ * 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,
struct sockaddr *address,
socklen_t *address_len);
+/**
+ * Make a non-inheritable to child processes
+ * @param socket
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @warning Not implemented on Windows
+ */
int
GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle
*desc);
-
+/**
+ * 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,
const struct sockaddr *address, socklen_t address_len);
+/**
+ * Close a socket
+ * @param desc socket
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc);
+/**
+ * Connect a socket
+ * @param desc socket
+ * @param address peer address
+ * @param length of address
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address, socklen_t address_len);
+/**
+ * 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, int level, int optname,
void *optval, socklen_t *optlen);
+/**
+ * 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, int backlog);
-ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Handle *desc, void *buf,
- size_t nbyte);
-
+/**
+ * Read data from a connected socket
+ * @param desc socket
+ * @param buffer buffer
+ * @param length length of buffer
+ * @param flags type of message reception
+ */
ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc, void *buffer,
size_t length, int flags);
+/**
+ * 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,
struct GNUNET_NETWORK_FDSet *wfds, struct GNUNET_NETWORK_FDSet *efds,
struct GNUNET_TIME_Relative timeout);
/**
* 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
*/
int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int doBlock);
+/**
+ * Send data
+ * @param desc socket
+ * @param buffer data to send
+ * @param length size of the buffer
+ * @param flags type of message transmission
+ * @return number of bytes sent, GNUNET_SYSERR on error
+ */
ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
const void *buffer, size_t length, int flags);
+/**
+ * Send data
+ * @param desc socket
+ * @param message data to send
+ * @param length size of the data
+ * @param flags type of message transmission
+ * @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,
const void *message, size_t length, int flags,
const struct sockaddr *dest_addr,
socklen_t dest_len);
+/**
+ * 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, int level, int option_name,
const void *option_value, socklen_t option_len);
+/**
+ * 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);
+/**
+ * Create a new socket
+ * @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_socket (int domain, int type, int protocol);
-ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Handle *desc,
- const void *buf, size_t nbyte);
-
-
+/**
+ * Reset FD set
+ * @param fds fd set
+ */
void GNUNET_NETWORK_fdset_zero(struct GNUNET_NETWORK_FDSet *fds);
+/**
+ * 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,
const struct GNUNET_NETWORK_Handle *desc);
+/**
+ * Check whether a socket is part of the fd set
+ * @param fds fd set
+ * @param desc socket
+ */
int GNUNET_NETWORK_fdset_isset(const struct GNUNET_NETWORK_FDSet *fds,
const struct GNUNET_NETWORK_Handle *desc);
+/**
+ * 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,
const struct GNUNET_NETWORK_FDSet *src);
+/**
+ * Copy one fd set to another
+ * @param to destination
+ * @param from source
+ */
void GNUNET_NETWORK_fdset_copy(struct GNUNET_NETWORK_FDSet *to,
const struct GNUNET_NETWORK_FDSet *from);
+/**
+ * Copy a native fd set
+ * @param to destination
+ * @param from native source set
+ * @param the biggest socket number in from + 1
+ */
void GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to, const fd_set *from,
int nfds);
+/**
+ * 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,
const struct GNUNET_DISK_FileHandle *h);
+/**
+ * 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,
const struct GNUNET_DISK_FileHandle *h);
+/**
+ * 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, const struct GNUNET_NETWORK_FDSet *fds2);
+/**
+ * Creates an fd set
+ * @return a new fd set
+ */
struct GNUNET_NETWORK_FDSet *GNUNET_NETWORK_fdset_create (void);
+/**
+ * Releases the associated memory of an fd set
+ * @param fds fd set
+ */
void GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds);
if (addrlen > sizeof (addr))
{
GNUNET_break (0);
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
return NULL;
}
_("Access denied to `%s'\n"),
GNUNET_a2s(uaddr, addrlen));
GNUNET_break (0 == GNUNET_NETWORK_socket_shutdown (sock, SHUT_RDWR));
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
GNUNET_free (uaddr);
return NULL;
}
if (GNUNET_SYSERR == GNUNET_NETWORK_socket_set_blocking (s, GNUNET_NO))
{
/* we'll treat this one as fatal */
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (s));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
return GNUNET_SYSERR;
}
#if DEBUG_CONNECTION
GNUNET_a2s(sock->ai_pos->ai_addr,
sock->ai_pos->ai_addrlen));
#endif
- if ((0 != GNUNET_NETWORK_socket_connect (s,
+ if ((GNUNET_OK != GNUNET_NETWORK_socket_connect (s,
sock->ai_pos->ai_addr,
sock->ai_pos->ai_addrlen)) && (errno != EINPROGRESS))
{
/* maybe refused / unsupported address, try next */
GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "connect");
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (s));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
sock->ai_pos = sock->ai_pos->ai_next;
continue;
}
GNUNET_a2s(sock->addr, sock->addrlen));
#endif
/* connect failed / timed out */
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock->sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
sock->sock = NULL;
if (GNUNET_SYSERR == try_connect (sock))
{
if (GNUNET_SYSERR == GNUNET_NETWORK_socket_set_blocking (s, GNUNET_NO))
{
/* we'll treat this one as fatal */
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (s));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
return NULL;
}
#if DEBUG_CONNECTION
_("Trying to connect to `%s'\n"),
GNUNET_a2s(serv_addr, addrlen));
#endif
- if ((0 != GNUNET_NETWORK_socket_connect (s, serv_addr, addrlen)) && (errno != EINPROGRESS))
+ if ((GNUNET_OK != GNUNET_NETWORK_socket_connect (s, serv_addr, addrlen)) && (errno != EINPROGRESS))
{
/* maybe refused / unsupported address, try next */
GNUNET_log_strerror (GNUNET_ERROR_TYPE_INFO, "connect");
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (s));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
return NULL;
}
ret = GNUNET_CONNECTION_create_from_existing (sched, s, maxbuf);
}
}
if (sock->sock != NULL)
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock->sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
GNUNET_free_non_null (sock->addr);
if (sock->ai != NULL)
freeaddrinfo (sock->ai);
if (NULL != sock->sock)
{
GNUNET_NETWORK_socket_shutdown (sock->sock, SHUT_RDWR);
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock->sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
sock->sock = NULL;
}
transmit_error (sock);
GNUNET_log_strerror (GNUNET_ERROR_TYPE_DEBUG, "send");
#endif
GNUNET_NETWORK_socket_shutdown (sock->sock, SHUT_RDWR);
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock->sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock->sock));
sock->sock = NULL;
transmit_error (sock);
return;
#define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))\r
#endif\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
GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,\r
struct sockaddr *address,\r
return 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
GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,\r
const struct sockaddr *address,\r
if (SOCKET_ERROR == ret)\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#endif\r
- return ret;\r
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;\r
}\r
\r
/**\r
* Set if a socket should use blocking or non-blocking IO.\r
- *\r
+ * @param fd socket\r
+ * @param doBlock blocking mode\r
* @return GNUNET_OK on success, GNUNET_SYSERR on error\r
*/\r
int\r
#endif\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
{\r
}\r
#endif\r
\r
- return ret;\r
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;\r
}\r
\r
+/**\r
+ * Connect a socket\r
+ * @param desc socket\r
+ * @param address peer address\r
+ * @param length of address\r
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
+ */\r
int\r
GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,\r
const struct sockaddr *address,\r
if (SOCKET_ERROR == ret)\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#endif\r
- return ret;\r
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;\r
}\r
\r
+/**\r
+ * Get socket options\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
GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,\r
int level, int optname, void *optval,\r
else if (SOCKET_ERROR == ret)\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#endif\r
- return ret;\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
GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,\r
int backlog)\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#endif\r
\r
- return ret;\r
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;\r
}\r
\r
+/**\r
+ * Read data from a connected socket\r
+ * @param desc socket\r
+ * @param buffer buffer\r
+ * @param length length of buffer\r
+ * @param flags type of message reception\r
+ */\r
ssize_t\r
GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc,\r
void *buffer, size_t length, int flags)\r
return ret;\r
}\r
\r
+/**\r
+ * Send data\r
+ * @param desc socket\r
+ * @param buffer data to send\r
+ * @param length size of the buffer\r
+ * @param flags type of message transmission\r
+ * @return number of bytes sent, GNUNET_SYSERR on error\r
+ */\r
ssize_t\r
GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc,\r
const void *buffer, size_t length, int flags)\r
return ret;\r
}\r
\r
+/**\r
+ * Send data\r
+ * @param desc socket\r
+ * @param message data to send\r
+ * @param length size of the data\r
+ * @param flags type of message transmission\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
GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,\r
const void *message, size_t length, int flags,\r
return 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
GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,\r
int level, int option_name,\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#endif\r
\r
- return ret;\r
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;\r
}\r
\r
+/**\r
+ * Create a new socket\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_socket (int domain, int type, int protocol)\r
{\r
return 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,\r
int how)\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#endif\r
\r
- return ret;\r
+ return ret == 0 ? GNUNET_OK : GNUNET_SYSERR;\r
}\r
\r
+/**\r
+ * Make a non-inheritable to child processes\r
+ * @param socket\r
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise\r
+ * @warning Not implemented on Windows\r
+ */\r
int\r
GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle\r
*desc)\r
#endif\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
{\r
#endif\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
GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,\r
const struct GNUNET_NETWORK_Handle *desc)\r
fds->nsds = desc->fd + 1;\r
}\r
\r
+/**\r
+ * Check whether a socket is part of the fd set\r
+ * @param fds fd set\r
+ * @param desc socket\r
+ */\r
int\r
GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,\r
const struct GNUNET_NETWORK_Handle *desc)\r
return FD_ISSET (desc->fd, &fds->sds);\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
GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,\r
const struct GNUNET_NETWORK_FDSet *src)\r
}\r
}\r
\r
+/**\r
+ * Copy one fd set to another\r
+ * @param to destination\r
+ * @param from source\r
+ */\r
void\r
GNUNET_NETWORK_fdset_copy (struct GNUNET_NETWORK_FDSet *to,\r
const struct GNUNET_NETWORK_FDSet *from)\r
#endif\r
}\r
\r
+/**\r
+ * Copy a native fd set\r
+ * @param to destination\r
+ * @param from native source set\r
+ * @param the biggest socket number in from + 1\r
+ */\r
void\r
GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to,\r
const fd_set * from, int nfds)\r
to->nsds = nfds;\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
GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds,\r
const struct GNUNET_DISK_FileHandle *h)\r
#endif\r
}\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
GNUNET_NETWORK_fdset_handle_isset (const struct GNUNET_NETWORK_FDSet *fds,\r
const struct GNUNET_DISK_FileHandle *h)\r
#endif\r
}\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
GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1,\r
const struct GNUNET_NETWORK_FDSet *fds2)\r
return 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
{\r
return fds;\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
{\r
GNUNET_free (fds);\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
GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,\r
struct GNUNET_NETWORK_FDSet *wfds,\r
else\r
FD_ZERO(&sock_except);\r
\r
- /*\r
- if (rfds)\r
- FD_COPY (&rfds->sds, &sock_read);\r
- else\r
- FD_ZERO(&sock_read);\r
-\r
- if (wfds)\r
- FD_COPY (&wfds->sds, &sock_write);\r
- else\r
- FD_ZERO(&sock_write);\r
-\r
- if (efds)\r
- FD_COPY (&efds->sds, &sock_except);\r
- else\r
- FD_ZERO(&sock_except);\r
-*/\r
-\r
/* multiplex between winsock select() and waiting on the handles */\r
\r
FD_ZERO (&aread);\r
{
/* shutdown was initiated */
GNUNET_assert (server->listen_socket != NULL);
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (server->listen_socket));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (server->listen_socket));
server->listen_socket = NULL;
if (server->do_shutdown)
destroy_server (server);
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"setsockopt");
/* bind the socket */
- if (GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen) < 0)
+ if (GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen) != GNUNET_OK)
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "bind");
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_
("`%s' failed for port %d. Is the service already running?\n"),
"bind", port);
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
return NULL;
}
if (0 != GNUNET_NETWORK_socket_listen (sock, 5))
{
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "listen");
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (sock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (sock));
return NULL;
}
#if DEBUG_SERVER
ret->shutpipe = GNUNET_malloc (sizeof (struct GNUNET_DISK_FileDescriptor *[2]));
if (NULL == (ret->shutpipe = GNUNET_DISK_pipe (GNUNET_NO)))
{
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (lsock));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (lsock));
GNUNET_free (ret->shutpipe);
GNUNET_free (ret);
return NULL;
}
}
if (NULL != desc)
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (desc));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (desc));
}
"setsockopt");
GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
(const struct sockaddr*) &sa,
- sizeof (sa)) >= 0);
+ sizeof (sa)) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
"setsockopt");
GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
(const struct sockaddr*) &sa,
- sizeof (sa)) >= 0);
+ sizeof (sa)) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
"setsockopt");
GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
(const struct sockaddr*) &sa,
- sizeof (sa)) >= 0);
+ sizeof (sa)) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
"setsockopt");
GNUNET_assert (GNUNET_NETWORK_socket_bind (desc,
(const struct sockaddr*) &sa,
- sizeof (sa)) >= 0);
+ sizeof (sa)) == GNUNET_OK);
GNUNET_NETWORK_socket_listen (desc, 5);
return desc;
}
}
else
{
- GNUNET_break (0 == GNUNET_NETWORK_socket_close (s));
+ GNUNET_break (GNUNET_OK == GNUNET_NETWORK_socket_close (s));
ret += check6 ();
ret += check6d (); /* with daemonization */
}
projects / oweals / gnunet.git / commitdiff