X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hostchange.cpp;h=17f0abc88e33a38e7531efbf9e8811060a755178;hb=f1712e6f0b58098250791ffc60815fa3fc462607;hp=327732651ba6e4342fadf231c666c0e0d6712cab;hpb=8394be69a0e3b5fea617c69b69aa27daf547fc4e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp index 327732651..17f0abc88 100644 --- a/src/modules/m_hostchange.cpp +++ b/src/modules/m_hostchange.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,7 +12,6 @@ */ #include "inspircd.h" -#include "wildcard.h" /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */ @@ -35,34 +34,33 @@ class ModuleHostChange : public Module std::string MySuffix; std::string MyPrefix; std::string MySeparator; - + public: ModuleHostChange(InspIRCd* Me) : Module(Me) { OnRehash(NULL,""); + Implementation eventlist[] = { I_OnRehash, I_OnUserConnect }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - + virtual ~ModuleHostChange() { for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) { - DELETE(i->second); + delete i->second; } hostchanges.clear(); } - Priority Prioritize() + void Prioritize() { - return (Priority)ServerInstance->Modules->PriorityAfter("m_cloaking.so"); + Module* cloak = ServerInstance->Modules->Find("m_cloaking.so"); + ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &cloak); } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserConnect] = 1; - } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ConfigReader Conf(ServerInstance); MySuffix = Conf.ReadValue("host","suffix",0); @@ -70,7 +68,7 @@ class ModuleHostChange : public Module MySeparator = Conf.ReadValue("host","separator",".",0); for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) { - DELETE(i->second); + delete i->second; } hostchanges.clear(); for (int index = 0; index < Conf.Enumerate("hostchange"); index++) @@ -86,19 +84,19 @@ class ModuleHostChange : public Module hostchanges[mask] = x; } } - + virtual Version GetVersion() { // returns the version number of the module to be // listed in /MODULES - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - - virtual void OnUserConnect(userrec* user) + + virtual void OnUserConnect(User* user) { for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++) { - if (((match(user->MakeHost(),i->first.c_str(),true)) || (match(user->MakeHostIP(),i->first.c_str())))) + if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first)))) { Host* h = i->second; @@ -143,7 +141,7 @@ class ModuleHostChange : public Module } if (complete.empty()) complete = "i-have-a-lame-nick"; - + if (!MyPrefix.empty()) newhost = MyPrefix + MySeparator + complete; else