/*
This file is part of GNUnet.
- (C) 2009-2013 Christian Grothoff (and other contributing authors)
+ Copyright (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
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
#ifdef WINDOWS
/**
- * Linked list of handles
+ * Array of file handles (from pipes) that are also in
+ * the FDSet. Needed as those cannot go into @e sds
+ * on W32.
*/
- struct GNUNET_CONTAINER_SList *handles;
+ const struct GNUNET_DISK_FileHandle **handles;
+
+ /**
+ * Size of the @e handles array
+ */
+ unsigned int handles_size;
+
+ /**
+ * Number of @e handles slots in use. Always
+ * smaller than @e handles_size.
+ */
+ unsigned int handles_pos;
+
#endif
};
GNUNET_NETWORK_shorten_unixpath (char *unixpath);
+#ifndef WINDOWS
+/**
+ * If services crash, they can leave a unix domain socket file on the
+ * disk. This needs to be manually removed, because otherwise both
+ * bind() and connect() for the respective address will fail. In this
+ * function, we test if such a left-over file exists, and if so,
+ * remove it (unless there is a listening service at the address).
+ *
+ * @param un unix domain socket address to check
+ */
+void
+GNUNET_NETWORK_unix_precheck (const struct sockaddr_un *un);
+#endif
+
+
/**
* Accept a new connection on a socket. Configure it for non-blocking
* IO and mark it as non-inheritable to child processes (set the
int doBlock);
-/**
- * Fail to bind if an address is already in use.
- */
-#define GNUNET_BIND_EXCLUSIVE 0x01
-
-
/**
* Bind a socket to a particular address.
*
* @param desc socket to bind
* @param address address to be bound
- * @param address_len length of address
- * @param flags flags affecting bind behaviour
+ * @param address_len length of @a 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,
- int flags);
+ socklen_t address_len);
/**
* Close a socket.
*
* @param desc socket to connect
* @param address peer address
- * @param address_len of address
+ * @param address_len of @a address
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
*/
int
GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
- int level, int optname, void *optval,
- socklen_t * optlen);
+ int level,
+ int optname,
+ void *optval,
+ socklen_t *optlen);
/**
* @returns #GNUNET_NO if no data is available, or on error!
*/
ssize_t
-GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle
- *desc);
+GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc);
/**
*/
ssize_t
GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc,
- void *buffer, size_t length,
- struct sockaddr *src_addr, socklen_t *addrlen);
+ void *buffer,
+ size_t length,
+ struct sockaddr *src_addr,
+ socklen_t *addrlen);
/**
*/
ssize_t
GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc,
- void *buffer, size_t length);
+ void *buffer,
+ size_t length);
/**
- * Check if sockets meet certain conditions
+ * 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
*/
ssize_t
GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
- const void *buffer, size_t length);
+ const void *buffer,
+ size_t length);
/**
*
* @param desc socket
* @param message data to send
- * @param length size of the data
+ * @param length size of the data in @a message
* @param dest_addr destination address
- * @param dest_len length of address
+ * @param dest_len length of @a dest_addr
* @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,
+ const void *message,
+ size_t length,
const struct sockaddr *dest_addr,
socklen_t dest_len);
* @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
+ * @param option_len size of @a 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,
+GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
+ int level,
+ int option_name,
+ const void *option_value,
socklen_t option_len);
* @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
-GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how);
+GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
+ int how);
/**
* @return new socket, NULL on error
*/
struct GNUNET_NETWORK_Handle *
-GNUNET_NETWORK_socket_create (int domain, int type, int protocol);
+GNUNET_NETWORK_socket_create (int domain,
+ int type,
+ int protocol);
/**
* @param h the file handle to add
*/
void
-GNUNET_NETWORK_fdset_handle_set_native_w32_handle (struct GNUNET_NETWORK_FDSet
- *fds, HANDLE h);
+GNUNET_NETWORK_fdset_handle_set_native_w32_handle (struct GNUNET_NETWORK_FDSet *fds,
+ HANDLE h);
#endif
*/
void
GNUNET_NETWORK_fdset_copy_native (struct GNUNET_NETWORK_FDSet *to,
- const fd_set *from, int nfds);
+ const fd_set *from,
+ int nfds);
/**
* @param nfd native FD to set
*/
void
-GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to, int nfd);
+GNUNET_NETWORK_fdset_set_native (struct GNUNET_NETWORK_FDSet *to,
+ int nfd);
/**
*
* @param to set to test, NULL for empty set
* @param nfd native FD to test, -1 for none
- * @return GNUNET_YES if to contains nfd
+ * @return #GNUNET_YES if to contains nfd
*/
int
GNUNET_NETWORK_fdset_test_native (const struct GNUNET_NETWORK_FDSet *to,
const struct GNUNET_DISK_FileHandle *h);
+/**
+ * Add a file handle to the fd set
+ * On W32: ensure that the handle is first in the array.
+ *
+ * @param fds fd set
+ * @param h the file handle to add
+ */
+void
+GNUNET_NETWORK_fdset_handle_set_first (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
projects / oweals / gnunet.git / blobdiff