* @return #GNUNET_OK on success, #GNUNET_SYSERR on error
*/
int
-GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int doBlock)
+GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
+ int doBlock)
{
#if MINGW
socklen_t address_len)
{
int ret;
- socklen_t bind_address_len = address_len;
-
-#ifdef LINUX
- if (AF_UNIX == address->sa_family)
- {
- const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
- if (address_un->sun_path[0] == '\0')
- {
- bind_address_len = \
- sizeof (struct sockaddr_un) \
- - sizeof (address_un->sun_path) \
- + strnlen (address_un->sun_path + 1, sizeof (address_un->sun_path) - 1) \
- + 1;
- GNUNET_break (0);
- }
- }
-#endif
#ifdef IPV6_V6ONLY
#ifdef IPPROTO_IPV6
#endif
#ifndef WINDOWS
{
- /* set permissions of newly created UNIX domain socket to "user-only"; applications
- can choose to relax this later */
- mode_t old_mask;
-
- if (AF_UNIX == address->sa_family)
+ /* set permissions of newly created non-abstract UNIX domain socket to
+ "user-only"; applications can choose to relax this later */
+ mode_t old_mask = 0; /* assigned to make compiler happy */
+ const struct sockaddr_un *un;
+ int not_abstract = 0;
+
+ if ((AF_UNIX == address->sa_family)
+ && (NULL != (un = (const struct sockaddr_un *) address)->sun_path)
+ && ('\0' != un->sun_path[0]) ) /* Not an abstract socket */
+ not_abstract = 1;
+ if (not_abstract)
old_mask = umask (S_IWGRP | S_IRGRP | S_IXGRP | S_IWOTH | S_IROTH | S_IXOTH);
#endif
- ret = bind (desc->fd, address, bind_address_len);
+ ret = bind (desc->fd, address, address_len);
#ifndef WINDOWS
- if (AF_UNIX == address->sa_family)
+ if (not_abstract)
(void) umask (old_mask);
}
#endif
{
int ret;
-#ifdef MINGW
+#ifdef WINDOWS
DWORD error = 0;
SetLastError (0);
#else
ret = close (desc->fd);
#endif
-#ifndef MINGW
- if ((desc->af == AF_UNIX) && (NULL != desc->addr))
+#ifndef WINDOWS
+ const struct sockaddr_un *un;
+
+ /* Cleanup the UNIX domain socket and its parent directories in case of non
+ abstract sockets */
+ if ((AF_UNIX == desc->af) && (NULL != desc->addr)
+ && (NULL != (un = (const struct sockaddr_un *) desc->addr)->sun_path)
+ && ('\0' != un->sun_path[0]))
{
- const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr;
+ char *dirname = GNUNET_strndup (un->sun_path,
+ sizeof (un->sun_path));
- if (0 != unlink (un->sun_path))
+ if (0 != unlink (dirname))
+ {
LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING,
"unlink",
- un->sun_path);
+ dirname);
+ }
+ else
+ {
+ size_t len;
+
+ len = strlen (dirname);
+ while ((len > 0) && (dirname[len] != DIR_SEPARATOR))
+ len--;
+ dirname[len] = '\0';
+ if (0 != rmdir (dirname))
+ {
+ switch (errno)
+ {
+ case EACCES:
+ case ENOTEMPTY:
+ case EPERM:
+ /* these are normal and can just be ignored */
+ break;
+ default:
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING,
+ "rmdir",
+ dirname);
+ break;
+ }
+ }
+ }
+ GNUNET_free (dirname);
}
#endif
GNUNET_NETWORK_socket_free_memory_only_ (desc);
{
int ret;
-#ifdef LINUX
- if (address->sa_family == AF_UNIX)
- {
- const struct sockaddr_un *address_un = (const struct sockaddr_un *)address;
- if (address_un->sun_path[0] == '\0')
- {
- address_len = \
- sizeof (struct sockaddr_un) \
- - sizeof (address_un->sun_path) \
- + strnlen (address_un->sun_path + 1, sizeof (address_un->sun_path) - 1) \
- + 1;
- GNUNET_break (0);
- }
- }
-#endif
ret = connect (desc->fd, address, address_len);
#ifdef MINGW
#endif
#ifdef MSG_NOSIGNAL
flags |= MSG_NOSIGNAL;
-#endif
-#ifdef LINUX
- if (dest_addr->sa_family == AF_UNIX)
- {
- const struct sockaddr_un *dest_addr_un = (const struct sockaddr_un *)dest_addr;
- if (dest_addr_un->sun_path[0] == '\0')
- dest_len = \
- sizeof (struct sockaddr_un) \
- - sizeof (dest_addr_un->sun_path) \
- + strnlen (dest_addr_un->sun_path + 1, sizeof (dest_addr_un->sun_path) - 1) \
- + 1;
- }
#endif
ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len);
#ifdef MINGW
* Shut down socket operations
* @param desc socket
* @param how type of shutdown
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
*/
int
GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int how)
#ifndef MINGW
int nfds;
- for (nfds = src->nsds; nfds > 0; nfds--)
+ for (nfds = src->nsds; nfds >= 0; nfds--)
if (FD_ISSET (nfds, &src->sds))
{
#endif
+#ifndef MINGW
/**
* 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 or pipes, #GNUNET_SYSERR on error
+ */
+int
+GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
+ struct GNUNET_NETWORK_FDSet *wfds,
+ struct GNUNET_NETWORK_FDSet *efds,
+ const struct GNUNET_TIME_Relative timeout)
+{
+ int nfds;
+ struct timeval tv;
+
+ if (NULL != rfds)
+ nfds = rfds->nsds;
+ else
+ nfds = 0;
+ if (NULL != wfds)
+ nfds = GNUNET_MAX (nfds, wfds->nsds);
+ if (NULL != efds)
+ nfds = GNUNET_MAX (nfds, efds->nsds);
+ if ((nfds == 0) &&
+ (timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us))
+ {
+ GNUNET_break (0);
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
+ "select");
+ }
+ tv.tv_sec = timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
+ tv.tv_usec =
+ (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
+/* MINGW */
+
+
+/**
+ * Check if sockets or pipes meet certain conditions, version for W32.
+ *
* @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
const struct GNUNET_TIME_Relative timeout)
{
int nfds = 0;
-#ifdef MINGW
int handles = 0;
int ex_handles = 0;
int read_handles = 0;
/* TODO: Make this growable */
struct GNUNET_DISK_FileHandle *readArray[50];
-#else
struct timeval tv;
-#endif
+
if (NULL != rfds)
{
nfds = rfds->nsds;
-#ifdef MINGW
handles += read_handles = GNUNET_CONTAINER_slist_count (rfds->handles);
#if DEBUG_NETWORK
{
fh);
}
}
-#endif
#endif
}
if (NULL != wfds)
{
nfds = GNUNET_MAX (nfds, wfds->nsds);
-#ifdef MINGW
handles += write_handles = GNUNET_CONTAINER_slist_count (wfds->handles);
-#endif
}
if (NULL != efds)
{
nfds = GNUNET_MAX (nfds, efds->nsds);
-#ifdef MINGW
handles += ex_handles = GNUNET_CONTAINER_slist_count (efds->handles);
-#endif
}
if ((nfds == 0) &&
(timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
-#ifdef MINGW
- && handles == 0
-#endif
- )
+ && (handles == 0) )
{
GNUNET_break (0);
LOG (GNUNET_ERROR_TYPE_ERROR,
- _
- ("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
+ _("Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"),
"select");
}
-#ifndef MINGW
- tv.tv_sec = timeout.rel_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
- tv.tv_usec =
- (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 microseconds */
if (timeout.rel_value_us == GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us)
if (nhandles && (returnedpos < nhandles))
return retcode;
else
-#endif
return 0;
}
+/* MINGW */
+#endif
+
/* end of network.c */
projects / oweals / gnunet.git / blobdiff