From 0c8adc85f7373a85de8b3edc6cac87d5f7389bb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Fri, 11 Nov 2016 02:54:48 +0100
Subject: Move all the connect() logic from TCPSocketHandler into a subclass
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This way, TCPSocketHandler only deal with the message sending/receiving, not
the connect() or anything else.  This will be used for implementing servers
(because when a client is accepted, we don’t need all the connect() and dns
resolution stuff).
---
 src/irc/irc_client.cpp | 4 ++--
 src/irc/irc_client.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index b0d3a47..b13e5ab 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -131,7 +131,7 @@ IrcClient::IrcClient(std::shared_ptr<Poller> poller, const std::string& hostname
                      const std::string& nickname, const std::string& username,
                      const std::string& realname, const std::string& user_hostname,
                      Bridge& bridge):
-  TCPSocketHandler(poller),
+  TCPClientSocketHandler(poller),
   hostname(hostname),
   user_hostname(user_hostname),
   username(username),
@@ -338,7 +338,7 @@ void IrcClient::parse_in_buffer(const size_t)
       if (pos == std::string::npos)
         break ;
       IrcMessage message(this->in_buf.substr(0, pos));
-      this->in_buf = this->in_buf.substr(pos + 2, std::string::npos);
+      this->consume_in_buffer(pos + 2);
       log_debug("IRC RECEIVING: (", this->get_hostname(), ") ", message);
 
       // Call the standard callback (if any), associated with the command
diff --git a/src/irc/irc_client.hpp b/src/irc/irc_client.hpp
index 1b4d892..4edc32c 100644
--- a/src/irc/irc_client.hpp
+++ b/src/irc/irc_client.hpp
@@ -5,7 +5,7 @@
 #include <irc/irc_channel.hpp>
 #include <irc/iid.hpp>
 
-#include <network/tcp_socket_handler.hpp>
+#include <network/tcp_client_socket_handler.hpp>
 #include <network/resolver.hpp>
 
 #include <unordered_map>
@@ -23,7 +23,7 @@ class Bridge;
  * Represent one IRC client, i.e. an endpoint connected to a single IRC
  * server, through a TCP socket, receiving and sending commands to it.
  */
-class IrcClient: public TCPSocketHandler
+class IrcClient: public TCPClientSocketHandler
 {
 public:
   explicit IrcClient(std::shared_ptr<Poller> poller, const std::string& hostname,
-- 
cgit v1.2.3