diff options
Diffstat (limited to 'src/util/network.c')
-rw-r--r-- | src/util/network.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/util/network.c b/src/util/network.c index b533ce183..e071b8b54 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -212,8 +212,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc, | |||
212 | int gsn = getsockname (desc->fd, &name, &namelen); | 212 | int gsn = getsockname (desc->fd, &name, &namelen); |
213 | 213 | ||
214 | if (gsn == 0) | 214 | if (gsn == 0) |
215 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 215 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Accepting connection on `%s'\n", |
216 | "Accepting connection on `%s'\n", | ||
217 | GNUNET_a2s (&name, namelen)); | 216 | GNUNET_a2s (&name, namelen)); |
218 | } | 217 | } |
219 | #endif | 218 | #endif |
@@ -357,8 +356,8 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc) | |||
357 | const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr; | 356 | const struct sockaddr_un *un = (const struct sockaddr_un *) desc->addr; |
358 | 357 | ||
359 | if (0 != unlink (un->sun_path)) | 358 | if (0 != unlink (un->sun_path)) |
360 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, | 359 | GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", |
361 | "unlink", un->sun_path); | 360 | un->sun_path); |
362 | } | 361 | } |
363 | #endif | 362 | #endif |
364 | #endif | 363 | #endif |
@@ -480,8 +479,8 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, | |||
480 | * @param desc socket | 479 | * @param desc socket |
481 | */ | 480 | */ |
482 | ssize_t | 481 | ssize_t |
483 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle | 482 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle * |
484 | * desc) | 483 | desc) |
485 | { | 484 | { |
486 | int error; | 485 | int error; |
487 | 486 | ||
@@ -645,9 +644,8 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc, | |||
645 | * @return GNUNET_OK on success, GNUNET_SYSERR otherwise | 644 | * @return GNUNET_OK on success, GNUNET_SYSERR otherwise |
646 | */ | 645 | */ |
647 | int | 646 | int |
648 | GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd, | 647 | GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd, int level, |
649 | int level, int option_name, | 648 | int option_name, const void *option_value, |
650 | const void *option_value, | ||
651 | socklen_t option_len) | 649 | socklen_t option_len) |
652 | { | 650 | { |
653 | int ret; | 651 | int ret; |
@@ -945,8 +943,8 @@ GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds, | |||
945 | { | 943 | { |
946 | #ifdef MINGW | 944 | #ifdef MINGW |
947 | GNUNET_CONTAINER_slist_add (fds->handles, | 945 | GNUNET_CONTAINER_slist_add (fds->handles, |
948 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | 946 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, h, |
949 | h, sizeof (struct GNUNET_DISK_FileHandle)); | 947 | sizeof (struct GNUNET_DISK_FileHandle)); |
950 | 948 | ||
951 | #else | 949 | #else |
952 | int fd; | 950 | int fd; |
@@ -1569,10 +1567,9 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
1569 | "send to the socket %d returned %d (%u)\n", i, status, | 1567 | "send to the socket %d returned %d (%u)\n", i, status, |
1570 | error); | 1568 | error); |
1571 | #endif | 1569 | #endif |
1572 | if (status == 0 | 1570 | if (status == 0 || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) || |
1573 | || (error != WSAEWOULDBLOCK && error != WSAENOTCONN) | 1571 | (status == -1 && gso_result == 0 && error == WSAENOTCONN && |
1574 | || (status == -1 && gso_result == 0 && error == WSAENOTCONN && | 1572 | so_error == WSAECONNREFUSED)) |
1575 | so_error == WSAECONNREFUSED)) | ||
1576 | { | 1573 | { |
1577 | FD_SET (wfds->sds.fd_array[i], &awrite); | 1574 | FD_SET (wfds->sds.fd_array[i], &awrite); |
1578 | retcode += 1; | 1575 | retcode += 1; |