SocketHandlers own the poller and add themself into it only when the socket is created

We want to call socket() with the parameters provided by getaddrinfo, so we
can’t addd the fd into the poller immediately. We need to wait the
connection attempt, and then the SocketHandler can call add_socket_handler
itself, if the connection succeeds, or is in progress.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/network/poller.cpp b/src/network/poller.cpp
index 708fe23..d89e50f 100644
--- a/src/network/poller.cpp
+++ b/src/network/poller.cpp
@@ -27,15 +27,14 @@ Poller::~Poller()
 {
 }
 
-void Poller::add_socket_handler(std::shared_ptr<SocketHandler> socket_handler)
+void Poller::add_socket_handler(SocketHandler* socket_handler)
 {
-  // Raise an error if that socket is already in the list
+  // Don't do anything if the socket is already managed
   const auto it = this->socket_handlers.find(socket_handler->get_socket());
   if (it != this->socket_handlers.end())
-    throw std::runtime_error("Trying to insert SocketHandler already managed");
+    return ;
 
   this->socket_handlers.emplace(socket_handler->get_socket(), socket_handler);
-  socket_handler->set_poller(this);
 
   // We always watch all sockets for receive events
 #if POLLER == POLL
@@ -44,7 +43,7 @@ void Poller::add_socket_handler(std::shared_ptr<SocketHandler> socket_handler)
   this->nfds++;
 #endif
 #if POLLER == EPOLL
-  struct epoll_event event = {EPOLLIN, {socket_handler.get()}};
+  struct epoll_event event = {EPOLLIN, {socket_handler}};
   const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_ADD, socket_handler->get_socket(), &event);
   if (res == -1)
     {