Removing daemon_item. Simplifying the logic

Author: etr

src/httpserver/webserver.hpp

@@ -59,7 +59,6 @@ struct httpserver_ska;
 };
 
 namespace details {
-    struct daemon_item;
     struct modded_request;
 }
 
@@ -188,7 +187,7 @@ class webserver
         std::set<http::ip_representation> bans;
         std::set<http::ip_representation> allowances;
 
-        std::vector<details::daemon_item*> daemons;
+        struct MHD_Daemon* daemon;
 
         static void* select(void* self);
         static void* cleaner(void* self);

src/webserver.cpp

@@ -66,26 +66,6 @@ using namespace std;
 namespace httpserver
 {
 
-namespace details
-{
-
-struct daemon_item
-{
-    webserver* ws;
-    struct MHD_Daemon* daemon;
-    daemon_item(webserver* ws, struct MHD_Daemon* daemon):
-        ws(ws),
-        daemon(daemon)
-    {
-    }
-    ~daemon_item()
-    {
-        MHD_stop_daemon (this->daemon);
-    }
-};
-
-}
-
 using namespace http;
 
 int policy_callback (void *, const struct sockaddr*, socklen_t);
@@ -329,29 +309,27 @@ bool webserver::start(bool blocking)
     start_conf |= MHD_USE_TCP_FASTOPEN;
 #endif
 
-    struct MHD_Daemon* daemon = NULL;
+    this->daemon = NULL;
     if(bind_address == 0x0) {
-        daemon = MHD_start_daemon
+        this->daemon = MHD_start_daemon
         (
                 start_conf, this->port, &policy_callback, this,
                 &answer_to_connection, this, MHD_OPTION_ARRAY,
                 &iov[0], MHD_OPTION_END
         );
     } else {
-        daemon = MHD_start_daemon
+        this->daemon = MHD_start_daemon
         (
                 start_conf, 1, &policy_callback, this,
                 &answer_to_connection, this, MHD_OPTION_ARRAY,
                 &iov[0], MHD_OPTION_SOCK_ADDR, bind_address, MHD_OPTION_END
         );
     }
 
-    if(NULL == daemon)
+    if(this->daemon == NULL)
     {
         throw std::invalid_argument("Unable to connect daemon to port: " + this->port);
     }
-    details::daemon_item* di = new details::daemon_item(this, daemon);
-    daemons.push_back(di);
 
     bool value_onclose = false;
 
@@ -381,11 +359,8 @@ bool webserver::stop()
     this->running = false;
     pthread_cond_signal(&mutexcond);
     pthread_mutex_unlock(&mutexwait);
-    typedef vector<details::daemon_item*>::const_iterator daemon_item_it;
 
-    for(daemon_item_it it = daemons.begin(); it != daemons.end(); ++it)
-        delete *it;
-    daemons.clear();
+    MHD_stop_daemon(this->daemon);
 
     shutdown(bind_socket, 2);