-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/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/ )
- Changed at 2008-06-15 - 2008-12-15
+ Original patch is made by Dmitry "Killer{R}" Kononko. ( http://killprog.com/ )
+ Changed at 2008-06-15 - 2009-02-11
by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */
#include "inspircd.h"
/* $ModDesc: Provides an ability to have non-RFC1459 nicks & support for national CASEMAPPING */
-DEFINE_HANDLER2(lwbNickHandler, bool, const char*, size_t);
+class lwbNickHandler : public HandlerBase2<bool, const char*, size_t>
+{
+ public:
+ lwbNickHandler() { }
+ virtual ~lwbNickHandler() { }
+ virtual bool Call(const char*, size_t);
+};
/*,m_reverse_additionalUp[256];*/
-static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256];
+static unsigned char m_reverse_additional[256],m_additionalMB[256],m_additionalUtf8[256],m_additionalUtf8range[256],m_additionalUtf8interval[256];
char utf8checkrest(unsigned char * mb, unsigned char cnt)
{
for (unsigned char * tmp=mb; tmp<mb+cnt; tmp++)
{
- if ((*tmp < 128) || (*tmp > 191))
+ /* & is faster! -- Phoenix (char & b11000000 == b10000000) */
+ if ((*tmp & 192) != 128)
return -1;
}
return cnt + 1;
continue;
/* 3.1. Check against a simple UTF-8 characters enumeration */
- int cursize, ncursize = utf8size((unsigned char *)i);
+ int cursize, cursize2, ncursize = utf8size((unsigned char *)i);
/* do check only if current multibyte character is valid UTF-8 only */
if (ncursize != -1)
{
if (found)
continue;
- /* 3.2. Check against an UTF-8 ranges: <start character> and <lenght of the range>.
- Also char. is to be checked if it is a valid UTF-8 one */
+ /* 3.2. Check against an UTF-8 ranges: <start character> and <length of the range>. */
found = false;
for (unsigned char * mb = m_additionalUtf8range; (utf8size(mb) != -1) && (mb < m_additionalUtf8range + sizeof(m_additionalUtf8range)); mb += cursize + 1)
{
cursize = utf8size(mb);
- /* Size differs? Pick the next! */
+ /* Size differs (or lengthbyte is zero)? Pick the next! */
if ((cursize != ncursize) || (!mb[cursize]))
continue;
- unsigned char uright[5] = {0,0,0,0,0};
-
+ unsigned char uright[5] = {0,0,0,0,0}, range = mb[cursize] - 1;
strncpy((char* ) uright, (char *) mb, cursize);
- if ((uright[cursize-1] + mb[cursize]-1>0xff) && (cursize != 1))
+ for (int temp = cursize - 1; (temp >= 0) && range; --temp)
{
- uright[cursize - 2]+=1;
+ /* all but the first char are 64-based */
+ if (temp)
+ {
+ char part64 = range & 63; /* i.e. % 64 */
+ /* handle carrying over */
+ if (uright[temp] + part64 - 1 > 191)
+ {
+ uright[temp] -= 64;
+ range += 64;
+ }
+ uright[temp] += part64;
+ range >>= 6; /* divide it on a 64 */
+ }
+ /* the first char of UTF-8 doesn't follow the rule */
+ else
+ {
+ uright[temp] += range;
+ }
}
- uright[cursize - 1] = (uright[cursize - 1]+mb[cursize] - 1) % 0x100;
if ((strncmp(i, (char *) mb, cursize) >= 0) && (strncmp(i, (char *) uright, cursize) <= 0))
{
}
if (found)
continue;
+
+ /* 3.3. Check against an UTF-8 intervals: <start character> and <end character>. */
+ found = false;
+ for (unsigned char * mb = m_additionalUtf8interval; (utf8size(mb) != -1) && (utf8size(mb+utf8size(mb)) != -1)
+ && (mb < m_additionalUtf8interval + sizeof(m_additionalUtf8interval)); mb += (cursize+cursize2) )
+ {
+ cursize = utf8size(mb);
+ cursize2= utf8size(mb+cursize);
+
+ int minlen = cursize > ncursize ? ncursize : cursize;
+ int minlen2 = cursize2 > ncursize ? ncursize : cursize2;
+
+ unsigned char* uright = mb + cursize;
+
+ if ((strncmp(i, (char *) mb, minlen) >= 0) && (strncmp(i, (char *) uright, minlen2) <= 0))
+ {
+ i += cursize - 1;
+ p += cursize - 1;
+ found = true;
+ break;
+ }
+ }
+ if (found)
+ continue;
}
/* invalid character! abort */
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/");
- unsigned char * tables[7] = { m_additional, m_additionalMB, m_additionalUp, m_lower, m_upper, m_additionalUtf8, m_additionalUtf8range };
- loadtables(charset, tables, 7, 5);
- forcequit = conf->ReadFlag("nationalchars", "forcequit", 0);
+ 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 = tag->getBool("forcequit");
CheckForceQuit("National character set changed");
- delete conf;
+ CheckRehash();
}
void CheckForceQuit(const char * message)
if (!forcequit)
return;
- std::vector<User*> purge;
- 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 */
- if (!isdigit((*iter)->nick[0]) && !ServerInstance->IsNick((*iter)->nick.c_str(), ServerInstance->Config->Limits.NickMax))
- purge.push_back(*iter);
- }
- for (std::vector<User*>::iterator iter = purge.begin();iter!=purge.end();++iter)
- {
- ServerInstance->Users->QuitUser((*iter), message);
+ User* n = *iter;
+ if (!isdigit(n->nick[0]) && !ServerInstance->IsNick(n->nick.c_str(), ServerInstance->Config->Limits.NickMax))
+ ServerInstance->Users->QuitUser(n, message);
}
}
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: m_nationalchars.cpp 0 2008-12-15 14:24:12SAMT phoenix $",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).*/
if (buf[0] == '.') /* simple plain-text string after dot */
{
i = buf.size() - 1;
-
+
if (i > (maxindex + 1))
i = maxindex + 1;
projects / user / henk / code / inspircd.git / blobdiff