X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=aa43685d4c9e3b007bb7a47ca0e48462f4281503;hb=6bc3d71946b339a5a10ca621b029fe8a5b180d68;hp=ca31c86d8d6869de7723bf63e854ec6b5f91f5b1;hpb=7775a195d9c417e52eaaf912ec51d62bf0fd9a54;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands.cpp b/src/commands.cpp index ca31c86d8..aa43685d4 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -2,55 +2,24 @@ * | 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. * * --------------------------------------------------- */ -#include "inspircd_config.h" #include "inspircd.h" #include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef RUSAGE_SELF -#define RUSAGE_SELF 0 -#define RUSAGE_CHILDREN -1 -#endif #include "users.h" -#include "ctables.h" -#include "globals.h" #include "modules.h" -#include "dynamic.h" #include "wildcard.h" -#include "commands.h" -#include "mode.h" #include "xline.h" -#include "inspstring.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" #include "command_parse.h" -/* XXX - these really belong in helperfuncs perhaps -- w00t */ -bool InspIRCd::is_uline(const char* server) +bool InspIRCd::ULine(const char* server) { if (!server) return false; @@ -60,20 +29,18 @@ bool InspIRCd::is_uline(const char* server) return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end()); } -int InspIRCd::operstrcmp(const char* data,const char* input) +int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnum) { int MOD_RESULT = 0; - FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input)) - Log(DEBUG,"operstrcmp: %d",MOD_RESULT); + FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnum)) if (MOD_RESULT == 1) return 0; if (MOD_RESULT == -1) return 1; - Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input)); return strcmp(data,input); } -long InspIRCd::duration(const char* str) +long InspIRCd::Duration(const char* str) { char n_field[MAXBUF]; long total = 0; @@ -83,7 +50,7 @@ long InspIRCd::duration(const char* str) { std::string n = str; n += 's'; - return duration(n.c_str()); + return Duration(n.c_str()); } for (char* i = (char*)str; *i; i++) @@ -134,7 +101,7 @@ long InspIRCd::duration(const char* str) /* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ -bool InspIRCd::host_matches_everyone(const std::string &mask, userrec* user) +bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user) { char buffer[MAXBUF]; char itrigger[MAXBUF]; @@ -146,7 +113,7 @@ bool InspIRCd::host_matches_everyone(const std::string &mask, userrec* user) if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0)) return false; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++) { strlcpy(buffer,u->second->ident,MAXBUF); charlcat(buffer,'@',MAXBUF); @@ -154,7 +121,7 @@ bool InspIRCd::host_matches_everyone(const std::string &mask, userrec* user) if (match(buffer,mask.c_str())) matches++; } - float percent = ((float)matches / (float)clientlist.size()) * 100; + float percent = ((float)matches / (float)clientlist->size()) * 100; if (percent > (float)atof(itrigger)) { WriteOpers("*** \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); @@ -163,7 +130,7 @@ bool InspIRCd::host_matches_everyone(const std::string &mask, userrec* user) return false; } -bool InspIRCd::ip_matches_everyone(const std::string &ip, userrec* user) +bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user) { char itrigger[MAXBUF]; long matches = 0; @@ -174,13 +141,13 @@ bool InspIRCd::ip_matches_everyone(const std::string &ip, userrec* user) if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0)) return false; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++) { if (match(u->second->GetIPString(),ip.c_str(),true)) matches++; } - float percent = ((float)matches / (float)clientlist.size()) * 100; + float percent = ((float)matches / (float)clientlist->size()) * 100; if (percent > (float)atof(itrigger)) { WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent); @@ -189,7 +156,7 @@ bool InspIRCd::ip_matches_everyone(const std::string &ip, userrec* user) return false; } -bool InspIRCd::nick_matches_everyone(const std::string &nick, userrec* user) +bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user) { char itrigger[MAXBUF]; long matches = 0; @@ -200,13 +167,13 @@ bool InspIRCd::nick_matches_everyone(const std::string &nick, userrec* user) if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0)) return false; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + for (user_hash::iterator u = clientlist->begin(); u != clientlist->end(); u++) { if (match(u->second->nick,nick.c_str())) matches++; } - float percent = ((float)matches / (float)clientlist.size()) * 100; + float percent = ((float)matches / (float)clientlist->size()) * 100; if (percent > (float)atof(itrigger)) { WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);