diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2013-09-24 20:40:20 +0200 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2014-01-22 19:10:01 +0100 |
| commit | 99f79a4e5c3abbe91a03216824e7659051872054 (patch) | |
| tree | 629ed4d4cccb115e95f53c582047bc239d213624 /src/modules/m_httpd.cpp | |
| parent | 282138ad0e9ef483ec2a1606376fc5cb6d5f4cbc (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/modules/m_httpd.cpp')
| -rw-r--r-- | src/modules/m_httpd.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 735551dff..d0291b8cc 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -65,9 +65,8 @@ class HttpServerSocket : public BufferedSocket { InternalState = HTTP_SERVE_WAIT_REQUEST; - FOREACH_MOD(OnHookIO, (this, via)); - if (GetIOHook()) - GetIOHook()->OnStreamSocketAccept(this, client, server); + if (via->iohookprov) + via->iohookprov->OnAccept(this, client, server); } ~HttpServerSocket() |