X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_redirect.cpp;h=a746644c20d5b5d82952cad55865582814faef12;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=c143cab524d31872752349c7ad9f9dba4483adc1;hpb=396c9ef9f7a96934d3227bb7d1d091315e3d4fa8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp index c143cab52..a746644c2 100644 --- a/src/modules/m_redirect.cpp +++ b/src/modules/m_redirect.cpp @@ -2,50 +2,42 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.h" -#include "inspircd.h" /* $ModDesc: Provides channel mode +L (limit redirection) */ -extern InspIRCd* ServerInstance; - +/** Handle channel mode +L + */ class Redirect : public ModeHandler { - Server* Srv; public: - Redirect(Server* s) : ModeHandler('L', 1, 0, false, MODETYPE_CHANNEL, false), Srv(s) { } + Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) - { - if (channel->IsModeSet('L')) - return std::make_pair(true, channel->GetModeParameter('L')); - else - return std::make_pair(false, parameter); - } + ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + { + if (channel->IsModeSet('L')) + return std::make_pair(true, channel->GetModeParameter('L')); + else + return std::make_pair(false, parameter); + } - bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) + bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel) { /* When TS is equal, the alphabetically later one wins */ return (their_param < our_param); - } + } ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) { @@ -53,10 +45,10 @@ class Redirect : public ModeHandler { chanrec* c = NULL; - if (!IsValidChannelName(parameter.c_str())) + if (!ServerInstance->IsChannel(parameter.c_str())) { source->WriteServ("403 %s %s :Invalid channel name",source->nick, parameter.c_str()); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } @@ -69,12 +61,12 @@ class Redirect : public ModeHandler if ((c == channel) || (c->IsModeSet('L'))) { source->WriteServ("690 %s :Circular or chained +L to %s not allowed (Channel already has +L). Pack of wild dogs has been unleashed.",source->nick,parameter.c_str()); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } else { - for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++) + for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) { if ((i->second != channel) && (i->second->IsModeSet('L')) && (irc::string(i->second->GetModeParameter('L').c_str()) == irc::string(channel->name))) { @@ -106,40 +98,46 @@ class Redirect : public ModeHandler class ModuleRedirect : public Module { - Server *Srv; + Redirect* re; public: - ModuleRedirect(Server* Me) - : Module::Module(Me) + ModuleRedirect(InspIRCd* Me) + : Module(Me) { - Srv = Me; - re = new Redirect(Me); - Srv->AddMode(re, 'L'); + + re = new Redirect(ServerInstance); + if (!ServerInstance->AddMode(re, 'L')) + throw ModuleException("Could not add new modes!"); } void Implements(char* List) { - List[I_On005Numeric] = List[I_OnUserPreJoin] = 1; + List[I_OnUserPreJoin] = 1; } - virtual void On005Numeric(std::string &output) - { - InsertMode(output, "L", 3); - } - - virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname) + virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs) { if (chan) { - if (chan->IsModeSet('L')) + if (chan->IsModeSet('L') && chan->limit) { if (chan->GetUserCounter() >= chan->limit) { std::string channel = chan->GetModeParameter('L'); - user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s",user->nick,cname,channel.c_str()); - chanrec::JoinUser(ServerInstance, user, channel.c_str(), false); + + /* sometimes broken ulines can make circular or chained +L, avoid this */ + chanrec* destchan = NULL; + destchan = ServerInstance->FindChan(channel); + if (destchan && destchan->IsModeSet('L')) + { + user->WriteServ("470 %s :%s is full, but has a circular redirect (+L), not following redirection to %s", user->nick, cname, channel.c_str()); + return 1; + } + + user->WriteServ("470 %s :%s has become full, so you are automatically being transferred to the linked channel %s", user->nick, cname, channel.c_str()); + chanrec::JoinUser(ServerInstance, user, channel.c_str(), false, "", ServerInstance->Time(true)); return 1; } } @@ -149,37 +147,14 @@ class ModuleRedirect : public Module virtual ~ModuleRedirect() { + ServerInstance->Modes->DelMode(re); DELETE(re); } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); - } -}; - - -class ModuleRedirectFactory : public ModuleFactory -{ - public: - ModuleRedirectFactory() - { - } - - ~ModuleRedirectFactory() - { - } - - virtual Module * CreateModule(Server* Me) - { - return new ModuleRedirect(Me); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleRedirectFactory; -} - +MODULE_INIT(ModuleRedirect)