X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=268cc65540617635467ffc534503a82fa837ae0a;hb=1d6b72a5ba80b7f56f20b67b92677ffba3994991;hp=1c2bd4cf467cb96b9e6acbb4d5db3b12ecf76f82;hpb=7a51b2bed1cdc0e6c2522f2b2d10f3f787ff677d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index 1c2bd4cf4..268cc6554 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -1,329 +1,191 @@ -#include "inspircd.h" -#include "inspircd_io.h" -#include "inspircd_util.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. + * E-mail: + * + * + * + * Written by Craig Edwards, Craig McLure, and others. + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +using namespace std; + #include "inspircd_config.h" +#include "inspircd.h" +#include "configreader.h" #include #include #include -#include #include -#include #include #include -#ifdef GCC3 #include -#else -#include -#endif #include #include #include -#include #include -#include -#include -#include -#include "connection.h" #include "users.h" -#include "servers.h" #include "ctables.h" #include "globals.h" #include "modules.h" #include "dynamic.h" #include "wildcard.h" +#include "commands.h" #include "message.h" +#include "inspstring.h" +#include "dns.h" +#include "helperfuncs.h" extern int MODCOUNT; -extern vector modules; -extern vector factory; +extern std::vector modules; +extern std::vector factory; +extern time_t TIME; +extern ServerConfig* Config; /* return 0 or 1 depending if users u and u2 share one or more common channels - * (used by QUIT, NICK etc which arent channel specific notices) */ - + * (used by QUIT, NICK etc which arent channel specific notices) + * + * The old algorithm in 1.0 for this was relatively inefficient, iterating over + * the first users channels then the second users channels within the outer loop, + * therefore it was a maximum of x*y iterations (upon returning 0 and checking + * all possible iterations). However this new function instead checks against the + * channel's userlist in the inner loop which is a std::map + * and saves us time as we already know what pointer value we are after. + * Don't quote me on the maths as i am not a mathematician or computer scientist, + * but i believe this algorithm is now x+(log y) maximum iterations instead. + */ int common_channels(userrec *u, userrec *u2) { - int i = 0; - int z = 0; - - if ((!u) || (!u2)) - { - log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter"); + if ((!u) || (!u2) || (u->registered != REG_ALL) || (u2->registered != REG_ALL)) return 0; - } - for (int i = 0; i != MAXCHANS; i++) - { - for (z = 0; z != MAXCHANS; z++) - { - if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL)) - { - if ((u->chans[i].channel == u2->chans[z].channel) && (u->chans[i].channel) && (u2->chans[z].channel) && (u->registered == 7) && (u2->registered == 7)) - { - if ((c_count(u)) && (c_count(u2))) - { - return 1; - } - } - } - } - } - return 0; -} - -void safedelete(userrec *p) -{ - if (p) + /* Outer loop */ + for (std::vector::const_iterator i = u->chans.begin(); i != u->chans.end(); i++) { - log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname); - log(DEBUG,"safedelete(userrec*): pointer is safe to delete"); - delete p; - p = NULL; - } - else - { - log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished"); - } -} + /* Fetch the channel from the user */ + ucrec* user_channel = *i; -void safedelete(chanrec *p) -{ - if (p) - { - delete p; - p = NULL; - log(DEBUG,"safedelete(chanrec*): pointer is safe to delete"); - } - else - { - log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished"); - } -} - - -void tidystring(char* str) -{ - // strips out double spaces before a : parameter - - char temp[MAXBUF]; - bool go_again = true; - - if (!str) - { - return; - } - - while ((str[0] == ' ') && (strlen(str)>0)) - { - str++; - } - - while (go_again) - { - bool noparse = false; - int t = 0, a = 0; - go_again = false; - while (a < strlen(str)) + if (user_channel->channel) { - if ((achannel->HasUser(u2)) + return 1; } - temp[t] = '\0'; - strncpy(str,temp,MAXBUF); } + return 0; } -/* chop a string down to 512 characters and preserve linefeed (irc max - * line length) */ - -void chop(char* str) -{ - if (!str) - { - log(DEBUG,"ERROR! Null string passed to chop()!"); - return; - } - string temp = str; - FOREACH_MOD OnServerRaw(temp,false); - const char* str2 = temp.c_str(); - sprintf(str,"%s",str2); - - - if (strlen(str) >= 512) - { - str[509] = '\r'; - str[510] = '\n'; - str[511] = '\0'; - } -} - - void Blocking(int s) { - int flags; - log(DEBUG,"Blocking: %d",s); - flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags ^ O_NONBLOCK); + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags ^ O_NONBLOCK); } void NonBlocking(int s) { - int flags; - log(DEBUG,"NonBlocking: %d",s); - flags = fcntl(s, F_GETFL, 0); - //fcntl(s, F_SETFL, O_NONBLOCK); - fcntl(s, F_SETFL, flags | O_NONBLOCK); -} - -int CleanAndResolve (char *resolvedHost, const char *unresolvedHost) -{ - struct hostent *hostPtr = NULL; - struct in_addr addr; - - memset (resolvedHost, '\0',MAXBUF); - if(unresolvedHost == NULL) - return(ERROR); - if ((inet_aton(unresolvedHost,&addr)) == 0) - return(ERROR); - hostPtr = gethostbyaddr ((char *)&addr.s_addr,sizeof(addr.s_addr),AF_INET); - if (hostPtr != NULL) - snprintf(resolvedHost,MAXBUF,"%s",hostPtr->h_name); - else - snprintf(resolvedHost,MAXBUF,"%s",unresolvedHost); - return (TRUE); + int flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags | O_NONBLOCK); } int c_count(userrec* u) { int z = 0; - for (int i =0; i != MAXCHANS; i++) - if (u->chans[i].channel != NULL) + for (std::vector::const_iterator i = u->chans.begin(); i != u->chans.end(); i++) + if ((*i)->channel) z++; return z; } -bool hasumode(userrec* user, char mode) +void ChangeName(userrec* user, const char* gecos) { - if (user) + if (user->fd > -1) { - return (strchr(user->modes,mode)>0); + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(user,gecos)); + if (MOD_RESULT) + return; + FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos)); } - else return false; -} - - -void ChangeName(userrec* user, const char* gecos) -{ - strncpy(user->fullname,gecos,MAXBUF); - - // TODO: replace these with functions: - // NetSendToAll - to all - // NetSendToCommon - to all that hold users sharing a common channel with another user - // NetSendToOne - to one server - // NetSendToAllExcept - send to all but one - // all by servername - - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos); - NetSendToAll(buffer); + strlcpy(user->fullname,gecos,MAXGECOS+1); } void ChangeDisplayedHost(userrec* user, const char* host) { - strncpy(user->dhost,host,160); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"b %s %s",user->nick,host); - NetSendToAll(buffer); + if (user->fd > -1) + { + int MOD_RESULT = 0; + FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host)); + if (MOD_RESULT) + return; + FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host)); + } + strlcpy(user->dhost,host,63); + WriteServ(user->fd,"396 %s %s :is now your hidden host",user->nick,user->dhost); } /* verify that a user's ident and nickname is valid */ int isident(const char* n) { - char v[MAXBUF]; - if (!n) - - { - return 0; - } - if (!strcmp(n,"")) - { - return 0; - } - for (int i = 0; i != strlen(n); i++) - { - if ((n[i] < 33) || (n[i] > 125)) - { - return 0; - } - /* can't occur ANYWHERE in an Ident! */ - if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i])) - { - return 0; - } - } - return 1; -} - - -int isnick(const char* n) -{ - int i = 0; - char v[MAXBUF]; - if (!n) + if (!n || !*n) { return 0; } - if (!strcmp(n,"")) + for (char* i = (char*)n; *i; i++) { + if ((*i >= 'A') && (*i <= '}')) + { + continue; + } + if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.')) + { + continue; + } return 0; } - if (strlen(n) > NICKMAX-1) + return 1; +} + + +int isnick(const char* n) +{ + if (!n || !*n) { return 0; } - for (int i = 0; i != strlen(n); i++) + int p = 0; + for (char* i = (char*)n; *i; i++, p++) { - if ((n[i] < 33) || (n[i] > 125)) - { - return 0; - } - /* can't occur ANYWHERE in a nickname! */ - if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i])) + /* "A"-"}" can occur anywhere in a nickname */ + if ((*i >= 'A') && (*i <= '}')) { - return 0; + continue; } - /* can't occur as the first char of a nickname... */ - if ((strchr("0123456789",n[i])) && (!i)) + /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */ + if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n)) { - return 0; + continue; } + /* invalid character! abort */ + return 0; } - return 1; + return (p < NICKMAX - 1); } /* returns the status character for a given user on a channel, e.g. @ for op, * % for halfop etc. If the user has several modes set, the highest mode * the user has must be returned. */ -char* cmode(userrec *user, chanrec *chan) +const char* cmode(userrec *user, chanrec *chan) { if ((!user) || (!chan)) { @@ -331,26 +193,41 @@ char* cmode(userrec *user, chanrec *chan) return ""; } - int i; - for (int i = 0; i != MAXCHANS; i++) + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if ((user->chans[i].channel == chan) && (chan != NULL)) + if ((*i)->channel == chan) { - if ((user->chans[i].uc_modes & UCMODE_OP) > 0) + if (((*i)->uc_modes & UCMODE_OP) > 0) { return "@"; } - if ((user->chans[i].uc_modes & UCMODE_HOP) > 0) + if (((*i)->uc_modes & UCMODE_HOP) > 0) { return "%"; } - if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0) + if (((*i)->uc_modes & UCMODE_VOICE) > 0) { return "+"; } return ""; } } + return ""; +} + +int cflags(userrec *user, chanrec *chan) +{ + if ((!chan) || (!user)) + return 0; + + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) + { + if ((*i)->channel == chan) + { + return (*i)->uc_modes; + } + } + return 0; } /* returns the status value for a given user on a channel, e.g. STATUS_OP for @@ -365,119 +242,53 @@ int cstatus(userrec *user, chanrec *chan) return 0; } - for (int i = 0; i != MAXCHANS; i++) + if (is_uline(user->server)) + return STATUS_OP; + + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if ((user->chans[i].channel == chan) && (chan != NULL)) + if ((*i)->channel == chan) { - if ((user->chans[i].uc_modes & UCMODE_OP) > 0) + if (((*i)->uc_modes & UCMODE_OP) > 0) { return STATUS_OP; } - if ((user->chans[i].uc_modes & UCMODE_HOP) > 0) + if (((*i)->uc_modes & UCMODE_HOP) > 0) { return STATUS_HOP; } - if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0) + if (((*i)->uc_modes & UCMODE_VOICE) > 0) { return STATUS_VOICE; } return STATUS_NORMAL; } } + return STATUS_NORMAL; } -/* returns 1 if user u has channel c in their record, 0 if not */ - -int has_channel(userrec *u, chanrec *c) +std::string chlist(userrec *user,userrec* source) { - if ((!u) || (!c)) - { - log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter"); - return 0; - } - for (int i =0; i != MAXCHANS; i++) - { - if (u->chans[i].channel == c) - { - return 1; - } - } - return 0; -} - - -void TidyBan(char *ban) -{ - if (!ban) { - log(DEFAULT,"*** BUG *** TidyBan was given an invalid parameter"); - return; - } + std::string list; - char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF]; - - strcpy(temp,ban); - - char* pos_of_pling = strchr(temp,'!'); - char* pos_of_at = strchr(temp,'@'); - - pos_of_pling[0] = '\0'; - pos_of_at[0] = '\0'; - pos_of_pling++; - pos_of_at++; - - strncpy(NICK,temp,NICKMAX); - strncpy(IDENT,pos_of_pling,IDENTMAX+1); - strncpy(HOST,pos_of_at,160); - - sprintf(ban,"%s!%s@%s",NICK,IDENT,HOST); -} - -char lst[MAXBUF]; - -char* chlist(userrec *user) -{ - int i = 0; - char cmp[MAXBUF]; - - log(DEBUG,"chlist: %s",user->nick); - strcpy(lst,""); - if (!user) - { - return lst; - } - for (int i = 0; i != MAXCHANS; i++) + if (!user || !source) + return ""; + + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if (user->chans[i].channel != NULL) - { - if (user->chans[i].channel->name) + ucrec* rec = *i; + + if(rec->channel && rec->channel->name) + { + /* If the target is the same as the sender, let them see all their channels. + * If the channel is NOT private/secret OR the user shares a common channel + * If the user is an oper, and the option is set. + */ + if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET])) || (rec->channel->HasUser(source)))) { - strcpy(cmp,user->chans[i].channel->name); - strcat(cmp," "); - if (!strstr(lst,cmp)) - { - if ((!user->chans[i].channel->c_private) && (!user->chans[i].channel->secret)) - { - strcat(lst,cmode(user,user->chans[i].channel)); - strcat(lst,user->chans[i].channel->name); - strcat(lst," "); - } - } + list.append(cmode(user, rec->channel)).append(rec->channel->name).append(" "); } } } - if (strlen(lst)) - { - lst[strlen(lst)-1] = '\0'; // chop trailing space - } - return lst; -} - - -void send_network_quit(const char* nick, const char* reason) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason); - NetSendToAll(buffer); + return list; } - -