summaryrefslogtreecommitdiff
path: root/src/inspsocket.cpp
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2013-09-24 20:40:20 +0200
committerAttila Molnar <attilamolnar@hush.com>2014-01-22 19:10:01 +0100
commit99f79a4e5c3abbe91a03216824e7659051872054 (patch)
tree629ed4d4cccb115e95f53c582047bc239d213624 /src/inspsocket.cpp
parent282138ad0e9ef483ec2a1606376fc5cb6d5f4cbc (diff)
Split IOHook into IOHook and IOHookProvider
Create one IOHook instance for each hooked socket which contains all the hook specific data and read/write/close functions, removing the need for the "issl_session" array in SSL modules. Register instances of the IOHookProvider class in the core and use them to create specialized IOHook instances (OnConnect/OnAccept). Remove the OnHookIO hook, add a dynamic reference to ListenSocket that points to the hook provider (if any) to use for incoming connections on that socket. For outgoing connections modules still have to find the IOHookProvider they want to use themselves but instead of calling AddIOHook(hookprov), now they have to call IOHookProvider::OnConnect() after the connection has been established.
Diffstat (limited to 'src/inspsocket.cpp')
-rw-r--r--src/inspsocket.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp
index 8822f69f8..ea09a8b1d 100644
--- a/src/inspsocket.cpp
+++ b/src/inspsocket.cpp
@@ -134,6 +134,7 @@ void StreamSocket::Close()
ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "%s threw an exception: %s",
modexcept.GetSource().c_str(), modexcept.GetReason().c_str());
}
+ delete iohook;
DelIOHook();
}
ServerInstance->SE->Shutdown(this, 2);
@@ -467,9 +468,7 @@ void BufferedSocket::DoWrite()
{
state = I_CONNECTED;
this->OnConnected();
- if (GetIOHook())
- GetIOHook()->OnStreamSocketConnect(this);
- else
+ if (!GetIOHook())
ServerInstance->SE->ChangeEventMask(this, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE);
}
this->StreamSocket::DoWrite();