diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-28 15:56:19 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-28 15:56:19 +0000 |
commit | 2c2a6b688d158dcc8638bb431b6669894b8b780e (patch) | |
tree | c7dc6994dd05056c507adf407c68eb37efad2111 /src/util | |
parent | 0d94b5ea4c38d3a95975fe34cf8542d04e1bb68c (diff) | |
download | gnunet-2c2a6b688d158dcc8638bb431b6669894b8b780e.tar.gz gnunet-2c2a6b688d158dcc8638bb431b6669894b8b780e.zip |
ignore EAGAIN from accept()
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/connection.c | 3 | ||||
-rw-r--r-- | src/util/server.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/util/connection.c b/src/util/connection.c index 8560f52af..cd3ebad61 100644 --- a/src/util/connection.c +++ b/src/util/connection.c | |||
@@ -342,7 +342,8 @@ GNUNET_CONNECTION_create_from_accept (GNUNET_CONNECTION_AccessCheck access_cb, | |||
342 | GNUNET_NETWORK_socket_accept (lsock, (struct sockaddr *) &addr, &addrlen); | 342 | GNUNET_NETWORK_socket_accept (lsock, (struct sockaddr *) &addr, &addrlen); |
343 | if (NULL == sock) | 343 | if (NULL == sock) |
344 | { | 344 | { |
345 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "accept"); | 345 | if (EAGAIN != errno) |
346 | LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "accept"); | ||
346 | return NULL; | 347 | return NULL; |
347 | } | 348 | } |
348 | if ((addrlen > sizeof (addr)) || (addrlen < sizeof (sa_family_t))) | 349 | if ((addrlen > sizeof (addr)) || (addrlen < sizeof (sa_family_t))) |
diff --git a/src/util/server.c b/src/util/server.c index 32ef22efd..920d4ab33 100644 --- a/src/util/server.c +++ b/src/util/server.c | |||
@@ -406,10 +406,10 @@ process_listen_socket (void *cls, | |||
406 | GNUNET_SERVER_resume (server); | 406 | GNUNET_SERVER_resume (server); |
407 | return; | 407 | return; |
408 | } | 408 | } |
409 | i = 0; | 409 | for (i = 0; NULL != server->listen_sockets[i]; i++) |
410 | while (NULL != server->listen_sockets[i]) | ||
411 | { | 410 | { |
412 | if (GNUNET_NETWORK_fdset_isset (tc->read_ready, server->listen_sockets[i])) | 411 | if (GNUNET_NETWORK_fdset_isset (tc->read_ready, |
412 | server->listen_sockets[i])) | ||
413 | { | 413 | { |
414 | sock = | 414 | sock = |
415 | GNUNET_CONNECTION_create_from_accept (server->access_cb, | 415 | GNUNET_CONNECTION_create_from_accept (server->access_cb, |
@@ -423,7 +423,6 @@ process_listen_socket (void *cls, | |||
423 | sock); | 423 | sock); |
424 | } | 424 | } |
425 | } | 425 | } |
426 | i++; | ||
427 | } | 426 | } |
428 | /* listen for more! */ | 427 | /* listen for more! */ |
429 | GNUNET_SERVER_resume (server); | 428 | GNUNET_SERVER_resume (server); |