[GNUnet-SVN] r35309 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2015-02-28 16:56:19 +0100 (Sat, 28 Feb 2015)
New Revision: 35309

Modified:
   gnunet/src/util/connection.c
   gnunet/src/util/server.c
Log:
ignore EAGAIN from accept()

Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c        2015-02-28 14:35:13 UTC (rev 35308)
+++ gnunet/src/util/connection.c        2015-02-28 15:56:19 UTC (rev 35309)
@@ -342,7 +342,8 @@
       GNUNET_NETWORK_socket_accept (lsock, (struct sockaddr *) &addr, 
&addrlen);
   if (NULL == sock)
   {
-    LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "accept");
+    if (EAGAIN != errno)
+      LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "accept");
     return NULL;
   }
   if ((addrlen > sizeof (addr)) || (addrlen < sizeof (sa_family_t)))

Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c    2015-02-28 14:35:13 UTC (rev 35308)
+++ gnunet/src/util/server.c    2015-02-28 15:56:19 UTC (rev 35309)
@@ -406,10 +406,10 @@
     GNUNET_SERVER_resume (server);
     return;
   }
-  i = 0;
-  while (NULL != server->listen_sockets[i])
+  for (i = 0; NULL != server->listen_sockets[i]; i++)
   {
-    if (GNUNET_NETWORK_fdset_isset (tc->read_ready, server->listen_sockets[i]))
+    if (GNUNET_NETWORK_fdset_isset (tc->read_ready,
+                                    server->listen_sockets[i]))
     {
       sock =
           GNUNET_CONNECTION_create_from_accept (server->access_cb,
@@ -423,7 +423,6 @@
                                              sock);
       }
     }
-    i++;
   }
   /* listen for more! */
   GNUNET_SERVER_resume (server);