Match conversion stuff.

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

diff --git a/src/modules/m_conn_umodes.cpp b/src/modules/m_conn_umodes.cpp
index 6ba965d6161c6300bbccdd8ea683b068bd6a4932..097f8c8d6595d77f9ea66eae6e547504c625c9c1 100644 (file)
--- a/src/modules/m_conn_umodes.cpp
+++ b/src/modules/m_conn_umodes.cpp
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 
 /* $ModDesc: Sets (and unsets) modes on users when they connect */
 
@@ -26,7 +25,7 @@ class ModuleModesOnConnect : public Module
        ModuleModesOnConnect(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                Conf = new ConfigReader(ServerInstance);
                Implementation eventlist[] = { I_OnPostConnect, I_OnRehash };
                ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -38,61 +37,66 @@ class ModuleModesOnConnect : public Module
                delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
-       
+
        virtual ~ModuleModesOnConnect()
        {
                delete Conf;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version(1,2,0,1,VF_VENDOR,API_VERSION);
        }
-       
+
        virtual void OnPostConnect(User* user)
        {
                if (!IS_LOCAL(user))
                        return;
 
+               // Backup and zero out the disabled usermodes, so that we can override them here.
+               char save[64];
+               memcpy(save, ServerInstance->Config->DisabledUModes,
+                               sizeof(ServerInstance->Config->DisabledUModes));
+               memset(ServerInstance->Config->DisabledUModes, 0, 64);
+
                for (int j = 0; j < Conf->Enumerate("connect"); j++)
                {
                        std::string hostn = Conf->ReadValue("connect","allow",j);
-                       if ((match(user->GetIPString(),hostn.c_str(),true)) || (match(user->host,hostn.c_str())))
+                       /* XXX: Fixme: does not respect port, limit, etc */
+                       if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn)) || (InspIRCd::Match(user->host,hostn)))
                        {
                                std::string ThisModes = Conf->ReadValue("connect","modes",j);
                                if (!ThisModes.empty())
                                {
                                        std::string buf;
-                                       stringstream ss(ThisModes);
+                                       std::stringstream ss(ThisModes);
 
-                                       vector<string> tokens;
+                                       std::vector<std::string> tokens;
 
                                        // split ThisUserModes into modes and mode params
                                        while (ss >> buf)
                                                tokens.push_back(buf);
 
-                                       int size = tokens.size() + 1;
-                                       const char** modes = new const char*[size];
-                                       modes[0] = user->nick;
-                                       modes[1] = tokens[0].c_str();
+                                       std::vector<std::string> modes;
+                                       modes.push_back(user->nick);
+                                       modes.push_back(tokens[0]);
 
                                        if (tokens.size() > 1)
                                        {
                                                // process mode params
-                                               int i = 2;
                                                for (unsigned int k = 1; k < tokens.size(); k++)
                                                {
-                                                       modes[i] = tokens[k].c_str();
-                                                       i++;
+                                                       modes.push_back(tokens[k]);
                                                }
                                        }
 
-                                       ServerInstance->Parser->CallHandler("MODE", modes, size, user);
-                                       delete [] modes;
+                                       ServerInstance->Parser->CallHandler("MODE", modes, user);
                                }
                                break;
                        }
                }
+
+               memcpy(ServerInstance->Config->DisabledUModes, save, 64);
        }
 };