Move some members of TCPSocketHandler into the SocketHandler class

1 files changed, 25 insertions, 5 deletions

diff --git a/src/network/socket_handler.hpp b/src/network/socket_handler.hpp
index b3a08d3..9a894a4 100644
--- a/src/network/socket_handler.hpp
+++ b/src/network/socket_handler.hpp
@@ -1,18 +1,38 @@
-#ifndef SOCKET_HANDLER_INTERFACE_HPP
-# define SOCKET_HANDLER_INTERFACE_HPP
+#ifndef SOCKET_HANDLER_HPP
+# define SOCKET_HANDLER_HPP
+
+#include <memory>
+
+class Poller;
 
 typedef int socket_t;
 
 class SocketHandler
 {
 public:
-  SocketHandler() {}
+  explicit SocketHandler(std::shared_ptr<Poller> poller, const socket_t socket):
+    poller(poller),
+    socket(socket)
+  {}
   virtual ~SocketHandler() {}
-  virtual socket_t get_socket() const = 0;
   virtual void on_recv() = 0;
   virtual void on_send() = 0;
   virtual void connect() = 0;
   virtual bool is_connected() const = 0;
+  socket_t get_socket() const
+  { return this->socket; }
+
+protected:
+  /**
+   * A pointer to the poller that manages us, because we need to communicate
+   * with it.
+   */
+  std::shared_ptr<Poller> poller;
+  /**
+   * The handled socket.
+   */
+  socket_t socket;
+
 private:
   SocketHandler(const SocketHandler&) = delete;
   SocketHandler(SocketHandler&&) = delete;
@@ -20,4 +40,4 @@ private:
   SocketHandler& operator=(SocketHandler&&) = delete;
 };
 
-#endif // SOCKET_HANDLER_INTERFACE_HPP
+#endif // SOCKET_HANDLER_HPP