From 612384b3d46d06eea6fd71ee6dc60471d0f9e3d1 Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 12 Apr 2015 16:20:13 +0200
Subject: Dispatch EventHandler events to dedicated virtual functions

Remove enum EventType
---
 include/inspsocket.h | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'include/inspsocket.h')

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 1bcfbea09..8c93f884e 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -113,6 +113,12 @@ class CoreExport StreamSocket : public EventHandler
 	size_t sendq_len;
 	/** Error - if nonempty, the socket is dead, and this is the reason. */
 	std::string error;
+
+	/** Check if the socket has an error set, if yes, call OnError
+	 * @param err Error to pass to OnError()
+	 */
+	void CheckError(BufferedSocketError err);
+
  protected:
 	std::string recvq;
  public:
@@ -120,15 +126,24 @@ class CoreExport StreamSocket : public EventHandler
 	IOHook* GetIOHook() const;
 	void AddIOHook(IOHook* hook);
 	void DelIOHook();
-	/** Handle event from socket engine.
-	 * This will call OnDataReady if there is *new* data in recvq
-	 */
-	virtual void HandleEvent(EventType et, int errornum = 0);
 	/** Dispatched from HandleEvent */
 	virtual void DoRead();
 	/** Dispatched from HandleEvent */
 	virtual void DoWrite();
 
+	/** Called by the socket engine on a read event
+	 */
+	void OnEventHandlerRead() CXX11_OVERRIDE;
+
+	/** Called by the socket engine on a write event
+	 */
+	void OnEventHandlerWrite() CXX11_OVERRIDE;
+
+	/** Called by the socket engine on error
+	 * @param errcode Error
+	 */
+	void OnEventHandlerError(int errcode) CXX11_OVERRIDE;
+
 	/** Sets the error message for this socket. Once set, the socket is dead. */
 	void SetError(const std::string& err) { if (error.empty()) error = err; }
 
@@ -226,7 +241,7 @@ class CoreExport BufferedSocket : public StreamSocket
 
 	virtual ~BufferedSocket();
  protected:
-	virtual void DoWrite();
+	void OnEventHandlerWrite() CXX11_OVERRIDE;
 	BufferedSocketError BeginConnect(const irc::sockets::sockaddrs& dest, const irc::sockets::sockaddrs& bind, unsigned long timeout);
 	BufferedSocketError BeginConnect(const std::string &ipaddr, int aport, unsigned long maxtime, const std::string &connectbindip);
 };
-- 
cgit v1.2.3


From a42246b2f19d429a01fc901b7f49893764676499 Mon Sep 17 00:00:00 2001
From: Attila Molnar <attilamolnar@hush.com>
Date: Sun, 12 Apr 2015 16:22:09 +0200
Subject: Change StreamSocket::DoRead() and DoWrite() to be non-virtual, make
 DoRead() private

---
 include/inspsocket.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'include/inspsocket.h')

diff --git a/include/inspsocket.h b/include/inspsocket.h
index 8c93f884e..221b92cc6 100644
--- a/include/inspsocket.h
+++ b/include/inspsocket.h
@@ -119,6 +119,10 @@ class CoreExport StreamSocket : public EventHandler
 	 */
 	void CheckError(BufferedSocketError err);
 
+	/** Read data from the socket into the recvq, if successful call OnDataReady()
+	 */
+	void DoRead();
+
  protected:
 	std::string recvq;
  public:
@@ -126,10 +130,10 @@ class CoreExport StreamSocket : public EventHandler
 	IOHook* GetIOHook() const;
 	void AddIOHook(IOHook* hook);
 	void DelIOHook();
-	/** Dispatched from HandleEvent */
-	virtual void DoRead();
-	/** Dispatched from HandleEvent */
-	virtual void DoWrite();
+
+	/** Flush the send queue
+	 */
+	void DoWrite();
 
 	/** Called by the socket engine on a read event
 	 */
-- 
cgit v1.2.3