X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=35aada548955469b9104fbb8318f3e25938b47f0;hb=efe77ba63b1e519fc4d563bd9b599277c4bd96e5;hp=53008eb54a1382cf20ea9e3d3c0c3ca840264d5c;hpb=0276e5138a8f886fe709ffed534aaf5ff826b5be;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands.cpp b/src/commands.cpp index 53008eb54..35aada548 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -1,20 +1,27 @@ -/* +------------------------------------+ - * | 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) 2009 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2004-2007 Craig Edwards + * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2005 Craig McLure * - * 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: libIRCDcommands */ #include "inspircd.h" -#include "wildcard.h" #include "xline.h" #include "command_parse.h" @@ -22,18 +29,19 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) { - char itrigger[MAXBUF]; long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0)) + + ConfigTag* insane = Config->ConfValue("insane"); + + if (insane->getBool("hostmasks")) return false; - + + float itrigger = insane->getFloat("trigger", 95.5); + for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if ((match(u->second->MakeHost(), mask, true)) || (match(u->second->MakeHostIP(), mask, true))) + if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) || + (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map))) { matches++; } @@ -43,9 +51,9 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) return false; float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100; - if (percent > (float)atof(itrigger)) + if (percent > itrigger) { - SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent); + SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),mask.c_str(),percent); return true; } return false; @@ -53,18 +61,18 @@ bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) { - char itrigger[MAXBUF]; long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0)) + + ConfigTag* insane = Config->ConfValue("insane"); + + if (insane->getBool("ipmasks")) return false; - + + float itrigger = insane->getFloat("trigger", 95.5); + for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if (match(u->second->GetIPString(),ip,true)) + if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map)) matches++; } @@ -72,9 +80,9 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) return false; float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100; - if (percent > (float)atof(itrigger)) + if (percent > itrigger) { - SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent); + SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),ip.c_str(),percent); return true; } return false; @@ -82,18 +90,18 @@ bool InspIRCd::IPMatchesEveryone(const std::string &ip, User* user) bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user) { - char itrigger[MAXBUF]; long matches = 0; - - if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) - strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0)) + + ConfigTag* insane = Config->ConfValue("insane"); + + if (insane->getBool("nickmasks")) return false; + float itrigger = insane->getFloat("trigger", 95.5); + for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if (match(u->second->nick,nick)) + if (InspIRCd::Match(u->second->nick, nick)) matches++; } @@ -101,10 +109,37 @@ bool InspIRCd::NickMatchesEveryone(const std::string &nick, User* user) return false; float percent = ((float)matches / (float)this->Users->clientlist->size()) * 100; - if (percent > (float)atof(itrigger)) + if (percent > itrigger) { - SNO->WriteToSnoMask('A', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent); + SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick.c_str(),nick.c_str(),percent); return true; } return false; } + +CmdResult SplitCommand::Handle(const std::vector& parms, User* u) +{ + if (IS_LOCAL(u)) + return HandleLocal(parms, IS_LOCAL(u)); + if (IS_REMOTE(u)) + return HandleRemote(parms, IS_REMOTE(u)); + if (IS_SERVER(u)) + return HandleServer(parms, IS_SERVER(u)); + ServerInstance->Logs->Log("COMMAND", LOG_DEFAULT, "Unknown user type in command (uuid=%s)!", u->uuid.c_str()); + return CMD_INVALID; +} + +CmdResult SplitCommand::HandleLocal(const std::vector&, LocalUser*) +{ + return CMD_INVALID; +} + +CmdResult SplitCommand::HandleRemote(const std::vector&, RemoteUser*) +{ + return CMD_INVALID; +} + +CmdResult SplitCommand::HandleServer(const std::vector&, FakeUser*) +{ + return CMD_INVALID; +}