X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_nationalchars.cpp;h=bf95f0f9f3992b70de15db10c427eb0ef2f1996e;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=72f2337152a3a019dfb0202719ae63479cd21640;hpb=509f691a3c3455f8c11f1ba9b94554a2303e9362;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_nationalchars.cpp b/src/modules/m_nationalchars.cpp old mode 100755 new mode 100644 index 72f233715..bf95f0f9f --- 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 + * Copyright (C) 2009 Dennis Friis + * Copyright (C) 2009 Craig Edwards + * Copyright (C) 2009 Robin Burchell * - * 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 . */ + /* 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 @@ -24,9 +33,8 @@ class lwbNickHandler : public HandlerBase2 { - InspIRCd* Server; public: - lwbNickHandler(InspIRCd* Srv) : Server(Srv) { } + lwbNickHandler() { } virtual ~lwbNickHandler() { } virtual bool Call(const char*, size_t); }; @@ -214,33 +222,55 @@ bool lwbNickHandler::Call(const char* n, size_t max) class ModuleNationalChars : public Module { private: - - InspIRCd* ServerInstance; - lwbNickHandler* myhandler; + lwbNickHandler myhandler; std::string charset, casemapping; unsigned char m_additional[256], m_additionalUp[256], m_lower[256], m_upper[256]; - caller2 * rememberer; + caller2 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(InspIRCd* Me) : Module(Me) + ModuleNationalChars() + : rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map) { - rememberer = (caller2 *) malloc(sizeof(caller2)); + memcpy(prev_map, national_case_insensitive_map, sizeof(prev_map)); + } - lowermap_rememberer = national_case_insensitive_map; + void init() + { memcpy(m_lower, rfc_case_insensitive_map, 256); national_case_insensitive_map = m_lower; - ServerInstance = Me; - - *rememberer = ServerInstance->IsNick; - myhandler = new lwbNickHandler(ServerInstance); - ServerInstance->IsNick = myhandler; + ServerInstance->IsNick = &myhandler; Implementation eventlist[] = { I_OnRehash, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 2); - OnRehash(NULL, ""); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); } virtual void On005Numeric(std::string &output) @@ -250,17 +280,18 @@ class ModuleNationalChars : public Module SearchAndReplace(output, std::string("CASEMAPPING=rfc1459"), tmp); } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { - ConfigReader* conf = new ConfigReader(ServerInstance); - 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) @@ -268,7 +299,7 @@ class ModuleNationalChars : public Module if (!forcequit) return; - for (std::vector::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; @@ -279,16 +310,15 @@ class ModuleNationalChars : public Module virtual ~ModuleNationalChars() { - delete myhandler; - ServerInstance->IsNick = *rememberer; - free(rememberer); + ServerInstance->IsNick = rememberer; national_case_insensitive_map = lowermap_rememberer; CheckForceQuit("National characters module unloaded"); + CheckRehash(); } virtual Version GetVersion() { - return Version("$Id$",VF_COMMON,API_VERSION); + 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).*/