[GNUnet-SVN] [libmicrohttpd] 03/09: internal_add_connection(): minor refactoring for additional error check and minor optimization

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit 47e648bd2667c2d2ef742154d2399b3a520a4cdf
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Jun 4 13:21:39 2017 +0300

    internal_add_connection(): minor refactoring for additional error check and 
minor optimization
---
 src/microhttpd/daemon.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index 3c275191..d893e0bd 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2357,22 +2357,24 @@ internal_add_connection (struct MHD_Daemon *daemon,
   struct MHD_Connection *connection;
   unsigned int i;
   int eno;
-  struct MHD_Daemon *worker;
 
-  if (NULL != daemon->worker_pool)
+  /* Direct add to master daemon could happen only with "external" add mode. */
+  EXTRA_CHECK ((NULL == daemon->worker_pool) || (external_add));
+  if ((external_add) && (NULL != daemon->worker_pool))
     {
       /* have a pool, try to find a pool with capacity; we use the
         socket as the initial offset into the pool for load
         balancing */
       for (i = 0; i < daemon->worker_pool_size; ++i)
         {
-          worker = &daemon->worker_pool[(i + client_socket) % 
daemon->worker_pool_size];
+          struct MHD_Daemon * const worker =
+                &daemon->worker_pool[(i + client_socket) % 
daemon->worker_pool_size];
           if (worker->connections < worker->connection_limit)
             return internal_add_connection (worker,
                                             client_socket,
                                             addr,
                                             addrlen,
-                                            external_add,
+                                            true,
                                             non_blck);
         }
       /* all pools are at their connection limit, must refuse */

-- 
To stop receiving notification emails like this one, please contact
address@hidden