-/* +------------------------------------+
- * | 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
class lwbNickHandler : public HandlerBase2<bool, const char*, size_t>
{
- InspIRCd* Server;
public:
- lwbNickHandler(InspIRCd* Srv) : Server(Srv) { }
+ lwbNickHandler() { }
virtual ~lwbNickHandler() { }
virtual bool Call(const char*, size_t);
};
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<bool, const char*, size_t> * rememberer;
+ 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(InspIRCd* Me) : Module(Me)
+ ModuleNationalChars()
+ : rememberer(ServerInstance->IsNick), lowermap_rememberer(national_case_insensitive_map)
{
- rememberer = (caller2<bool, const char*, size_t> *) malloc(sizeof(rememberer));
+ 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)
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", ServerConfig::CleanFilename(charset.c_str()));
+ if (casemapping.find(' ') != std::string::npos)
+ throw ModuleException("<nationalchars:casemapping> must not contain any spaces!");
+#if defined _WIN32
+ if (!ServerInstance->Config->StartsWithWindowsDriveLetter(charset))
+ charset.insert(0, "./locales/");
+#else
+ if(charset[0] != '/')
+ charset.insert(0, "../locales/");
+#endif
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);
+ if (!loadtables(charset, tables, 8, 5))
+ throw ModuleException("The locale file failed to load. Check your log file for more information.");
+ forcequit = tag->getBool("forcequit");
CheckForceQuit("National character set changed");
- delete conf;
+ CheckRehash();
}
void CheckForceQuit(const char * message)
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;
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).*/
}
/*so Bynets Unreal distribution stuff*/
- void loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
+ bool loadtables(std::string filename, unsigned char ** tables, unsigned char cnt, char faillimit)
{
std::ifstream ifs(filename.c_str());
if (ifs.fail())
{
ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for missing file: %s", filename.c_str());
- return;
+ return false;
}
for (unsigned char n=0; n< cnt; n++)
if (loadtable(ifs, tables[n], 255) && (n < faillimit))
{
ServerInstance->Logs->Log("m_nationalchars",DEFAULT,"loadtables() called for illegal file: %s (line %d)", filename.c_str(), n+1);
- return;
+ return false;
}
}
makereverse(m_additional, m_reverse_additional, sizeof(m_additional));
+ return true;
}
unsigned char symtoi(const char *t,unsigned char base)
projects / user / henk / code / inspircd.git / blobdiff