Replace std::deque with std::vector in spanningtree and related modules

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

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index ad24fa0d88fe9a5482b32791ecb84997075eb59e..5241a14e57c085c5a58d3e9fe10eb700d3ea8306 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
-class SaslAuthenticator
+class SaslAuthenticator : public classbase
 {
  private:
        InspIRCd *ServerInstance;
@@ -40,7 +40,7 @@ class SaslAuthenticator
        {
                this->user->Extend("sasl_authenticator", this);
 
-               std::deque<std::string> params;
+               parameterlist params;
                params.push_back("*");
                params.push_back("SASL");
                params.push_back(user->uuid);
@@ -48,8 +48,7 @@ class SaslAuthenticator
                params.push_back("S");
                params.push_back(method);
 
-               Event e((char*)&params, Creator, "send_encap");
-               e.Send(ServerInstance);
+               ServerInstance->PI->SendEncapsulatedData(params);
        }
 
        SaslResult GetSaslResult(std::string &result_)
@@ -64,7 +63,7 @@ class SaslAuthenticator
        }
 
        /* checks for and deals with a state change. */
-       SaslState ProcessInboundMessage(std::deque<std::string> &msg)
+       SaslState ProcessInboundMessage(parameterlist &msg)
        {
                switch (this->state)
                {
@@ -102,25 +101,23 @@ class SaslAuthenticator
                this->result = SASL_ABORT;
        }
 
-       bool SendClientMessage(const char* const* parameters, int pcnt)
+       bool SendClientMessage(const std::vector<std::string>& parameters)
        {
                if (this->state != SASL_COMM)
                        return true;
 
-               std::deque<std::string> params;
+               parameterlist params;
                params.push_back("*");
                params.push_back("SASL");
                params.push_back(this->user->uuid);
                params.push_back(this->agent);
                params.push_back("C");
 
-               for (int i = 0; i < pcnt; ++i)
-                       params.push_back(parameters[i]);                
+               params.insert(params.end(), parameters.begin(), parameters.end());
 
-               Event e((char*)&params, Creator, "send_encap");
-               e.Send(ServerInstance);
+               ServerInstance->PI->SendEncapsulatedData(params);
 
-               if (*parameters[0] == '*')
+               if (parameters[0][0] == '*')
                {
                        this->Abort();
                        return false;
@@ -137,13 +134,13 @@ class SaslAuthenticator
                switch (this->result)
                {
                 case SASL_OK:
-                       this->user->WriteServ("903 %s :SASL authentication successful", this->user->nick);
+                       this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str());
                        break;
                 case SASL_ABORT:
-                       this->user->WriteServ("906 %s :SASL authentication aborted", this->user->nick);
+                       this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str());
                        break;
                 case SASL_FAIL:
-                       this->user->WriteServ("904 %s :SASL authentication failed", this->user->nick);
+                       this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick.c_str());
                        break;
                 default:
                        break;
@@ -168,7 +165,7 @@ class CommandAuthenticate : public Command
                this->source = "m_sasl.so";
        }
 
-       CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
                /* Only allow AUTHENTICATE on unregistered clients */
                if (user->registered != REG_ALL)
@@ -179,7 +176,7 @@ class CommandAuthenticate : public Command
                        SaslAuthenticator *sasl;
                        if (!(user->GetExt("sasl_authenticator", sasl)))
                                sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator);
-                       else if (sasl->SendClientMessage(parameters, pcnt) == false)    // IAL abort extension --nenolod
+                       else if (sasl->SendClientMessage(parameters) == false)  // IAL abort extension --nenolod
                                delete sasl;
                }
                return CMD_FAILURE;
@@ -189,17 +186,16 @@ class CommandAuthenticate : public Command
 
 class ModuleSASL : public Module
 {
-       CommandAuthenticate* sasl;
+       CommandAuthenticate sasl;
  public:
-       
+
        ModuleSASL(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), sasl(Me, this)
        {
                Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect, I_OnCleanup };
                ServerInstance->Modules->Attach(eventlist, this, 5);
 
-               sasl = new CommandAuthenticate(ServerInstance, this);
-               ServerInstance->AddCommand(sasl);
+               ServerInstance->AddCommand(&sasl);
 
                if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so"))
                        ServerInstance->Logs->Log("m_sasl", DEFAULT, "WARNING: m_services_account.so and m_cap.so are not loaded! m_sasl.so will NOT function correctly until these two modules are loaded!");
@@ -242,14 +238,8 @@ class ModuleSASL : public Module
                std::string* str = NULL;
 
                if (user->GetExt("accountname", str))
-               {
-                       std::deque<std::string> params;
-                       params.push_back(user->uuid);
-                       params.push_back("accountname");
-                       params.push_back(*str);
-                       Event e((char*)&params, this, "send_metadata");
-                       e.Send(ServerInstance);
-               }
+                       ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str);
+
                return;
        }
 
@@ -259,7 +249,7 @@ class ModuleSASL : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_VENDOR,API_VERSION);
        }
 
        virtual void OnEvent(Event *ev)
@@ -268,7 +258,7 @@ class ModuleSASL : public Module
 
                if (ev->GetEventID() == "encap_received")
                {
-                       std::deque<std::string>* parameters = (std::deque<std::string>*)ev->GetData();
+                       parameterlist* parameters = (parameterlist*)ev->GetData();
 
                        if ((*parameters)[1] != "SASL")
                                return;