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.

1 files changed, 4 insertions, 5 deletions

diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp
index 09c9b4f0f..d591eed55 100644
--- a/src/modules/m_starttls.cpp
+++ b/src/modules/m_starttls.cpp
@@ -30,10 +30,10 @@ enum
 
 class CommandStartTLS : public SplitCommand
 {
-	dynamic_reference_nocheck<IOHook>& ssl;
+	dynamic_reference_nocheck<IOHookProvider>& ssl;
 
  public:
-	CommandStartTLS(Module* mod, dynamic_reference_nocheck<IOHook>& s)
+	CommandStartTLS(Module* mod, dynamic_reference_nocheck<IOHookProvider>& s)
 		: SplitCommand(mod, "STARTTLS")
 		, ssl(s)
 	{
@@ -71,8 +71,7 @@ class CommandStartTLS : public SplitCommand
 		 */
 		user->eh.DoWrite();
 
-		user->eh.AddIOHook(*ssl);
-		ssl->OnStreamSocketAccept(&user->eh, NULL, NULL);
+		ssl->OnAccept(&user->eh, NULL, NULL);
 
 		return CMD_SUCCESS;
 	}
@@ -82,7 +81,7 @@ class ModuleStartTLS : public Module
 {
 	CommandStartTLS starttls;
 	GenericCap tls;
-	dynamic_reference_nocheck<IOHook> ssl;
+	dynamic_reference_nocheck<IOHookProvider> ssl;
 
  public:
 	ModuleStartTLS()