X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommands.cpp;h=e4fc939ea608a528dda56dc2358bcdfb9369614d;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=048a5fae7183ba9b21208abec813f272c73aabf4;hpb=4c6fb8032bf8a6310080069cc65c975087d93a76;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/commands.cpp b/src/commands.cpp index 048a5fae7..e4fc939ea 100644 --- a/src/commands.cpp +++ b/src/commands.cpp @@ -14,11 +14,9 @@ * --------------------------------------------------- */ -using namespace std; - #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -26,15 +24,8 @@ using namespace std; #include #include #include -#ifdef GCC3 -#include -#else -#include -#endif -#include #include #include -#include #include #include #include @@ -67,8 +58,8 @@ extern ServerConfig* Config; extern InspIRCd* ServerInstance; extern int MODCOUNT; -extern std::vector modules; -extern std::vector factory; +extern ModuleList modules; +extern FactoryList factory; extern time_t TIME; const long duration_m = 60; @@ -79,7 +70,6 @@ const long duration_y = duration_w * 52; extern user_hash clientlist; extern chan_hash chanlist; -extern whowas_hash whowas; extern std::vector all_opers; extern std::vector local_users; @@ -90,109 +80,51 @@ extern std::vector local_users; extern userrec* fd_ref_table[MAX_DESCRIPTORS]; -void split_chlist(userrec* user, userrec* dest, std::string &cl) +void split_chlist(userrec* user, userrec* dest, const std::string &cl) { - std::stringstream channels(cl); - std::string line = ""; - std::string cname = ""; - while (!channels.eof()) + 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) { - channels >> cname; - line = line + cname + " "; - if (line.length() > 400) + length = (pos == std::string::npos) ? cl.length() : pos; + + if (line.length() + length - start > 510) { - WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, line.c_str()); - line = ""; + Write_NoFormat(user->fd, line.c_str()); + line = prefix.str(); } - } - if (line.length()) - { - WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, line.c_str()); - } -} - -/* XXX - perhaps this should be in cmd_whois? -- w00t */ -void do_whois(userrec* user, userrec* dest,unsigned long signon, unsigned long idle, char* nick) -{ - // bug found by phidjit - were able to whois an incomplete connection if it had sent a NICK or USER - if (dest->registered == 7) - { - WriteServ(user->fd,"311 %s %s %s %s * :%s",user->nick, dest->nick, dest->ident, dest->dhost, dest->fullname); - if ((user == dest) || (*user->oper)) + + if(pos == std::string::npos) { - WriteServ(user->fd,"378 %s %s :is connecting from *@%s %s",user->nick, dest->nick, dest->host, (char*)inet_ntoa(dest->ip4)); - } - std::string cl = chlist(dest,user); - if (cl.length()) - { - if (cl.length() > 400) - { - split_chlist(user,dest,cl); - } - else - { - WriteServ(user->fd,"319 %s %s :%s",user->nick, dest->nick, cl.c_str()); - } - } - if (*Config->HideWhoisServer) - { - WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, *user->oper ? dest->server : Config->HideWhoisServer, *user->oper ? GetServerDescription(dest->server).c_str() : Config->Network); + line += cl.substr(start, length - start); + break; } else { - WriteServ(user->fd,"312 %s %s %s :%s",user->nick, dest->nick, dest->server, GetServerDescription(dest->server).c_str()); - } - if (*dest->awaymsg) - { - WriteServ(user->fd,"301 %s %s :%s",user->nick, dest->nick, dest->awaymsg); + line += cl.substr(start, length - start + 1); } - if (*dest->oper) - { - WriteServ(user->fd,"313 %s %s :is %s %s on %s",user->nick, dest->nick, (strchr("aeiou",*dest->oper) ? "an" : "a"),dest->oper, Config->Network); - } - if ((!signon) && (!idle)) - { - FOREACH_MOD(I_OnWhois,OnWhois(user,dest)); - } - if (!strcasecmp(user->server,dest->server)) - { - // idle time and signon line can only be sent if youre on the same server (according to RFC) - WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, abs((dest->idle_lastmsg)-TIME), dest->signon); - } - else - { - if ((idle) || (signon)) - WriteServ(user->fd,"317 %s %s %d %d :seconds idle, signon time",user->nick, dest->nick, idle, signon); - } - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, dest->nick); } - else + + if (line.length()) { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, nick); - WriteServ(user->fd,"318 %s %s :End of /WHOIS list.",user->nick, nick); + Write_NoFormat(user->fd, line.c_str()); } } - /* XXX - these really belong in helperfuncs perhaps -- w00t */ bool is_uline(const char* server) { - char ServName[MAXBUF]; - if (!server) return false; - if (!(*server)) + if (!*server) return true; - for (int i = 0; i < Config->ConfValueEnum("uline",&Config->config_f); i++) - { - Config->ConfValue("uline","server",i,ServName,&Config->config_f); - if (!strcasecmp(server,ServName)) - { - return true; - } - } - return false; + return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end()); } int operstrcmp(char* data,char* input) @@ -212,17 +144,16 @@ long duration(const char* str) { char n_field[MAXBUF]; long total = 0; - const char* str_end = str + strlen(str); n_field[0] = 0; if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y'))) { std::string n = str; - n = n + "s"; + n += 's'; return duration(n.c_str()); } - for (char* i = (char*)str; i < str_end; i++) + 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. @@ -270,18 +201,18 @@ long 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 host_matches_everyone(std::string mask, userrec* user) +bool host_matches_everyone(const std::string &mask, userrec* user) { - char insanemasks[MAXBUF]; char buffer[MAXBUF]; char itrigger[MAXBUF]; - Config->ConfValue("insane","hostmasks",0,insanemasks,&Config->config_f); - Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f); - if (*itrigger == 0) + long matches = 0; + + if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF)) strlcpy(itrigger,"95.5",MAXBUF); - if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1')) + + if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0)) return false; - long matches = 0; + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { strlcpy(buffer,u->second->ident,MAXBUF); @@ -299,22 +230,23 @@ bool host_matches_everyone(std::string mask, userrec* user) return false; } -bool ip_matches_everyone(std::string ip, userrec* user) +bool ip_matches_everyone(const std::string &ip, userrec* user) { - char insanemasks[MAXBUF]; char itrigger[MAXBUF]; - Config->ConfValue("insane","ipmasks",0,insanemasks,&Config->config_f); - Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f); - if (*itrigger == 0) + long matches = 0; + + if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) strlcpy(itrigger,"95.5",MAXBUF); - if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1')) + + if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0)) return false; - long matches = 0; + for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++) { if (match((char*)inet_ntoa(u->second->ip4),ip.c_str())) matches++; } + float percent = ((float)matches / (float)clientlist.size()) * 100; if (percent > (float)atof(itrigger)) { @@ -324,22 +256,23 @@ bool ip_matches_everyone(std::string ip, userrec* user) return false; } -bool nick_matches_everyone(std::string nick, userrec* user) +bool nick_matches_everyone(const std::string &nick, userrec* user) { - char insanemasks[MAXBUF]; char itrigger[MAXBUF]; - Config->ConfValue("insane","nickmasks",0,insanemasks,&Config->config_f); - Config->ConfValue("insane","trigger",0,itrigger,&Config->config_f); - if (*itrigger == 0) + long matches = 0; + + if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF)) strlcpy(itrigger,"95.5",MAXBUF); - if ((*insanemasks == 'y') || (*insanemasks == 't') || (*insanemasks == '1')) + + if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0)) return false; - long matches = 0; + 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; if (percent > (float)atof(itrigger)) {