X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=db2074d87e85dd82576a280230ec010f55fc58a3;hb=6eeecaada5818d8dc1f3bb98c3e0916d195e3592;hp=e4fc939ea608a528dda56dc2358bcdfb9369614d;hpb=d54fbc71e2a2e0f70002e2d36c669c4aa3d59e17;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands.cpp b/src/commands.cpp index e4fc939ea..db2074d87 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -2,281 +2,108 @@ * | 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include "inspircd_config.h" +/* $Core */ + #include "inspircd.h" -#include "configreader.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef THREADED_DNS -#include -#endif -#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 "message.h" -#include "commands.h" -#include "mode.h" #include "xline.h" -#include "inspstring.h" -#include "dnsqueue.h" -#include "helperfuncs.h" -#include "hashcomp.h" -#include "socketengine.h" -#include "typedefs.h" #include "command_parse.h" -extern ServerConfig* Config; -extern InspIRCd* ServerInstance; - -extern int MODCOUNT; -extern ModuleList modules; -extern FactoryList factory; -extern time_t TIME; - -const long duration_m = 60; -const long duration_h = duration_m * 60; -const long duration_d = duration_h * 24; -const long duration_w = duration_d * 7; -const long duration_y = duration_w * 52; - -extern user_hash clientlist; -extern chan_hash chanlist; - -extern std::vector all_opers; -extern std::vector local_users; - -// This table references users by file descriptor. -// its an array to make it VERY fast, as all lookups are referenced -// by an integer, meaning there is no need for a scan/search operation. -extern userrec* fd_ref_table[MAX_DESCRIPTORS]; - - -void split_chlist(userrec* user, userrec* dest, const std::string &cl) -{ - std::string line; - std::ostringstream prefix; - std::string::size_type start, pos, length; - - prefix << ":" << Config->ServerName << " 319 " << user->nick << " " << dest->nick << " :"; - line = prefix.str(); - - for (start = 0; pos = cl.find(' ', start); start = pos+1) - { - length = (pos == std::string::npos) ? cl.length() : pos; - - if (line.length() + length - start > 510) - { - Write_NoFormat(user->fd, line.c_str()); - line = prefix.str(); - } - - if(pos == std::string::npos) - { - line += cl.substr(start, length - start); - break; - } - else - { - line += cl.substr(start, length - start + 1); - } - } - - if (line.length()) - { - Write_NoFormat(user->fd, line.c_str()); - } -} +/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ -/* XXX - these really belong in helperfuncs perhaps -- w00t */ -bool is_uline(const char* server) +bool InspIRCd::HostMatchesEveryone(const std::string &mask, User* user) { - if (!server) - return false; - if (!*server) - return true; - - return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end()); -} + char itrigger[MAXBUF]; + long matches = 0; -int operstrcmp(char* data,char* input) -{ - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnOperCompare,OnOperCompare(data,input)) - log(DEBUG,"operstrcmp: %d",MOD_RESULT); - 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); -} + if (!Config->ConfValue("insane","trigger", 0, itrigger, MAXBUF)) + strlcpy(itrigger,"95.5",MAXBUF); -long duration(const char* str) -{ - char n_field[MAXBUF]; - long total = 0; - n_field[0] = 0; + if (Config->ConfValueBool("insane","hostmasks", 0)) + return false; - if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y'))) + for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - std::string n = str; - n += 's'; - return duration(n.c_str()); - } - - for (char* i = (char*)str; *i; i++) - { - // if we have digits, build up a string for the value in n_field, - // up to 10 digits in size. - if ((*i >= '0') && (*i <= '9')) - { - strlcat(n_field,i,10); - } - else + if ((InspIRCd::Match(u->second->MakeHost(), mask, ascii_case_insensitive_map)) || + (InspIRCd::Match(u->second->MakeHostIP(), mask, ascii_case_insensitive_map))) { - // we dont have a digit, check for numeric tokens - switch (tolower(*i)) - { - case 's': - total += atoi(n_field); - break; - - case 'm': - total += (atoi(n_field)*duration_m); - break; - - case 'h': - total += (atoi(n_field)*duration_h); - break; - - case 'd': - total += (atoi(n_field)*duration_d); - break; - - case 'w': - total += (atoi(n_field)*duration_w); - break; - - case 'y': - total += (atoi(n_field)*duration_y); - break; - } - n_field[0] = 0; + matches++; } } - // add trailing seconds - total += atoi(n_field); - - return total; -} - -/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */ -bool host_matches_everyone(const std::string &mask, userrec* user) -{ - char buffer[MAXBUF]; - 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)) + if (!matches) return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) - { - strlcpy(buffer,u->second->ident,MAXBUF); - charlcat(buffer,'@',MAXBUF); - strlcat(buffer,u->second->host,MAXBUF); - if (match(buffer,mask.c_str())) - matches++; - } - float percent = ((float)matches / (float)clientlist.size()) * 100; + + float percent = ((float)matches / (float)this->Users->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); + 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; } -bool ip_matches_everyone(const std::string &ip, userrec* 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)) + + if (!Config->ConfValue("insane","trigger",0,itrigger,MAXBUF)) strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0)) + + if (Config->ConfValueBool("insane","ipmasks",0)) return false; - - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + + for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if (match((char*)inet_ntoa(u->second->ip4),ip.c_str())) + if (InspIRCd::Match(u->second->GetIPString(), ip, ascii_case_insensitive_map)) matches++; } - - float percent = ((float)matches / (float)clientlist.size()) * 100; + + if (!matches) + return false; + + float percent = ((float)matches / (float)this->Users->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); + 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; } -bool nick_matches_everyone(const std::string &nick, userrec* 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)) + + if (!Config->ConfValue("insane","trigger",0,itrigger,MAXBUF)) strlcpy(itrigger,"95.5",MAXBUF); - - if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0)) + + if (Config->ConfValueBool("insane","nickmasks",0)) return false; - for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) + for (user_hash::iterator u = this->Users->clientlist->begin(); u != this->Users->clientlist->end(); u++) { - if (match(u->second->nick,nick.c_str())) + if (InspIRCd::Match(u->second->nick, nick)) matches++; } - - float percent = ((float)matches / (float)clientlist.size()) * 100; + + if (!matches) + return false; + + float percent = ((float)matches / (float)this->Users->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); + 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;