*/\r
\r
/**\r
- * @file util/sock.c\r
+ * @file util/network.c\r
* @brief basic, low-level networking interface\r
* @author Nils Durner\r
*/\r
fd_set sds;\r
#ifdef WINDOWS\r
/* handles */\r
- struct GNUNET_CONTAINER_Vector *handles;\r
+ struct GNUNET_CONTAINER_SList *handles;\r
#endif\r
};\r
\r
#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
else\r
SetErrnoFromWinsockError (WSAGetLastError ());\r
#else\r
+ /* FIXME: Nils, this is very strange code here... */\r
ret = close (desc->fd);\r
- if (-1 == ret)\r
- {\r
- GNUNET_free (desc);\r
- }\r
+ if (0 == ret)\r
+ GNUNET_free (desc);\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 address_len 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
ret = connect (desc->fd, address, address_len);\r
#ifdef MINGW\r
if (SOCKET_ERROR == ret)\r
- SetErrnoFromWinsockError (WSAGetLastError ());\r
+ {\r
+ SetErrnoFromWinsockError (WSAGetLastError ());\r
+ if (errno == EWOULDBLOCK)\r
+ errno = EINPROGRESS;\r
+ }\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
+/**\r
+ * Reset FD set\r
+ * @param fds fd set\r
+ */\r
void\r
GNUNET_NETWORK_fdset_zero (struct GNUNET_NETWORK_FDSet *fds)\r
{\r
FD_ZERO (&fds->sds);\r
fds->nsds = 0;\r
#ifdef MINGW\r
- if (fds->handles)\r
- GNUNET_CONTAINER_vector_destroy (fds->handles);\r
- fds->handles = GNUNET_CONTAINER_vector_create (2);\r
+ GNUNET_CONTAINER_slist_clear (fds->handles);\r
#endif\r
}\r
\r
+\r
+/**\r
+ * Add a socket to the FD set\r
+ * @param fds fd set\r
+ * @param desc socket to add\r
+ */\r
void\r
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
+/**\r
+ * Check whether a socket is part of the fd set\r
+ * @param fds fd set\r
+ * @param desc socket\r
+ * @return 0 if the FD is not set\r
+ */\r
int\r
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
+/**\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
+/**\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
FD_COPY (&from->sds, &to->sds);\r
to->nsds = from->nsds;\r
#ifdef MINGW\r
- void *obj;\r
+ struct GNUNET_CONTAINER_SList_Iterator *iter;\r
+\r
\r
- if (to->handles)\r
- GNUNET_CONTAINER_vector_destroy (to->handles);\r
- to->handles = GNUNET_CONTAINER_vector_create (2);\r
- for (obj = GNUNET_CONTAINER_vector_get_first (from->handles); obj != NULL;\r
- obj = GNUNET_CONTAINER_vector_get_next (from->handles))\r
+ GNUNET_CONTAINER_slist_clear (to->handles);\r
+\r
+ for (iter = GNUNET_CONTAINER_slist_begin (from->handles);\r
+ GNUNET_CONTAINER_slist_end (iter) != GNUNET_YES; GNUNET_CONTAINER_slist_next (iter))\r
{\r
- GNUNET_CONTAINER_vector_insert_last (to->handles, obj);\r
+ void *handle;\r
+ size_t len;\r
+\r
+ handle = GNUNET_CONTAINER_slist_get (iter, &len);\r
+ GNUNET_CONTAINER_slist_add (to->handles, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, handle, len);\r
}\r
#endif\r
}\r
\r
+\r
+/**\r
+ * Copy a native fd set\r
+ * @param to destination\r
+ * @param from native source set\r
+ * @param nfds the biggest socket number in from + 1\r
+ */\r
void\r
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
+/**\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
HANDLE hw;\r
\r
GNUNET_internal_disk_file_handle (h, &hw, sizeof (HANDLE));\r
- GNUNET_CONTAINER_vector_insert_last (fds->handles, h);\r
+ GNUNET_CONTAINER_slist_add (fds->handles, GNUNET_NO, &hw, sizeof (HANDLE));\r
#else\r
int fd;\r
\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
{\r
#ifdef MINGW\r
- return GNUNET_CONTAINER_vector_index_of (fds->handles, h->h) !=\r
- (unsigned int) -1;\r
+ return GNUNET_CONTAINER_slist_contains (fds->handles, h->h, sizeof (HANDLE));\r
#else\r
return FD_ISSET (h->fd, &fds->sds);\r
#endif\r
}\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
\r
fds = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_FDSet));\r
#ifdef MINGW\r
- fds->handles = NULL;\r
+ fds->handles = GNUNET_CONTAINER_slist_create ();\r
#endif\r
GNUNET_NETWORK_fdset_zero (fds);\r
-\r
return fds;\r
}\r
\r
+\r
+/**\r
+ * Releases the associated memory of an fd set\r
+ * @param fds fd set\r
+ */\r
void\r
GNUNET_NETWORK_fdset_destroy (struct GNUNET_NETWORK_FDSet *fds)\r
{\r
#ifdef MINGW\r
- GNUNET_CONTAINER_vector_destroy (fds->handles);\r
+ GNUNET_CONTAINER_slist_destroy (fds->handles);\r
#endif\r
GNUNET_free (fds);\r
}\r
\r
+\r
+/**\r
+ * Check if sockets meet certain conditions\r
+ * @param rfds set of sockets to be checked for readability\r
+ * @param wfds set of sockets to be checked for writability\r
+ * @param efds set of sockets to be checked for exceptions\r
+ * @param timeout relative value when to return\r
+ * @return number of selected sockets, GNUNET_SYSERR on error\r
+ */\r
int\r
GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,\r
struct GNUNET_NETWORK_FDSet *wfds,\r
int nfds;\r
\r
nfds = 0;\r
-\r
- if (rfds)\r
+ if (NULL != rfds)\r
nfds = rfds->nsds;\r
- if (wfds && wfds->nsds > nfds)\r
- nfds = wfds->nsds;\r
- if (efds && efds->nsds > nfds)\r
- nfds = efds->nsds;\r
+ if (NULL != wfds)\r
+ nfds = GNUNET_MAX (nfds, wfds->nsds);\r
+ if (NULL != efds)\r
+ nfds = GNUNET_MAX (nfds, efds->nsds);\r
\r
#ifndef MINGW\r
struct timeval tv;\r
\r
tv.tv_sec = timeout.value / GNUNET_TIME_UNIT_SECONDS.value;\r
- tv.tv_usec = (timeout.value - (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.value))\r
- / GNUNET_TIME_UNIT_MILLISECONDS.value;\r
-\r
- return select (nfds + 1, rfds ? &rfds->sds : NULL, wfds ? &wfds->sds : NULL,\r
- efds ? &efds->sds : NULL, timeout.value\r
- == GNUNET_TIME_UNIT_FOREVER_REL.value ? NULL : &tv);\r
+ tv.tv_usec = 1000 * (timeout.value - (tv.tv_sec * GNUNET_TIME_UNIT_SECONDS.value));\r
+ if ( (nfds == 0) &&\r
+ (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value) )\r
+ {\r
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,\r
+ _("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),\r
+ "select");\r
+ GNUNET_break (0);\r
+ }\r
+ return select (nfds + 1, \r
+ (rfds != NULL) ? &rfds->sds : NULL, \r
+ (wfds != NULL) ? &wfds->sds : NULL,\r
+ (efds != NULL) ? &efds->sds : NULL, \r
+ (timeout.value == GNUNET_TIME_UNIT_FOREVER_REL.value) \r
+ ? NULL \r
+ : &tv);\r
#else\r
DWORD limit;\r
fd_set sock_read, sock_write, sock_except;\r
if (!(rfds || wfds || efds))\r
{\r
Sleep (ms_total);\r
-\r
return 0;\r
}\r
\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
\r
/* Poll read pipes */\r
if (rfds)\r
- for (i = GNUNET_CONTAINER_vector_size (rfds->handles) - 1; i >= 0; i--)\r
- {\r
- DWORD dwBytes;\r
-\r
- if (!PeekNamedPipe\r
- (GNUNET_CONTAINER_vector_get_at (rfds->handles, i), NULL, 0,\r
- NULL, &dwBytes, NULL))\r
- {\r
- GNUNET_CONTAINER_vector_remove_at (rfds->handles, i);\r
-\r
- retcode = -1;\r
- SetErrnoFromWinError (GetLastError ());\r
+ {\r
+ struct GNUNET_CONTAINER_SList_Iterator *i;\r
+ int on_next;\r
+\r
+ on_next = GNUNET_NO;\r
+ for (i = GNUNET_CONTAINER_slist_begin (rfds->handles);\r
+ GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;\r
+ on_next || GNUNET_CONTAINER_slist_next (i))\r
+ {\r
+ HANDLE h;\r
+ DWORD dwBytes;\r
+\r
+ h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);\r
+ on_next = GNUNET_NO;\r
+\r
+ if (!PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))\r
+ {\r
+ GNUNET_CONTAINER_slist_erase (i);\r
+ on_next = GNUNET_YES;\r
+\r
+ retcode = -1;\r
+ SetErrnoFromWinError (GetLastError ());\r
#if DEBUG_SOCK\r
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "PeekNamedPipe");\r
+ GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "PeekNamedPipe");\r
#endif\r
- goto select_loop_end;\r
- }\r
- else if (dwBytes)\r
- {\r
- retcode++;\r
- }\r
- else\r
- GNUNET_CONTAINER_vector_remove_at (rfds->handles, i);\r
- }\r
+ goto select_loop_end;\r
+ }\r
+ else if (dwBytes)\r
+ {\r
+ retcode++;\r
+ }\r
+ else\r
+ {\r
+ GNUNET_CONTAINER_slist_erase (i);\r
+ on_next = GNUNET_YES;\r
+ }\r
+ }\r
+ }\r
\r
/* Poll for faulty pipes */\r
if (efds)\r
- for (i = GNUNET_CONTAINER_vector_size (efds->handles); i >= 0; i--)\r
- {\r
- DWORD dwBytes;\r
+ {\r
+ struct GNUNET_CONTAINER_SList_Iterator *i;\r
+ int on_next;\r
\r
- if (PeekNamedPipe\r
- (GNUNET_CONTAINER_vector_get_at (rfds->handles, i), NULL, 0,\r
- NULL, &dwBytes, NULL))\r
- {\r
- GNUNET_CONTAINER_vector_remove_at (efds->handles, i);\r
+ on_next = GNUNET_NO;\r
+ for (i = GNUNET_CONTAINER_slist_begin (efds->handles);\r
+ GNUNET_CONTAINER_slist_end (i) != GNUNET_YES;\r
+ on_next || GNUNET_CONTAINER_slist_next (i))\r
+ {\r
+ HANDLE h;\r
+ DWORD dwBytes;\r
\r
- retcode++;\r
- }\r
- }\r
+ h = *(HANDLE *) GNUNET_CONTAINER_slist_get (i, NULL);\r
+\r
+ if (PeekNamedPipe (h, NULL, 0, NULL, &dwBytes, NULL))\r
+ {\r
+ GNUNET_CONTAINER_slist_erase (i);\r
+ on_next = GNUNET_YES;\r
+\r
+ retcode++;\r
+ }\r
+ else\r
+ on_next = GNUNET_NO;\r
+ }\r
+ }\r
\r
/* FIXME */\r
if (wfds)\r
- GNUNET_assert (GNUNET_CONTAINER_vector_size (wfds->handles) == 0);\r
+ GNUNET_assert (GNUNET_CONTAINER_slist_count (wfds->handles) == 0);\r
\r
/* Check for closed sockets */\r
for (i = 0; i < nfds; i++)\r
#endif\r
}\r
\r
-/* end of network_socket.c */\r
+\r
+/* end of network.c */\r
projects / oweals / gnunet.git / blobdiff