X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=325e8fee11735c46f24f6790d82a9f7a8f233f21;hb=fc4fc43ec232407b38d7ca182cb92c5cac4287aa;hp=ba03f9af5480013e4942f49df79f4798a89848c5;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index ba03f9af5..325e8fee1 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -1,21 +1,27 @@
-/*       +------------------------------------+
- *       | 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-2010 Daniel De Graaf <danieldg@inspircd.org>
  *
- * 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/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Implements config tags which allow changing characters allowed in channel names */
 
-static bool allowedmap[256];
+static std::bitset<256> allowedmap;
 
 class NewIsChannelHandler : public HandlerBase2<bool, const char*, size_t>
 {
@@ -25,19 +31,20 @@ class NewIsChannelHandler : public HandlerBase2<bool, const char*, size_t>
 	virtual bool Call(const char*, size_t);
 };
 
-bool NewIsChannelHandler::Call(const char* chname, size_t max)
+bool NewIsChannelHandler::Call(const char* c, size_t max)
 {
-		const char *c = chname + 1;
-
 		/* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
-		if (!chname || *chname != '#')
+		if (!c || *c++ != '#')
 			return false;
 
-		while (*c)
-			if (!allowedmap[(unsigned int)(*c++)]) return false;
-
-		size_t len = c - chname;
-		return len <= max;
+		while (*c && --max)
+		{
+			unsigned int i = *c++ & 0xFF;
+			if (!allowedmap[i])
+				return false;
+		}
+		// a name of exactly max length will have max = 1 here; the null does not trigger --max
+		return max;
 }
 
 class ModuleChannelNames : public Module
@@ -48,12 +55,15 @@ class ModuleChannelNames : public Module
 	bool badchan;
 
  public:
-	ModuleChannelNames() : rememberer(ServerInstance->IsChannel)
+	ModuleChannelNames() : rememberer(ServerInstance->IsChannel), badchan(false)
+	{
+	}
+
+	void init()
 	{
 		ServerInstance->IsChannel = &myhandler;
-		badchan = false;
 		Implementation eventlist[] = { I_OnRehash, I_OnUserKick };
-		ServerInstance->Modules->Attach(eventlist, this, 2);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
@@ -76,37 +86,50 @@ class ModuleChannelNames : public Module
 				modes.push_back(c->name);
 				modes.push_back("-P");
 
-				ServerInstance->SendMode(modes, ServerInstance->FakeClient);
-				ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+				ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
 			}
 			const UserMembList* users = c->GetUsers();
-			for(UserMembCIter j = users->begin(); j != users->end(); ++j)
-				if (IS_LOCAL(j->first) && !c->ServerKickUser(j->first, "Channel name no longer valid", NULL))
-					delete c;
+			for(UserMembCIter j = users->begin(); j != users->end(); )
+			{
+				if (IS_LOCAL(j->first))
+				{
+					// KickUser invalidates the iterator
+					UserMembCIter it = j++;
+					c->KickUser(ServerInstance->FakeClient, it->first, "Channel name no longer valid");
+				}
+				else
+					++j;
+			}
 		}
 		badchan = false;
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf;
-		std::string denyToken = Conf.ReadValue("channames", "denyrange", 0);
-		std::string allowToken = Conf.ReadValue("channames", "allowrange", 0);
-		memset(allowedmap, 1, sizeof(allowedmap));
+		ConfigTag* tag = ServerInstance->Config->ConfValue("channames");
+		std::string denyToken = tag->getString("denyrange");
+		std::string allowToken = tag->getString("allowrange");
+
+		if (!denyToken.compare(0, 2, "0-"))
+			denyToken[0] = '1';
+		if (!allowToken.compare(0, 2, "0-"))
+			allowToken[0] = '1';
+
+		allowedmap.set();
 
 		irc::portparser denyrange(denyToken, false);
 		int denyno = -1;
 		while (0 != (denyno = denyrange.GetToken()))
-			allowedmap[(unsigned char)(denyno)] = false;
+			allowedmap[denyno & 0xFF] = false;
 
 		irc::portparser allowrange(allowToken, false);
 		int allowno = -1;
 		while (0 != (allowno = allowrange.GetToken()))
-			allowedmap[(unsigned char)(allowno)] = true;
+			allowedmap[allowno & 0xFF] = true;
 
-		allowedmap[7] = false;
-		allowedmap[' '] = false;
-		allowedmap[','] = false;
+		allowedmap[0x07] = false; // BEL
+		allowedmap[0x20] = false; // ' '
+		allowedmap[0x2C] = false; // ','
 
 		ValidateChans();
 	}