m_ssl_gnutls, m_ssl_openssl Simplify Handshake() result handling

[user/henk/code/inspircd.git] / src / modules / m_starttls.cpp

diff --git a/src/modules/m_starttls.cpp b/src/modules/m_starttls.cpp
index 09c9b4f0fff1b07a33a8949933ecda9fb8d6e96d..b05302fa96c93f83197e4e547e6e67d79c04004a 100644 (file)
--- 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()
@@ -103,11 +102,6 @@ class ModuleStartTLS : public Module
                        ssl.SetProvider("ssl/" + newprovider);
        }
 
-       void OnEvent(Event& ev) CXX11_OVERRIDE
-       {
-               tls.HandleEvent(ev);
-       }
-
        void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
        {
                tokens["STARTTLS"];