X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmode.cpp;h=89ff37fa1e7fd0b709bd411c220abdf15cf6b1f4;hb=4c751dbbe8945e5efc230a59b0ed51c2ba10cf92;hp=7de334689509b3516df38f1349e60d96b14f7fa8;hpb=985c2bd1e6ea0bba467143406b83ba4a9f77fce1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/mode.cpp b/src/mode.cpp index 7de334689..89ff37fa1 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -1,79 +1,75 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2012 Shawn Smith + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007, 2009 Dennis Friis + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2004-2008 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ -/* $Core */ -/* $ExtraDeps: $(RELCPPFILES) */ -/* $ExtraObjects: modes/modeclasses.a */ -/* $ExtraBuild: @${MAKE} -C "modes" DIRNAME="src/modes" CC="$(CC)" $(MAKEARGS) CPPFILES="$(CPPFILES)" */ #include "inspircd.h" -#include "inspstring.h" /* +s (secret) */ -#include "modes/cmode_s.h" /* +p (private) */ -#include "modes/cmode_p.h" -/* +b (bans) */ -#include "modes/cmode_b.h" /* +m (moderated) */ -#include "modes/cmode_m.h" /* +t (only (half) ops can change topic) */ -#include "modes/cmode_t.h" /* +n (no external messages) */ -#include "modes/cmode_n.h" /* +i (invite only) */ -#include "modes/cmode_i.h" +/* +w (see wallops) */ +/* +i (invisible) */ +#include "modes/simplemodes.h" +/* +b (bans) */ +#include "modes/cmode_b.h" /* +k (keyed channel) */ #include "modes/cmode_k.h" /* +l (channel user limit) */ #include "modes/cmode_l.h" /* +o (channel op) */ #include "modes/cmode_o.h" -/* +h (channel halfop) */ -#include "modes/cmode_h.h" /* +v (channel voice) */ #include "modes/cmode_v.h" -/* +w (see wallops) */ -#include "modes/umode_w.h" -/* +i (invisible) */ -#include "modes/umode_i.h" /* +o (operator) */ #include "modes/umode_o.h" /* +s (server notice masks) */ #include "modes/umode_s.h" -ModeHandler::ModeHandler(InspIRCd* Instance, char modeletter, int parameters_on, int parameters_off, bool listmode, ModeType type, bool operonly, char mprefix, char prefixrequired) - : ServerInstance(Instance), mode(modeletter), n_params_on(parameters_on), n_params_off(parameters_off), list(listmode), m_type(type), oper(operonly), prefix(mprefix), count(0), prefixneeded(prefixrequired) +ModeHandler::ModeHandler(Module* Creator, const std::string& Name, char modeletter, ParamSpec Params, ModeType type) + : ServiceProvider(Creator, Name, SERVICE_MODE), m_paramtype(TR_TEXT), + parameters_taken(Params), mode(modeletter), prefix(0), oper(false), + list(false), m_type(type), levelrequired(HALFOP_VALUE) { } -ModeHandler::~ModeHandler() +CullResult ModeHandler::cull() { + if (ServerInstance->Modes) + ServerInstance->Modes->DelMode(this); + return classbase::cull(); } -bool ModeHandler::IsListMode() -{ - return list; -} - -char ModeHandler::GetNeededPrefix() +ModeHandler::~ModeHandler() { - return prefixneeded; } -void ModeHandler::SetNeededPrefix(char needsprefix) +bool ModeHandler::IsListMode() { - prefixneeded = needsprefix; + return list; } unsigned int ModeHandler::GetPrefixRank() @@ -81,59 +77,35 @@ unsigned int ModeHandler::GetPrefixRank() return 0; } -unsigned int ModeHandler::GetCount() +int ModeHandler::GetNumParams(bool adding) { + switch (parameters_taken) + { + case PARAM_ALWAYS: + return 1; + case PARAM_SETONLY: + return adding ? 1 : 0; + case PARAM_NONE: + break; + } return 0; } -void ModeHandler::ChangeCount(int modifier) -{ - count += modifier; - ServerInstance->Logs->Log("MODE", DEBUG,"Change count for mode %c is now %d", mode, count); -} - -ModeType ModeHandler::GetModeType() -{ - return m_type; -} - -bool ModeHandler::NeedsOper() -{ - return oper; -} - -char ModeHandler::GetPrefix() -{ - return prefix; -} - -int ModeHandler::GetNumParams(bool adding) +std::string ModeHandler::GetUserParameter(User* user) { - return adding ? n_params_on : n_params_off; + return ""; } -char ModeHandler::GetModeChar() +ModResult ModeHandler::AccessCheck(User*, Channel*, std::string &, bool) { - return mode; + return MOD_RES_PASSTHRU; } -ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool, bool) +ModeAction ModeHandler::OnModeChange(User*, User*, Channel*, std::string&, bool) { return MODEACTION_DENY; } -ModePair ModeHandler::ModeSet(User*, User* dest, Channel* channel, const std::string&) -{ - if (dest) - { - return std::make_pair(dest->IsModeSet(this->mode), ""); - } - else - { - return std::make_pair(channel->IsModeSet(this->mode), ""); - } -} - void ModeHandler::DisplayList(User*, Channel*) { } @@ -146,77 +118,69 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel) { } -bool ModeHandler::CheckTimeStamp(time_t theirs, time_t ours, const std::string&, const std::string&, Channel*) +bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*) { - return (ours < theirs); + return (theirs < ours); } -SimpleUserModeHandler::SimpleUserModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_USER, false) +ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { -} + /* We're either trying to add a mode we already have or + remove a mode we don't have, deny. */ + if (dest->IsModeSet(this->GetModeChar()) == adding) + return MODEACTION_DENY; -SimpleUserModeHandler::~SimpleUserModeHandler() -{ -} + /* adding will be either true or false, depending on if we + are adding or removing the mode, since we already checked + to make sure we aren't adding a mode we have or that we + aren't removing a mode we don't have, we don't have to do any + other checks here to see if it's true or false, just add or + remove the mode */ + dest->SetMode(this->GetModeChar(), adding); -SimpleChannelModeHandler::~SimpleChannelModeHandler() -{ + return MODEACTION_ALLOW; } -SimpleChannelModeHandler::SimpleChannelModeHandler(InspIRCd* Instance, char modeletter) : ModeHandler(Instance, modeletter, 0, 0, false, MODETYPE_CHANNEL, false) -{ -} -ModeAction SimpleUserModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) +ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - /* Only opers can change other users modes */ - if (source != dest) + /* We're either trying to add a mode we already have or + remove a mode we don't have, deny. */ + if (channel->IsModeSet(this->GetModeChar()) == adding) return MODEACTION_DENY; - if (adding) - { - if (!dest->IsModeSet(this->GetModeChar())) - { - dest->SetMode(this->GetModeChar(),true); - return MODEACTION_ALLOW; - } - } - else - { - if (dest->IsModeSet(this->GetModeChar())) - { - dest->SetMode(this->GetModeChar(),false); - return MODEACTION_ALLOW; - } - } + /* adding will be either true or false, depending on if we + are adding or removing the mode, since we already checked + to make sure we aren't adding a mode we have or that we + aren't removing a mode we don't have, we don't have to do any + other checks here to see if it's true or false, just add or + remove the mode */ + channel->SetMode(this->GetModeChar(), adding); - return MODEACTION_DENY; + return MODEACTION_ALLOW; } - -ModeAction SimpleChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) +ModeAction ParamChannelModeHandler::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { + if (adding && !ParamValidate(parameter)) + return MODEACTION_DENY; + std::string now = channel->GetModeParameter(this); + if (parameter == now) + return MODEACTION_DENY; if (adding) - { - if (!channel->IsModeSet(this->GetModeChar())) - { - channel->SetMode(this->GetModeChar(),true); - return MODEACTION_ALLOW; - } - } + channel->SetModeParam(this, parameter); else - { - if (channel->IsModeSet(this->GetModeChar())) - { - channel->SetMode(this->GetModeChar(),false); - return MODEACTION_ALLOW; - } - } + channel->SetModeParam(this, ""); + return MODEACTION_ALLOW; +} - return MODEACTION_DENY; +bool ParamChannelModeHandler::ParamValidate(std::string& parameter) +{ + return true; } -ModeWatcher::ModeWatcher(InspIRCd* Instance, char modeletter, ModeType type) : ServerInstance(Instance), mode(modeletter), m_type(type) +ModeWatcher::ModeWatcher(Module* Creator, char modeletter, ModeType type) + : mode(modeletter), m_type(type), creator(Creator) { } @@ -234,12 +198,12 @@ ModeType ModeWatcher::GetModeType() return m_type; } -bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType, bool) +bool ModeWatcher::BeforeMode(User*, User*, Channel*, std::string&, bool, ModeType) { return true; } -void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType, bool) +void ModeWatcher::AfterMode(User*, User*, Channel*, const std::string&, bool, ModeType) { } @@ -259,66 +223,6 @@ User* ModeParser::SanityChecks(User *user, const char *dest, Channel *chan, int) return d; } -const char* ModeParser::Grant(User *d,Channel *chan,int MASK) -{ - if (!chan) - return ""; - - UCListIter n = d->chans.find(chan); - if (n != d->chans.end()) - { - if (n->second & MASK) - { - return ""; - } - n->second = n->second | MASK; - switch (MASK) - { - case UCMODE_OP: - n->first->AddOppedUser(d); - break; - case UCMODE_HOP: - n->first->AddHalfoppedUser(d); - break; - case UCMODE_VOICE: - n->first->AddVoicedUser(d); - break; - } - return d->nick.c_str(); - } - return ""; -} - -const char* ModeParser::Revoke(User *d,Channel *chan,int MASK) -{ - if (!chan) - return ""; - - UCListIter n = d->chans.find(chan); - if (n != d->chans.end()) - { - if ((n->second & MASK) == 0) - { - return ""; - } - n->second ^= MASK; - switch (MASK) - { - case UCMODE_OP: - n->first->DelOppedUser(d); - break; - case UCMODE_HOP: - n->first->DelHalfoppedUser(d); - break; - case UCMODE_VOICE: - n->first->DelVoicedUser(d); - break; - } - return d->nick.c_str(); - } - return ""; -} - void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targetchannel, const char* text) { if (targetchannel) @@ -328,15 +232,9 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ user->WriteNumeric(RPL_CHANNELCREATED, "%s %s %lu", user->nick.c_str(), targetchannel->name.c_str(), (unsigned long)targetchannel->age); return; } - else if (targetuser) + else { - if (targetuser->Visibility && !targetuser->Visibility->VisibleTo(user)) - { - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text); - return; - } - - if ((targetuser == user) || (IS_OPER(user))) + if (targetuser == user || user->HasPrivPermission("users/auspex")) { /* Display user's current mode string */ user->WriteNumeric(RPL_UMODEIS, "%s :+%s",targetuser->nick.c_str(),targetuser->FormatModes()); @@ -346,442 +244,357 @@ void ModeParser::DisplayCurrentModes(User *user, User* targetuser, Channel* targ } else { - user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str()); + user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't view modes for other users", user->nick.c_str()); return; } } - - /* No such nick/channel */ - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), text); - return; } -void ModeParser::Process(const std::vector& parameters, User *user, bool servermode) +ModeAction ModeParser::TryMode(User* user, User* targetuser, Channel* chan, bool adding, const unsigned char modechar, + std::string ¶meter, bool SkipACL) { - std::string target = parameters[0]; - ModeType type = MODETYPE_USER; - unsigned char mask = 0; - Channel* targetchannel = ServerInstance->FindChan(parameters[0]); - User* targetuser = ServerInstance->FindNick(parameters[0]); - - LastParse.clear(); + ModeType type = chan ? MODETYPE_CHANNEL : MODETYPE_USER; + unsigned char mask = chan ? MASK_CHANNEL : MASK_USER; - /* Special case for displaying the list for listmodes, - * e.g. MODE #chan b, or MODE #chan +b without a parameter - */ - if ((targetchannel) && (parameters.size() == 2)) - { - const char* mode = parameters[1].c_str(); - int nonlistmodes_found = 0; + ModeHandler *mh = FindMode(modechar, type); + int pcnt = mh->GetNumParams(adding); - seq++; + // crop mode parameter size to 250 characters + if (parameter.length() > 250 && adding) + parameter = parameter.substr(0, 250); - mask = MASK_CHANNEL; - - while (mode && *mode) - { - unsigned char mletter = *mode; + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, modechar, parameter, adding, pcnt)); - if (*mode == '+') - { - mode++; - continue; - } - - /* Ensure the user doesnt request the same mode twice, - * so they cant flood themselves off out of idiocy. - */ - if (sent[mletter] != seq) - { - sent[mletter] = seq; - } - else - { - mode++; - continue; - } + if (IS_LOCAL(user) && (MOD_RESULT == MOD_RES_DENY)) + return MODEACTION_DENY; - ModeHandler *mh = this->FindMode(*mode, MODETYPE_CHANNEL); - bool display = true; + if (chan && !SkipACL && (MOD_RESULT != MOD_RES_ALLOW)) + { + MOD_RESULT = mh->AccessCheck(user, chan, parameter, adding); - if ((mh) && (mh->IsListMode())) + if (MOD_RESULT == MOD_RES_DENY) + return MODEACTION_DENY; + if (MOD_RESULT == MOD_RES_PASSTHRU) + { + unsigned int neededrank = mh->GetLevelRequired(); + /* Compare our rank on the channel against the rank of the required prefix, + * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown + * in NAMES(X) are not in rank order, we know the most powerful mode is listed + * first, so we don't need to iterate, we just look up the first instead. + */ + unsigned int ourrank = chan->GetPrefixValue(user); + if (ourrank < neededrank) { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, *mode, "", true, 0)); - if (MOD_RESULT == ACR_DENY) - { - mode++; - continue; - } - - if (!IS_OPER(user)) + ModeHandler* neededmh = NULL; + for(char c='A'; c <= 'z'; c++) { - if (ServerInstance->Config->HideModeLists[mletter] && (targetchannel->GetStatus(user) < STATUS_HOP)) + ModeHandler *privmh = FindMode(c, MODETYPE_CHANNEL); + if (privmh && privmh->GetPrefixRank() >= neededrank) { - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only half-operators and above may view the +%c list",user->nick.c_str(), targetchannel->name.c_str(), *mode++); - mh->DisplayEmptyList(user, targetchannel); - continue; + // this mode is sufficient to allow this action + if (!neededmh || privmh->GetPrefixRank() < neededmh->GetPrefixRank()) + neededmh = privmh; } } + if (neededmh) + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel %s access or above to %sset channel mode %c", + user->nick.c_str(), chan->name.c_str(), neededmh->name.c_str(), adding ? "" : "un", modechar); + else + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You cannot %sset channel mode %c", + user->nick.c_str(), chan->name.c_str(), adding ? "" : "un", modechar); + return MODEACTION_DENY; + } + } + } - /** See below for a description of what craq this is :D - */ - unsigned char handler_id = (*mode - 65) | mask; + unsigned char handler_id = (modechar - 'A') | mask; - for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - { - std::string dummyparam; - - if (!((*watchers)->BeforeMode(user, NULL, targetchannel, dummyparam, true, MODETYPE_CHANNEL))) - display = false; - } + for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) + { + if ((*watchers)->BeforeMode(user, targetuser, chan, parameter, adding, type) == false) + return MODEACTION_DENY; + /* A module whacked the parameter completely, and there was one. abort. */ + if (pcnt && parameter.empty()) + return MODEACTION_DENY; + } - if (display) - mh->DisplayList(user, targetchannel); - } - else - nonlistmodes_found++; + if (IS_LOCAL(user) && !IS_OPER(user)) + { + char* disabled = (type == MODETYPE_CHANNEL) ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes; + if (disabled[modechar - 'A']) + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - %s mode %c has been locked by the administrator", + user->nick.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar); + return MODEACTION_DENY; + } + } - mode++; + if (adding && IS_LOCAL(user) && mh->NeedsOper() && !user->HasModePermission(modechar, type)) + { + /* It's an oper only mode, and they don't have access to it. */ + if (IS_OPER(user)) + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c", + user->nick.c_str(), user->oper->NameStr(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar); + } + else + { + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c", + user->nick.c_str(), type == MODETYPE_CHANNEL ? "channel" : "user", modechar); } + return MODEACTION_DENY; + } - /* We didnt have any modes that were non-list, we can return here */ - if (!nonlistmodes_found) - return; + if (mh->GetTranslateType() == TR_NICK) + { + User* prefixtarget; + if (IS_LOCAL(user)) + prefixtarget = ServerInstance->FindNickOnly(parameter); + else + prefixtarget = ServerInstance->FindNick(parameter); + + if (!prefixtarget) + { + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), parameter.c_str()); + return MODEACTION_DENY; + } + } + + if (mh->GetPrefixRank() && chan) + { + User* user_to_prefix = ServerInstance->FindNick(parameter); + if (!user_to_prefix) + return MODEACTION_DENY; + if (!chan->SetPrefix(user_to_prefix, modechar, adding)) + return MODEACTION_DENY; } + /* Call the handler for the mode */ + ModeAction ma = mh->OnModeChange(user, targetuser, chan, parameter, adding); + + if (pcnt && parameter.empty()) + return MODEACTION_DENY; + + if (ma != MODEACTION_ALLOW) + return ma; + + for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) + (*watchers)->AfterMode(user, targetuser, chan, parameter, adding, type); + + return MODEACTION_ALLOW; +} + +void ModeParser::Process(const std::vector& parameters, User *user, bool merge) +{ + const std::string& target = parameters[0]; + Channel* targetchannel = ServerInstance->FindChan(target); + User* targetuser = NULL; + if (!targetchannel) + { + if (IS_LOCAL(user)) + targetuser = ServerInstance->FindNickOnly(target); + else + targetuser = ServerInstance->FindNick(target); + } + ModeType type = targetchannel ? MODETYPE_CHANNEL : MODETYPE_USER; + + LastParse.clear(); + LastParseParams.clear(); + LastParseTranslate.clear(); + + if ((!targetchannel) && ((!targetuser) || (IS_SERVER(targetuser)))) + { + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(),target.c_str()); + return; + } if (parameters.size() == 1) { - this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0].c_str()); + this->DisplayCurrentModes(user, targetuser, targetchannel, target.c_str()); + return; } - else if (parameters.size() > 1) + + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnPreMode, MOD_RESULT, (user, targetuser, targetchannel, parameters)); + + bool SkipAccessChecks = false; + + if (!IS_LOCAL(user) || ServerInstance->ULine(user->server) || MOD_RESULT == MOD_RES_ALLOW) + SkipAccessChecks = true; + else if (MOD_RESULT == MOD_RES_DENY) + return; + + if (targetuser && !SkipAccessChecks && user != targetuser) { - bool SkipAccessChecks = false; + user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str()); + return; + } - if (targetchannel) + std::string mode_sequence = parameters[1]; + + std::string output_mode; + std::ostringstream output_parameters; + LastParseParams.push_back(output_mode); + LastParseTranslate.push_back(TR_TEXT); + + bool adding = true; + char output_pm = '\0'; // current output state, '+' or '-' + unsigned int param_at = 2; + + for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) + { + unsigned char modechar = *letter; + if (modechar == '+' || modechar == '-') { - type = MODETYPE_CHANNEL; - mask = MASK_CHANNEL; + adding = (modechar == '+'); + continue; + } - /* Extra security checks on channel modes - * (e.g. are they a (half)op? - */ + ModeHandler *mh = this->FindMode(modechar, type); + if (!mh) + { + /* No mode handler? Unknown mode character then. */ + user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar); + continue; + } - if ((IS_LOCAL(user)) && (!ServerInstance->ULine(user->server)) && (!servermode)) + std::string parameter; + int pcnt = mh->GetNumParams(adding); + if (pcnt && param_at == parameters.size()) + { + /* No parameter, continue to the next mode */ + mh->OnParameterMissing(user, targetuser, targetchannel); + continue; + } + else if (pcnt) + { + parameter = parameters[param_at++]; + /* Make sure the user isn't trying to slip in an invalid parameter */ + if ((parameter.empty()) || (parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos)) + continue; + if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode()) { - /* We don't have halfop */ - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user, NULL, targetchannel, AC_GENERAL_MODE)); - if (MOD_RESULT == ACR_DENY) - return; - SkipAccessChecks = (MOD_RESULT == ACR_ALLOW); + std::string ours = targetchannel->GetModeParameter(modechar); + if (!mh->ResolveModeConflict(parameter, ours, targetchannel)) + /* we won the mode merge, don't apply this mode */ + continue; } } - else if (targetuser) + + ModeAction ma = TryMode(user, targetuser, targetchannel, adding, modechar, parameter, SkipAccessChecks); + + if (ma != MODEACTION_ALLOW) + continue; + + char needed_pm = adding ? '+' : '-'; + if (needed_pm != output_pm) + { + output_pm = needed_pm; + output_mode.append(1, output_pm); + } + output_mode.append(1, modechar); + + if (pcnt) { - type = MODETYPE_USER; - mask = MASK_USER; - if ((user != targetuser) && (!ServerInstance->ULine(user->server))) + TranslateType tt = mh->GetTranslateType(); + if (tt == TR_NICK) { - user->WriteNumeric(ERR_USERSDONTMATCH, "%s :Can't change mode for other users", user->nick.c_str()); - return; + User* u = ServerInstance->FindNick(parameter); + if (u) + parameter = u->nick; } + output_parameters << " " << parameter; + LastParseParams.push_back(parameter); + LastParseTranslate.push_back(tt); } - else + + if ( (output_mode.length() + output_parameters.str().length() > 450) + || (output_mode.length() > 100) + || (LastParseParams.size() > ServerInstance->Config->Limits.MaxModes)) { - /* No such nick/channel */ - user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel",user->nick.c_str(), parameters[0].c_str()); - return; + /* mode sequence is getting too long */ + break; } + } - std::string mode_sequence = parameters[1]; - std::string parameter; - std::ostringstream parameter_list; - std::string output_sequence; - bool adding = true, state_change = false; - unsigned char handler_id = 0; - unsigned int parameter_counter = 2; /* Index of first parameter */ - unsigned int parameter_count = 0; - bool last_successful_state_change = false; - - /* A mode sequence that doesnt start with + or -. Assume +. - Thanks for the suggestion spike (bug#132) */ - if ((*mode_sequence.begin() != '+') && (*mode_sequence.begin() != '-')) - mode_sequence.insert(0, "+"); - - for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) + LastParseParams[0] = output_mode; + + if (!output_mode.empty()) + { + LastParse = targetchannel ? targetchannel->name : targetuser->nick; + LastParse.append(" "); + LastParse.append(output_mode); + LastParse.append(output_parameters.str()); + + if (targetchannel) { - unsigned char modechar = *letter; + targetchannel->WriteChannel(user, "MODE %s", LastParse.c_str()); + FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, LastParseParams, LastParseTranslate)); + } + else + { + targetuser->WriteFrom(user, "MODE %s", LastParse.c_str()); + FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, LastParseParams, LastParseTranslate)); + } + } + else if (targetchannel && parameters.size() == 2) + { + /* Special case for displaying the list for listmodes, + * e.g. MODE #chan b, or MODE #chan +b without a parameter + */ + this->DisplayListModes(user, targetchannel, mode_sequence); + } +} - switch (modechar) - { - /* NB: - * For + and - mode characters, we don't just stick the character into the output sequence. - * This is because the user may do something dumb, like: +-+ooo or +oo-+. To prevent this - * appearing in the output sequence, we store a flag which says there was a state change, - * which is set on any + or -, however, the + or - that we finish on is only appended to - * the output stream in the event it is followed by a non "+ or -" character, such as o or v. - */ - case '+': - /* The following expression prevents: +o+o nick nick, compressing it to +oo nick nick, - * however, will allow the + if it is the first item in the sequence, regardless. - */ - if ((!adding) || (!output_sequence.length())) - state_change = true; - adding = true; - if (!output_sequence.length()) - last_successful_state_change = false; - continue; - break; - case '-': - if ((adding) || (!output_sequence.length())) - state_change = true; - adding = false; - if (!output_sequence.length()) - last_successful_state_change = true; - continue; - break; - default: - - /** - * Watch carefully for the sleight of hand trick. - * 65 is the ascii value of 'A'. We take this from - * the char we're looking at to get a number between - * 1 and 127. We then logic-or it to get the hashed - * position, dependent on wether its a channel or - * a user mode. This is a little stranger, but a lot - * faster, than using a map of pairs. - */ - handler_id = (modechar - 65) | mask; - - if (modehandlers[handler_id]) - { - bool abort = false; +void ModeParser::DisplayListModes(User* user, Channel* chan, std::string &mode_sequence) +{ + seq++; - if (modehandlers[handler_id]->GetModeType() == type) - { - int MOD_RESULT = 0; - - if (modehandlers[handler_id]->GetNumParams(adding)) - { - /* This mode expects a parameter, do we have any parameters left in our list to use? */ - if (parameter_counter < parameters.size()) - { - parameter = parameters[parameter_counter++]; - - /* Yerk, invalid! */ - if ((parameter.find(':') == 0) || (parameter.rfind(' ') != std::string::npos)) - parameter.clear(); - } - else - { - /* No parameter, continue to the next mode */ - modehandlers[handler_id]->OnParameterMissing(user, targetuser, targetchannel); - continue; - } - - FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, parameter, adding, 1, servermode)); - } - else - { - FOREACH_RESULT(I_OnRawMode, OnRawMode(user, targetchannel, modechar, "", adding, 0, servermode)); - } - - if (IS_LOCAL(user) && (MOD_RESULT == ACR_DENY)) - continue; - - if (!SkipAccessChecks && IS_LOCAL(user) && (MOD_RESULT != ACR_ALLOW)) - { - /* Check access to this mode character */ - if ((type == MODETYPE_CHANNEL) && (modehandlers[handler_id]->GetNeededPrefix())) - { - char needed = modehandlers[handler_id]->GetNeededPrefix(); - ModeHandler* prefixmode = FindPrefix(needed); - - /* If the mode defined by the handler is not '\0', but the handler for it - * cannot be found, they probably dont have the right module loaded to implement - * the prefix they want to compare the mode against, e.g. '&' for m_chanprotect. - * Revert to checking against the minimum core prefix, '%'. - */ - if (needed && !prefixmode) - prefixmode = FindPrefix('%'); - - unsigned int neededrank = prefixmode->GetPrefixRank(); - /* Compare our rank on the channel against the rank of the required prefix, - * allow if >= ours. Because mIRC and xchat throw a tizz if the modes shown - * in NAMES(X) are not in rank order, we know the most powerful mode is listed - * first, so we don't need to iterate, we just look up the first instead. - */ - std::string modestring = targetchannel->GetAllPrefixChars(user); - char ml = (modestring.empty() ? '\0' : modestring[0]); - ModeHandler* ourmode = FindPrefix(ml); - if (!ourmode || ourmode->GetPrefixRank() < neededrank) - { - /* Bog off */ - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must have channel privilege %c or above to %sset channel mode %c", - user->nick.c_str(), targetchannel->name.c_str(), needed, adding ? "" : "un", modechar); - continue; - } - } - } - - bool had_parameter = !parameter.empty(); - - for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - { - if ((*watchers)->BeforeMode(user, targetuser, targetchannel, parameter, adding, type, servermode) == false) - { - abort = true; - break; - } - /* A module whacked the parameter completely, and there was one. abort. */ - if ((had_parameter) && (parameter.empty())) - { - abort = true; - break; - } - } - - if (abort) - continue; - - /* If it's disabled, they have to be an oper. - */ - if (IS_LOCAL(user) && !IS_OPER(user) && ((type == MODETYPE_CHANNEL ? ServerInstance->Config->DisabledCModes : ServerInstance->Config->DisabledUModes)[modehandlers[handler_id]->GetModeChar() - 'A'])) - { - user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - %s mode %c has been locked by the administrator", - user->nick.c_str(), - type == MODETYPE_CHANNEL ? "channel" : "user", - modehandlers[handler_id]->GetModeChar()); - continue; - } - - /* It's an oper only mode, check if theyre an oper. If they arent, - * eat any parameter that came with the mode, and continue to next - */ - if (adding && (IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!user->HasModePermission(modehandlers[handler_id]->GetModeChar(), type))) - { - if (IS_OPER(user)) - { - user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to set %s mode %c", - user->nick.c_str(), - user->oper.c_str(), - type == MODETYPE_CHANNEL ? "channel" : "user", - modehandlers[handler_id]->GetModeChar()); - } - else - { - user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Only operators may set %s mode %c", - user->nick.c_str(), - type == MODETYPE_CHANNEL ? "channel" : "user", - modehandlers[handler_id]->GetModeChar()); - } - continue; - } - - /* Call the handler for the mode */ - ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding, servermode); - - if ((modehandlers[handler_id]->GetNumParams(adding)) && (parameter.empty())) - { - /* The handler nuked the parameter and they are supposed to have one. - * We CANT continue now, even if they actually returned MODEACTION_ALLOW, - * so we bail to the next mode character. - */ - continue; - } - - if (ma == MODEACTION_ALLOW) - { - /* We're about to output a valid mode letter - was there previously a pending state-change? */ - if (state_change) - { - if (adding != last_successful_state_change) - output_sequence.append(adding ? "+" : "-"); - last_successful_state_change = adding; - } - - /* Add the mode letter */ - output_sequence.push_back(modechar); - - modehandlers[handler_id]->ChangeCount(adding ? 1 : -1); - - /* Is there a valid parameter for this mode? If so add it to the parameter list */ - if ((modehandlers[handler_id]->GetNumParams(adding)) && (!parameter.empty())) - { - parameter_list << " " << parameter; - parameter_count++; - /* Does this mode have a prefix? */ - if (modehandlers[handler_id]->GetPrefix() && targetchannel) - { - User* user_to_prefix = ServerInstance->FindNick(parameter); - if (user_to_prefix) - targetchannel->SetPrefix(user_to_prefix, modehandlers[handler_id]->GetPrefix(), - modehandlers[handler_id]->GetPrefixRank(), adding); - } - } - - /* Call all the AfterMode events in the mode watchers for this mode */ - for (ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) - (*watchers)->AfterMode(user, targetuser, targetchannel, parameter, adding, type, servermode); - - /* Reset the state change flag */ - state_change = false; - - if ((output_sequence.length() + parameter_list.str().length() > 450) || (output_sequence.length() > 100) - || (parameter_count > ServerInstance->Config->Limits.MaxModes)) - { - /* We cant have a mode sequence this long */ - letter = mode_sequence.end() - 1; - continue; - } - } - } - } - else - { - /* No mode handler? Unknown mode character then. */ - user->WriteServ("%d %s %c :is unknown mode char to me", type == MODETYPE_CHANNEL ? 472 : 501, user->nick.c_str(), modechar); - } - break; - } + for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++) + { + unsigned char mletter = *letter; + if (mletter == '+') + continue; + + /* Ensure the user doesnt request the same mode twice, + * so they cant flood themselves off out of idiocy. + */ + if (sent[mletter] == seq) + continue; + + sent[mletter] = seq; + + ModeHandler *mh = this->FindMode(mletter, MODETYPE_CHANNEL); + + if (!mh || !mh->IsListMode()) + return; + + ModResult MOD_RESULT; + FIRST_MOD_RESULT(OnRawMode, MOD_RESULT, (user, chan, mletter, "", true, 0)); + if (MOD_RESULT == MOD_RES_DENY) + continue; + + bool display = true; + if (!user->HasPrivPermission("channels/auspex") && ServerInstance->Config->HideModeLists[mletter] && (chan->GetPrefixValue(user) < HALFOP_VALUE)) + { + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You do not have access to view the +%c list", + user->nick.c_str(), chan->name.c_str(), mletter); + display = false; } - /* Was there at least one valid mode in the sequence? */ - if (!output_sequence.empty()) + unsigned char handler_id = (mletter - 'A') | MASK_CHANNEL; + + for(ModeWatchIter watchers = modewatchers[handler_id].begin(); watchers != modewatchers[handler_id].end(); watchers++) { - if (servermode) - { - if (type == MODETYPE_CHANNEL) - { - targetchannel->WriteChannelWithServ(ServerInstance->Config->ServerName, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str()); - this->LastParse = targetchannel->name; - } - else - { - targetuser->WriteServ("MODE %s %s%s",targetuser->nick.c_str(),output_sequence.c_str(), parameter_list.str().c_str()); - this->LastParse = targetuser->nick; - } - } - else - { - if (type == MODETYPE_CHANNEL) - { - targetchannel->WriteChannel(user, "MODE %s %s%s", targetchannel->name.c_str(), output_sequence.c_str(), parameter_list.str().c_str()); - FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str())); - this->LastParse = targetchannel->name; - } - else - { - user->WriteTo(targetuser, "MODE %s %s%s", targetuser->nick.c_str(), output_sequence.c_str(), parameter_list.str().c_str()); - FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence + parameter_list.str())); - this->LastParse = targetuser->nick; - } - } + std::string dummyparam; - LastParse.append(" "); - LastParse.append(output_sequence); - LastParse.append(parameter_list.str()); + if (!((*watchers)->BeforeMode(user, NULL, chan, dummyparam, true, MODETYPE_CHANNEL))) + display = false; } + if (display) + mh->DisplayList(user, chan); + else + mh->DisplayEmptyList(user, chan); } } @@ -845,6 +658,9 @@ bool ModeParser::AddMode(ModeHandler* mh) if ((mh->GetPrefix() == ',') || (mh->GetPrefix() == ':') || (mh->GetPrefix() == '#')) return false; + if (mh->GetPrefix() && FindPrefix(mh->GetPrefix())) + return false; + mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; pos = (mh->GetModeChar()-65) | mask; @@ -866,7 +682,7 @@ bool ModeParser::DelMode(ModeHandler* mh) mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; pos = (mh->GetModeChar()-65) | mask; - if (!modehandlers[pos]) + if (modehandlers[pos] != mh) return false; /* Note: We can't stack here, as we have modes potentially being removed across many different channels. @@ -875,15 +691,20 @@ bool ModeParser::DelMode(ModeHandler* mh) switch (mh->GetModeType()) { case MODETYPE_USER: - for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++) + for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); ) { - mh->RemoveMode(i->second); + User* user = i->second; + ++i; + mh->RemoveMode(user); } break; case MODETYPE_CHANNEL: - for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++) + for (chan_hash::iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); ) { - mh->RemoveMode(i->second); + // The channel may not be in the hash after RemoveMode(), see m_permchannels + Channel* chan = i->second; + ++i; + mh->RemoveMode(chan); } break; } @@ -930,9 +751,6 @@ std::string ModeParser::ChannelModeList() for (unsigned char mode = 'A'; mode <= 'z'; mode++) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - unsigned char pos = (mode-65) | MASK_CHANNEL; if (modehandlers[pos]) @@ -949,9 +767,6 @@ std::string ModeParser::ParaModeList() for (unsigned char mode = 'A'; mode <= 'z'; mode++) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - unsigned char pos = (mode-65) | MASK_CHANNEL; if ((modehandlers[pos]) && (modehandlers[pos]->GetNumParams(true))) @@ -975,41 +790,7 @@ ModeHandler* ModeParser::FindPrefix(unsigned const char pfxletter) return NULL; } -std::string ModeParser::ModeString(User* user, Channel* channel, bool nick_suffix) -{ - std::string types; - std::string pars; - - if (!channel || !user) - return ""; - - for (unsigned char mode = 'A'; mode <= 'z'; mode++) - { - unsigned char pos = (mode-65) | MASK_CHANNEL; - ModeHandler* mh = modehandlers[pos]; - if ((mh) && (mh->GetNumParams(true)) && (mh->GetNumParams(false))) - { - ModePair ret; - ret = mh->ModeSet(NULL, user, channel, user->nick); - if ((ret.first) && (ret.second == user->nick)) - { - if (nick_suffix) - { - pars.append(" "); - pars.append(user->nick); - } - types.push_back(mh->GetModeChar()); - } - } - } - - if (nick_suffix) - return types+pars; - else - return types; -} - -std::string ModeParser::ChanModes() +std::string ModeParser::GiveModeList(ModeMasks m) { std::string type1; /* Listmodes EXCEPT those with a prefix */ std::string type2; /* Modes that take a param when adding or removing */ @@ -1018,13 +799,10 @@ std::string ModeParser::ChanModes() for (unsigned char mode = 'A'; mode <= 'z'; mode++) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - - unsigned char pos = (mode-65) | MASK_CHANNEL; + unsigned char pos = (mode-65) | m; /* One parameter when adding */ if (modehandlers[pos]) - { + { if (modehandlers[pos]->GetNumParams(true)) { if ((modehandlers[pos]->IsListMode()) && (!modehandlers[pos]->GetPrefix())) @@ -1054,47 +832,35 @@ std::string ModeParser::ChanModes() type4 += modehandlers[pos]->GetModeChar(); } } - } return type1 + "," + type2 + "," + type3 + "," + type4; } -bool ModeParser::PrefixComparison(prefixtype one, prefixtype two) -{ - return one.second > two.second; -} - -std::string ModeParser::BuildPrefixes() +std::string ModeParser::BuildPrefixes(bool lettersAndModes) { std::string mletters; std::string mprefixes; - pfxcontainer pfx; - std::map prefix_to_mode; + std::map > prefixes; for (unsigned char mode = 'A'; mode <= 'z'; mode++) { - if ((!ServerInstance->Config->AllowHalfop) && (mode == 'h')) - continue; - unsigned char pos = (mode-65) | MASK_CHANNEL; if ((modehandlers[pos]) && (modehandlers[pos]->GetPrefix())) { - pfx.push_back(std::make_pair(modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetPrefixRank())); - prefix_to_mode[modehandlers[pos]->GetPrefix()] = modehandlers[pos]->GetModeChar(); + prefixes[modehandlers[pos]->GetPrefixRank()] = std::make_pair( + modehandlers[pos]->GetPrefix(), modehandlers[pos]->GetModeChar()); } } - sort(pfx.begin(), pfx.end(), ModeParser::PrefixComparison); - - for (pfxcontainer::iterator n = pfx.begin(); n != pfx.end(); n++) + for(std::map >::reverse_iterator n = prefixes.rbegin(); n != prefixes.rend(); n++) { - mletters = mletters + n->first; - mprefixes = mprefixes + prefix_to_mode.find(n->first)->second; + mletters = mletters + n->second.first; + mprefixes = mprefixes + n->second.second; } - return "(" + mprefixes + ")" + mletters; + return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters; } bool ModeParser::AddModeWatcher(ModeWatcher* mw) @@ -1130,7 +896,7 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL; pos = (mw->GetModeChar()-65) | mask; - ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); + ModeWatchIter a = std::find(modewatchers[pos].begin(),modewatchers[pos].end(),mw); if (a == modewatchers[pos].end()) { @@ -1146,9 +912,6 @@ bool ModeParser::DelModeWatcher(ModeWatcher* mw) */ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) { - char moderemove[MAXBUF]; - std::vector parameters; - if (user->IsModeSet(this->GetModeChar())) { if (stack) @@ -1157,10 +920,11 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) } else { - sprintf(moderemove,"-%c",this->GetModeChar()); + std::vector parameters; parameters.push_back(user->nick); - parameters.push_back(moderemove); - ServerInstance->Parser->CallHandler("MODE", parameters, user); + parameters.push_back("-"); + parameters[1].push_back(this->GetModeChar()); + ServerInstance->Modes->Process(parameters, ServerInstance->FakeClient); } } } @@ -1170,9 +934,6 @@ void ModeHandler::RemoveMode(User* user, irc::modestacker* stack) */ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) { - char moderemove[MAXBUF]; - std::vector parameters; - if (channel->IsModeSet(this->GetModeChar())) { if (stack) @@ -1181,47 +942,72 @@ void ModeHandler::RemoveMode(Channel* channel, irc::modestacker* stack) } else { - sprintf(moderemove,"-%c",this->GetModeChar()); + std::vector parameters; parameters.push_back(channel->name); - parameters.push_back(moderemove); + parameters.push_back("-"); + parameters[1].push_back(this->GetModeChar()); ServerInstance->SendMode(parameters, ServerInstance->FakeClient); } } } -ModeParser::ModeParser(InspIRCd* Instance) : ServerInstance(Instance) +struct builtin_modes { - ModeHandler* modes[] = + ModeChannelSecret s; + ModeChannelPrivate p; + ModeChannelModerated m; + ModeChannelTopicOps t; + + ModeChannelNoExternal n; + ModeChannelInviteOnly i; + ModeChannelKey k; + ModeChannelLimit l; + + ModeChannelBan b; + ModeChannelOp o; + ModeChannelVoice v; + + ModeUserWallops uw; + ModeUserInvisible ui; + ModeUserOperator uo; + ModeUserServerNoticeMask us; + + void init(ModeParser* modes) { - new ModeChannelSecret(Instance), - new ModeChannelPrivate(Instance), - new ModeChannelModerated(Instance), - new ModeChannelTopicOps(Instance), - new ModeChannelNoExternal(Instance), - new ModeChannelInviteOnly(Instance), - new ModeChannelKey(Instance), - new ModeChannelLimit(Instance), - new ModeChannelBan(Instance), - new ModeChannelOp(Instance), - new ModeChannelHalfOp(Instance), - new ModeChannelVoice(Instance), - new ModeUserWallops(Instance), - new ModeUserInvisible(Instance), - new ModeUserOperator(Instance), - new ModeUserServerNoticeMask(Instance), - NULL - }; + modes->AddMode(&s); + modes->AddMode(&p); + modes->AddMode(&m); + modes->AddMode(&t); + modes->AddMode(&n); + modes->AddMode(&i); + modes->AddMode(&k); + modes->AddMode(&l); + modes->AddMode(&b); + modes->AddMode(&o); + modes->AddMode(&v); + modes->AddMode(&uw); + modes->AddMode(&ui); + modes->AddMode(&uo); + modes->AddMode(&us); + } +}; +static builtin_modes static_modes; + +ModeParser::ModeParser() +{ /* Clear mode handler list */ memset(modehandlers, 0, sizeof(modehandlers)); /* Last parse string */ LastParse.clear(); - /* Initialise the RFC mode letters */ - for (int index = 0; modes[index]; index++) - this->AddMode(modes[index]); - seq = 0; memset(&sent, 0, sizeof(sent)); + + static_modes.init(this); +} + +ModeParser::~ModeParser() +{ }