m_nationalchars Ask m_spanningtree to rebuild its hashmaps when the national_case_ins...

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

diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp
old mode 100755 (executable)
new mode 100644 (file)
index af6e962..bf95f0f
--- a/src/modules/m_nationalchars.cpp
+++ b/src/modules/m_nationalchars.cpp
@@ -1,16 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2009 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2009 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2009 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 /* Contains a code of Unreal IRCd + Bynets patch ( http://www.unrealircd.com/ and http://www.bynets.org/ )
    Original patch is made by Dmitry "Killer{R}" Kononko. ( http://killprog.com/ )
    Changed at 2008-06-15 - 2009-02-11
@@ -219,18 +228,48 @@ class ModuleNationalChars : public Module
        caller2<bool, const char*, size_t> rememberer;
        bool forcequit;
        const unsigned char * lowermap_rememberer;
+       unsigned char prev_map[256];
+
+       void CheckRehash()
+       {
+               // See if anything changed
+               if (!memcmp(prev_map, national_case_insensitive_map, sizeof(prev_map)))
+                       return;
+
+               memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map));
+
+               ServerInstance->RehashUsersAndChans();
+
+               // The OnGarbageCollect() method in m_watch rebuilds the hashmap used by it
+               Module* mod = ServerInstance->Modules->Find("m_watch.so");
+               if (mod)
+                       mod->OnGarbageCollect();
+
+               // Send a Request to m_spanningtree asking it to rebuild its hashmaps
+               mod = ServerInstance->Modules->Find("m_spanningtree.so");
+               if (mod)
+               {
+                       Request req(this, mod, "rehash");
+                       req.Send();
+               }
+       }
 
  public:
-       ModuleNationalChars() : rememberer(ServerInstance->IsNick)
+       ModuleNationalChars()
+               : rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map)
+       {
+               memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map));
+       }
+
+       void init()
        {
-               lowermap_rememberer = national_case_insensitive_map;
                memcpy(m_lower, rfc_case_insensitive_map, 256);
                national_case_insensitive_map = m_lower;
 
                ServerInstance->IsNick = &myhandler;
 
                Implementation eventlist[] = { I_OnRehash, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
@@ -243,15 +282,16 @@ class ModuleNationalChars : public Module
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader* conf = new ConfigReader;
-               charset = conf->ReadValue("nationalchars", "file", 0);
-               casemapping = conf->ReadValue("nationalchars", "casemapping", charset, 0, false);
-               charset.insert(0, "../locales/");
+               ConfigTag* tag = ServerInstance->Config->ConfValue("nationalchars");
+               charset = tag->getString("file");
+               casemapping = tag->getString("casemapping", charset);
+               if(charset[0] != '/')
+                       charset.insert(0, "../locales/");
                unsigned char * tables[8] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range, m_additionalUtf8interval };
                loadtables(charset, tables, 8, 5);
-               forcequit = conf->ReadFlag("nationalchars", "forcequit", 0);
+               forcequit = tag->getBool("forcequit");
                CheckForceQuit("National character set changed");
-               delete conf;
+               CheckRehash();
        }
 
        void CheckForceQuit(const char * message)
@@ -259,7 +299,7 @@ class ModuleNationalChars : public Module
                if (!forcequit)
                        return;
 
-               for (std::vector<User*>::iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
+               for (LocalUserList::const_iterator iter = ServerInstance->Users->local_users.begin(); iter != ServerInstance->Users->local_users.end(); ++iter)
                {
                        /* Fix by Brain: Dont quit UID users */
                        User* n = *iter;
@@ -273,11 +313,12 @@ class ModuleNationalChars : public Module
                ServerInstance->IsNick = rememberer;
                national_case_insensitive_map = lowermap_rememberer;
                CheckForceQuit("National characters module unloaded");
+               CheckRehash();
        }
 
        virtual Version GetVersion()
        {
-               return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING",VF_COMMON);
+               return Version("Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING", VF_VENDOR | VF_COMMON, charset);
        }
 
        /*make an array to check against it 8bit characters a bit faster. Whether allowed or uppercase (for your needs).*/