Convert WriteNumeric() calls to pass the parameters of the numeric as method parameters

[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..b3cf5a26319d4772baa645921c0676417340aeeb 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)
        {
@@ -44,23 +44,23 @@ class CommandStartTLS : public SplitCommand
        {
                if (!ssl)
                {
-                       user->WriteNumeric(ERR_STARTTLS, ":STARTTLS is not enabled");
+                       user->WriteNumeric(ERR_STARTTLS, "STARTTLS is not enabled");
                        return CMD_FAILURE;
                }
 
                if (user->registered == REG_ALL)
                {
-                       user->WriteNumeric(ERR_STARTTLS, ":STARTTLS is not permitted after client registration is complete");
+                       user->WriteNumeric(ERR_STARTTLS, "STARTTLS is not permitted after client registration is complete");
                        return CMD_FAILURE;
                }
 
                if (user->eh.GetIOHook())
                {
-                       user->WriteNumeric(ERR_STARTTLS, ":STARTTLS failure");
+                       user->WriteNumeric(ERR_STARTTLS, "STARTTLS failure");
                        return CMD_FAILURE;
                }
 
-               user->WriteNumeric(RPL_STARTTLS, ":STARTTLS successful, go ahead with TLS handshake");
+               user->WriteNumeric(RPL_STARTTLS, "STARTTLS successful, go ahead with TLS handshake");
                /* We need to flush the write buffer prior to adding the IOHook,
                 * otherwise we'll be sending this line inside the SSL session - which
                 * won't start its handshake until the client gets this line. Currently,
@@ -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;
        }
@@ -81,8 +80,8 @@ class CommandStartTLS : public SplitCommand
 class ModuleStartTLS : public Module
 {
        CommandStartTLS starttls;
-       GenericCap tls;
-       dynamic_reference_nocheck<IOHook> ssl;
+       Cap::Capability tls;
+       dynamic_reference_nocheck<IOHookProvider> ssl;
 
  public:
        ModuleStartTLS()
@@ -103,16 +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"];
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for the STARTTLS command", VF_VENDOR);