1 files changed, 131 insertions, 106 deletions

diff --git a/src/lib/daemon_start.c b/src/lib/daemon_start.c
index 98126c68..ab4a6dd9 100644
--- a/src/lib/daemon_start.c
+++ b/src/lib/daemon_start.c
@@ -48,40 +48,17 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
 
   /* Apply the socket options according to
      listening_address_reuse. */
-  /* FIXME: used to be -1/0/1, now defined as a bool! 
-     MISMATCH! */
-  if (0 == daemon->listening_address_reuse)
-    {
-#ifndef MHD_WINSOCK_SOCKETS
-      /* No user requirement, use "traditional" default SO_REUSEADDR
-       * on non-W32 platforms, and do not fail if it doesn't work.
-       * Don't use it on W32, because on W32 it will allow multiple
-       * bind to the same address:port, like SO_REUSEPORT on others. */
-      if (0 > setsockopt (listen_fd,
-                          SOL_SOCKET,
-                          SO_REUSEADDR,
-                          (void*) &on, sizeof (on)))
-        {
-#ifdef HAVE_MESSAGES
-          MHD_DLOG (daemon,
-                    MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_FAILED,
-                    _("setsockopt failed: %s\n"),
-                    MHD_socket_last_strerr_ ());
-#endif
-        }
-#endif /* ! MHD_WINSOCK_SOCKETS */
-      return MHD_SC_OK;
-    }
-  if (daemon->listening_address_reuse > 0)
+  if (daemon->allow_address_reuse)
     {
       /* User requested to allow reusing listening address:port. */
 #ifndef MHD_WINSOCK_SOCKETS
       /* Use SO_REUSEADDR on non-W32 platforms, and do not fail if
        * it doesn't work. */
-      if (0 > setsockopt (listen_fd,
+      if (0 > setsockopt (daemon->listen_socket,
                           SOL_SOCKET,
                           SO_REUSEADDR,
-                          (void*)&on, sizeof (on)))
+                          (void *) &on,
+                          sizeof (on)))
         {
 #ifdef HAVE_MESSAGES
           MHD_DLOG (daemon,
@@ -91,6 +68,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
 #endif
           return MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_FAILED;
         }
+      return MHD_SC_OK;
 #endif /* ! MHD_WINSOCK_SOCKETS */
       /* Use SO_REUSEADDR on Windows and SO_REUSEPORT on most platforms.
        * Fail if SO_REUSEPORT is not defined or setsockopt fails.
@@ -98,7 +76,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
       /* SO_REUSEADDR on W32 has the same semantics
          as SO_REUSEPORT on BSD/Linux */
 #if defined(MHD_WINSOCK_SOCKETS) || defined(SO_REUSEPORT)
-      if (0 > setsockopt (listen_fd,
+      if (0 > setsockopt (daemon->listen_socket,
                           SOL_SOCKET,
 #ifndef MHD_WINSOCK_SOCKETS
                           SO_REUSEPORT,
@@ -116,6 +94,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
 #endif
           return MHD_SC_LISTEN_ADDRESS_REUSE_ENABLE_FAILED;
         }
+      return MHD_SC_OK;
 #else  /* !MHD_WINSOCK_SOCKETS && !SO_REUSEPORT */
       /* we're supposed to allow address:port re-use, but
          on this platform we cannot; fail hard */
@@ -128,7 +107,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
 #endif /* !MHD_WINSOCK_SOCKETS && !SO_REUSEPORT */
     }
 
-  /* if (daemon->listening_address_reuse < 0) */
+  /* if (! daemon->allow_address_reuse) */
   /* User requested to disallow reusing listening address:port.
    * Do nothing except for Windows where SO_EXCLUSIVEADDRUSE
    * is used and Solaris with SO_EXCLBIND.
@@ -155,6 +134,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
 #endif
       return MHD_SC_LISTEN_ADDRESS_REUSE_DISABLE_FAILED;
     }
+  return MHD_SC_OK;
 #elif defined(MHD_WINSOCK_SOCKETS) /* SO_EXCLUSIVEADDRUSE not defined on W32? */
 #ifdef HAVE_MESSAGES
   MHD_DLOG (daemon,
@@ -163,6 +143,7 @@ configure_listen_reuse (struct MHD_Daemon *daemon)
 #endif
   return MHD_SC_LISTEN_ADDRESS_REUSE_DISABLE_NOT_SUPPORTED;
 #endif /* MHD_WINSOCK_SOCKETS */
+  /* Not on WINSOCK, simply doing nothing will do */
   return MHD_SC_OK;
 }
 
@@ -183,81 +164,75 @@ open_listen_socket (struct MHD_Daemon *daemon)
   int pf;
   bool use_v6;
       
-  if (MHD_INVALID_SOCKET != daemon->listen_fd)
+  if (MHD_INVALID_SOCKET != daemon->listen_socket)
     return MHD_SC_OK; /* application opened it for us! */
 
   /* Determine address family */
-  if (MHD_AF_NONE != daemon->address_family)
+  switch (daemon->listen_af)
     {
-      switch (daemon->address_family)
+    case MHD_AF_NONE:
+      if (0 == daemon->listen_sa_len)
         {
-        case MHD_AF_NONE:
-          abort ();
-        case MHD_AF_AUTO:
-#if HAVE_INET6
-          pf = PF_INET6;
-          use_v6 = true;
-#else
+          /* no listening desired, that's OK */
+          return MHD_SC_OK;
+        }
+      /* we have a listen address, get AF from there! */
+      switch (daemon->listen_sa.ss_family)
+        {
+        case AF_INET:
           pf = PF_INET;
           use_v6 = false;
-#endif
-          break;
-        case MHD_AF_INET:
-          use_v6 = false;
-          pf = PF_INET;
           break;
-        case MHD_AF_INET6:
-        case MHD_AF_DUAL:
-#if HAVE_INET6
+#ifdef AF_INET6
+        case AF_INET6:
           pf = PF_INET6;
           use_v6 = true;
           break;
-#else
-#ifdef HAVE_MESSAGES
-          MHD_DLOG (daemon,
-                    MHD_SC_IPV6_NOT_SUPPORTED_BY_BUILD,
-                    _("IPv6 not supported by this build\n"));
 #endif
-          return MHD_SC_IPV6_NOT_SUPPORTED_BY_BUILD;
+#ifdef AF_UNIX
+        case AF_UNIX:
+          pf = PF_UNIX;
+          use_v6 = false;
+          break;
 #endif
-        }
-    }
-  else if (0 != daemon->listen_sa_len)
-    {
-      
-      /* we have a listen address, get AF from there! */
-      switch (daemon->listen_sa.ss_family)
-      {
-      case AF_INET:
-        pf = PF_INET;
-        use_v6 = false;
-        break;
-#ifdef AF_INET6
-      case AF_INET6:
-        pf = PF_INET6;
-        use_v6 = true;
-        break;
+        default:
+          return MHD_SC_AF_NOT_SUPPORTED_BY_BUILD;
+        } /* switch on ss_family */
+      break; /* MHD_AF_NONE */
+    case MHD_AF_AUTO:
+#if HAVE_INET6
+      pf = PF_INET6;
+      use_v6 = true;
+#else
+      pf = PF_INET;
+      use_v6 = false;
 #endif
-#ifdef AF_UNIX
-      case AF_UNIX:
-        pf = PF_UNIX;
-        use_v6 = false;
+      break;
+    case MHD_AF_INET4:
+      use_v6 = false;
+      pf = PF_INET;
+      break;
+    case MHD_AF_INET6:
+    case MHD_AF_DUAL:
+#if HAVE_INET6
+      pf = PF_INET6;
+      use_v6 = true;
+      break;
+#else
+#ifdef HAVE_MESSAGES
+      MHD_DLOG (daemon,
+                MHD_SC_IPV6_NOT_SUPPORTED_BY_BUILD,
+                _("IPv6 not supported by this build\n"));
+#endif
+      return MHD_SC_IPV6_NOT_SUPPORTED_BY_BUILD;
 #endif
-      default:
-        return MHD_SC_AF_NOT_SUPPORTED_BY_BUILD;
-      }
-    }
-  else
-    {
-      /* no listening desired, that's OK */
-      return MHD_SC_OK;
     }
   
   /* try to open listen socket */
  try_open_listen_socket:
   daemon->listen_socket = MHD_socket_create_listen_(pf);
   if ( (MHD_INVALID_SOCKET == daemon->listen_socket) &&
-       (MHD_AF_AUTO == daemon->address_family) &&
+       (MHD_AF_AUTO == daemon->listen_af) &&
        (use_v6) )
     {
       use_v6 = false;
@@ -288,8 +263,8 @@ open_listen_socket (struct MHD_Daemon *daemon)
          and may also be missing on older POSIX systems; good luck if you have any of those,
          your IPv6 socket may then also bind against IPv4 anyway... */
       const MHD_SCKT_OPT_BOOL_ v6_only =
-        (MHD_AF_INET6 == daemon->address_family);
-      if (0 > setsockopt (listen_fd,
+        (MHD_AF_INET6 == daemon->listen_af);
+      if (0 > setsockopt (daemon->listen_socket,
                           IPPROTO_IPV6,
                           IPV6_V6ONLY,
                           (const void *) &v6_only,
@@ -315,7 +290,7 @@ open_listen_socket (struct MHD_Daemon *daemon)
   if (0 != daemon->listen_sa_len)
     {
       /* Bind address explicitly given */
-      sa = daemon->listen_sa;
+      sa = (const struct sockaddr *) &daemon->listen_sa;
       addrlen = daemon->listen_sa_len;
     }
   else
@@ -359,7 +334,7 @@ open_listen_socket (struct MHD_Daemon *daemon)
           sin4->sin_len = sizeof (struct sockaddr_in);
 #endif
         }
-      sa = (const struct sockaddr *) ss;
+      sa = (const struct sockaddr *) &ss;
     }
       
   /* actually do the bind() */    
@@ -374,13 +349,13 @@ open_listen_socket (struct MHD_Daemon *daemon)
         {
         case AF_INET:
           if (addrlen == sizeof (struct sockaddr_in))
-            port = ntohs (((const struct sockaddr_in*)sa)->sin_port);
+            port = ntohs (((const struct sockaddr_in *) sa)->sin_port);
           else
             port = UINT16_MAX + 1; /* indicate size error */
           break;
         case AF_INET6:
           if (addrlen == sizeof (struct sockaddr_in6))
-            port = ntohs (((const struct sockaddr_in6*)sa)->sin_port);
+            port = ntohs (((const struct sockaddr_in6 *) sa)->sin6_port);
           else
             port = UINT16_MAX + 1; /* indicate size error */
           break;
@@ -404,8 +379,8 @@ open_listen_socket (struct MHD_Daemon *daemon)
       if (0 != setsockopt (daemon->listen_socket,
                            IPPROTO_TCP,
                            TCP_FASTOPEN,
-                           &daemon->fastopen_queue_size,
-                           sizeof (daemon->fastopen_queue_size)))
+                           &daemon->fo_queue_length,
+                           sizeof (daemon->fo_queue_length)))
         {
 #ifdef HAVE_MESSAGES
           MHD_DLOG (daemon,
@@ -421,7 +396,7 @@ open_listen_socket (struct MHD_Daemon *daemon)
 
   /* setup listening */
   if (0 > listen (daemon->listen_socket,
-                  daemon->listen_backlog_size))
+                  daemon->listen_backlog))
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
@@ -449,7 +424,7 @@ get_listen_port_number (struct MHD_Daemon *daemon)
   struct sockaddr_storage servaddr;
   socklen_t addrlen;
   
-  if ( (0 != daemon->port) ||
+  if ( (0 != daemon->listen_port) ||
        (MHD_INVALID_SOCKET == daemon->listen_socket) )
     return; /* nothing to be done */
 
@@ -487,7 +462,7 @@ get_listen_port_number (struct MHD_Daemon *daemon)
       {
         struct sockaddr_in *s4 = (struct sockaddr_in *) &servaddr;
         
-        daemon->port = ntohs (s4->sin_port);
+        daemon->listen_port = ntohs (s4->sin_port);
         break;
       }
 #ifdef HAVE_INET6
@@ -495,13 +470,13 @@ get_listen_port_number (struct MHD_Daemon *daemon)
       {
         struct sockaddr_in6 *s6 = (struct sockaddr_in6 *) &servaddr;
         
-        daemon->port = ntohs(s6->sin6_port);
+        daemon->listen_port = ntohs(s6->sin6_port);
         break;
       }
 #endif /* HAVE_INET6 */
 #ifdef AF_UNIX
     case AF_UNIX:
-      daemon->port = 0; /* special value for UNIX domain sockets */
+      daemon->listen_port = 0; /* special value for UNIX domain sockets */
       break;
 #endif
     default:
@@ -510,12 +485,57 @@ get_listen_port_number (struct MHD_Daemon *daemon)
                 MHD_SC_LISTEN_PORT_INTROSPECTION_UNKNOWN_AF,
                 _("Unknown address family!\n"));
 #endif
-      daemon->port = 0; /* ugh */
+      daemon->listen_port = 0; /* ugh */
       break;
     }
 }
 
 
+#ifdef EPOLL_SUPPORT
+/**
+ * Setup file descriptor to be used for epoll() control.
+ *
+ * @param daemon the daemon to setup epoll FD for
+ * @return the epoll() fd to use
+ */
+static int
+setup_epoll_fd (struct MHD_Daemon *daemon)
+{
+  int fd;
+
+#ifndef HAVE_MESSAGES
+  (void)daemon; /* Mute compiler warning. */
+#endif /* ! HAVE_MESSAGES */
+
+#ifdef USE_EPOLL_CREATE1
+  fd = epoll_create1 (EPOLL_CLOEXEC);
+#else  /* ! USE_EPOLL_CREATE1 */
+  fd = epoll_create (MAX_EVENTS);
+#endif /* ! USE_EPOLL_CREATE1 */
+  if (MHD_INVALID_SOCKET == fd)
+    {
+#ifdef HAVE_MESSAGES
+      MHD_DLOG (daemon,
+                MHD_SC_EPOLL_CTL_CREATE_FAILED,
+                _("Call to epoll_create1 failed: %s\n"),
+                MHD_socket_last_strerr_ ());
+#endif
+      return MHD_INVALID_SOCKET;
+    }
+#if !defined(USE_EPOLL_CREATE1)
+  if (! MHD_socket_noninheritable_ (fd))
+    {
+#ifdef HAVE_MESSAGES
+      MHD_DLOG (daemon,
+                MHD_SC_EPOLL_CTL_CONFIGURE_NOINHERIT_FAILED,
+                _("Failed to set noninheritable mode on epoll FD.\n"));
+#endif
+    }
+#endif /* ! USE_EPOLL_CREATE1 */
+  return fd;
+}
+
+
 /**
  * Setup epoll() FD for the daemon and initialize it to listen
  * on the listen FD.
@@ -536,14 +556,14 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon)
   if (-1 == daemon->epoll_fd)
     return MHD_NO;
 #if defined(HTTPS_SUPPORT) && defined(UPGRADE_SUPPORT)
-  if (0 != (MHD_ALLOW_UPGRADE & daemon->options))
+  if (! daemon->disallow_upgrade)
     {
        daemon->epoll_upgrade_fd = setup_epoll_fd (daemon);
        if (MHD_INVALID_SOCKET == daemon->epoll_upgrade_fd)
          return MHD_NO;
     }
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
-  if ( (MHD_INVALID_SOCKET == (ls = daemon->listen_fd)) ||
+  if ( (MHD_INVALID_SOCKET == (ls = daemon->listen_socket)) ||
        (daemon->was_quiesced) )
     return MHD_YES; /* non-listening daemon */
   event.events = EPOLLIN;
@@ -555,6 +575,7 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon)
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
+                MHD_SC_EPOLL_CTL_ADD_FAILED,
                 _("Call to epoll_ctl failed: %s\n"),
                 MHD_socket_last_strerr_ ());
 #endif
@@ -564,7 +585,7 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon)
   if (MHD_ITC_IS_VALID_(daemon->itc))
     {
       event.events = EPOLLIN;
-      event.data.ptr = (void *) epoll_itc_marker;
+      event.data.ptr = (void *) daemon->epoll_itc_marker;
       if (0 != epoll_ctl (daemon->epoll_fd,
                           EPOLL_CTL_ADD,
                           MHD_itc_r_fd_ (daemon->itc),
@@ -572,6 +593,7 @@ setup_epoll_to_listen (struct MHD_Daemon *daemon)
         {
 #ifdef HAVE_MESSAGES
           MHD_DLOG (daemon,
+                    MHD_SC_EPOLL_CTL_ADD_FAILED,
                     _("Call to epoll_ctl failed: %s\n"),
                     MHD_socket_last_strerr_ ());
 #endif
@@ -647,7 +669,7 @@ setup_thread_pool (struct MHD_Daemon *daemon)
     / daemon->threading_model;
   unsigned int leftover_conns = daemon->global_connection_limit
     % daemon->threading_model;
-  unsigned int i;
+  int i;
   enum MHD_StatusCode sc;
 
   /* Allocate memory for pooled objects */
@@ -675,7 +697,7 @@ setup_thread_pool (struct MHD_Daemon *daemon)
        * Thread indexes in [0, leftover_conns) each get one of the
        * leftover connections. */
       d->global_connection_limit = conns_per_thread;
-      if (i < leftover_conns)
+      if (((unsigned int) i) < leftover_conns)
         ++d->global_connection_limit;
           
       if (! daemon->disable_itc)        
@@ -733,7 +755,7 @@ setup_thread_pool (struct MHD_Daemon *daemon)
       /* Spawn the worker thread */
       if (! MHD_create_named_thread_ (&d->pid,
                                       "MHD-worker",
-                                      daemon->thread_stack_size,
+                                      daemon->thread_stack_limit_b,
                                       &MHD_polling_thread,
                                       d))
         {
@@ -909,9 +931,9 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
                                     (MHD_TM_THREAD_PER_CONNECTION == daemon->threading_model)
                                     ? "MHD-listen"
                                     : "MHD-single",
-                                    daemon->thread_stack_size,
+                                    daemon->thread_stack_limit_b,
                                     &MHD_polling_thread,
-                                    daemon) )
+                                    daemon) ) )
     {
 #ifdef HAVE_MESSAGES
       MHD_DLOG (daemon,
@@ -928,7 +950,10 @@ MHD_daemon_start (struct MHD_Daemon *daemon)
         (MHD_INVALID_SOCKET != daemon->listen_socket) &&
         (MHD_SC_OK != (sc = setup_thread_pool (daemon))) )
     return sc;
-       
+
+  /* make sure we know our listen port (if any) */
+  get_listen_port_number (daemon);
+  
   return MHD_SC_OK;
 }