1 files changed, 36 insertions, 27 deletions

diff --git a/src/lib/daemon_info.c b/src/lib/daemon_info.c
index 47009687..770f74b9 100644
--- a/src/lib/daemon_info.c
+++ b/src/lib/daemon_info.c
@@ -46,50 +46,59 @@ MHD_daemon_get_information_sz (struct MHD_Daemon *daemon,
                                union MHD_DaemonInformation *return_value,
                                size_t return_value_size)
 {
-#if OLD
-  if (NULL == daemon)
-    return NULL;
+#define CHECK_SIZE(type) if (sizeof(type) < return_value_size)  \
+    return MHD_NO
+
   switch (info_type)
     {
-    case MHD_DAEMON_INFO_KEY_SIZE:
-      return NULL; /* no longer supported */
-    case MHD_DAEMON_INFO_MAC_KEY_SIZE:
-      return NULL; /* no longer supported */
-    case MHD_DAEMON_INFO_LISTEN_FD:
-      return (const union MHD_DaemonInfo *) &daemon->listen_fd;
+    case MHD_DAEMON_INFORMATION_LISTEN_SOCKET:
+      CHECK_SIZE (MHD_socket);
+      return_value->listen_socket
+        = daemon->listen_socket;
+      return MHD_YES;
 #ifdef EPOLL_SUPPORT
-    case MHD_DAEMON_INFO_EPOLL_FD:
-      return (const union MHD_DaemonInfo *) &daemon->epoll_fd;
+    case MHD_DAEMON_INFORMATION_EPOLL_FD:
+      CHECK_SIZE (int);
+      // FIXME: maybe return MHD_NO if we are not using EPOLL?
+      return_value->epoll_fd = daemon->epoll_fd;
+      return MHD_YES;
 #endif
-    case MHD_DAEMON_INFO_CURRENT_CONNECTIONS:
-      if (0 == (daemon->options & MHD_USE_INTERNAL_POLLING_THREAD))
+    case MHD_DAEMON_INFORMATION_CURRENT_CONNECTIONS:
+      CHECK_SIZE (unsigned int);
+      if (MHD_TM_EXTERNAL_EVENT_LOOP == daemon->threading_model)
         {
-          /* Assume that MHD_run() in not called in other thread
-           * at the same time. */
+          /* Assumes that MHD_run() in not called in other thread
+             (of the application) at the same time. */
           MHD_cleanup_connections (daemon);
+          return_value->num_connections
+            = daemon->connections;
         }
       else if (daemon->worker_pool)
         {
           unsigned int i;
           /* Collect the connection information stored in the workers. */
-          daemon->connections = 0;
-          for (i = 0; i < daemon->worker_pool_size; i++)
+          return_value->num_connections = 0;
+          for (i = 0; i < daemon->worker_pool_size; i++)
             {
               /* FIXME: next line is thread-safe only if read is atomic. */
-              daemon->connections += daemon->worker_pool[i].connections;
+              return_value->num_connections
+                += daemon->worker_pool[i].connections;
             }
         }
-      return (const union MHD_DaemonInfo *) &daemon->connections;
-    case MHD_DAEMON_INFO_FLAGS:
-      return (const union MHD_DaemonInfo *) &daemon->options;
-    case MHD_DAEMON_INFO_BIND_PORT:
-      return (const union MHD_DaemonInfo *) &daemon->port;
+      else
+        return_value->num_connections
+          = daemon->connections;
+      return MHD_YES;
+    case MHD_DAEMON_INFORMATION_BIND_PORT:
+      CHECK_SIZE (uint16_t);
+      // FIXME: return MHD_NO if port is not known/UNIX?
+      return_value->port = daemon->listen_port;
+      return MHD_YES;
     default:
-      return NULL;
+      return MHD_NO;
     }
-#else
-  return MHD_NO;
-#endif
+  
+#undef CHECK_SIZE
 }
 
 /* end of daemon_info.c */