X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=96b540db4b0570ce301ff6ab3a66ef66d629b2f1;hb=a5c9214743e76bd8bee1cb5f4d0d6dc3d1171c58;hp=584d5a07082289814058faa13bd78369185d220f;hpb=8918c3fb8b8eab39e7d1d42d7bccfa444cfc3176;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index 584d5a070..96b540db4 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -18,18 +18,14 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include #include #include #include -#ifdef GCC3 #include -#else -#include -#endif #include #include #include @@ -53,157 +49,67 @@ 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) { - 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 (unsigned int i = 0; i < u->chans.size(); i++) - { - for (unsigned int z = 0; z != u2->chans.size(); z++) - { - if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL)) - { - if ((!strcasecmp(u->chans[i].channel->name,u2->chans[z].channel->name)) && (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 tidystring(char* str) -{ - // strips out double spaces before a : parameter - char temp[MAXBUF]; - bool go_again = true; - - if (!str) - return; - - // pointer voodoo++ --w00t - while ((*str) && (*str == ' ')) - str++; - - while (go_again) + /* Outer loop */ + for (std::vector::const_iterator i = u->chans.begin(); i != u->chans.end(); i++) { - bool noparse = false; - int t = 0, a = 0; - go_again = false; - const int lenofstr = strlen(str); - - /* - * by caching strlen() of str, we theoretically avoid 3 expensive calls each time this loop - * rolls around.. should speed things up a nanosecond or two. ;) - */ + /* Fetch the channel from the user */ + ucrec* user_channel = *i; - while (a < lenofstr) + if (user_channel->channel) { - if ((a < lenofstr - 1) && (noparse == false)) - { - if ((str[a] == ' ') && (str[a+1] == ' ')) - { - log(DEBUG,"Tidied extra space out of string: %s",str); - go_again = true; - a++; - } - } - - if (a < lenofstr - 1) - { - if ((str[a] == ' ') && (str[a+1] == ':')) - { - noparse = true; - } - } - - temp[t++] = str[a++]; + /* Eliminate the inner loop (which used to be ~equal in size to the outer loop) + * by replacing it with a map::find which *should* be more efficient + */ + if (user_channel->channel->HasUser(u2)) + return 1; } - - temp[t] = '\0'; - strlcpy(str,temp,MAXBUF); - } -} - -/* 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; - } - if (strlen(str) >= 511) - { - str[510] = '\r'; - str[511] = '\n'; - str[512] = '\0'; - log(DEBUG,"Excess line chopped."); } + return 0; } - void Blocking(int s) { - int flags; - log(DEBUG,"Blocking: %d",s); - flags = fcntl(s, F_GETFL, 0); + 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); + int flags = fcntl(s, F_GETFL, 0); fcntl(s, F_SETFL, flags | O_NONBLOCK); } -int CleanAndResolve (char *resolvedHost, const char *unresolvedHost) +int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward, unsigned long timeout) { - DNS d(Config->DNSServer); - int fd = d.ReverseLookup(unresolvedHost); - if (fd < 0) - return 0; - time_t T = time(NULL)+1; - while ((!d.HasResult()) && (time(NULL)chans.size(); 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) -{ - if (user) - { - return (strchr(user->modes,mode)>0); - } - else return false; -} - - void ChangeName(userrec* user, const char* gecos) { if (user->fd > -1) @@ -219,15 +125,15 @@ void ChangeName(userrec* user, const char* gecos) void ChangeDisplayedHost(userrec* user, const char* host) { - if (user->fd > -1) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host)); - if (MOD_RESULT) - return; + 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,160); + } + strlcpy(user->dhost,host,63); WriteServ(user->fd,"396 %s %s :is now your hidden host",user->nick,user->dhost); } @@ -235,28 +141,23 @@ void ChangeDisplayedHost(userrec* user, const char* host) int isident(const char* n) { - if (!n) - - { - return 0; - } - if (!strcmp(n,"")) - { - return 0; - } - for (char* i = (char*)n; *i; i++) - { - if ((*i >= 'A') && (*i <= '}')) - { - continue; - } - if (strchr(".-0123456789",*i)) - { - continue; - } + if (!n || !*n) + { + return 0; + } + for (char* i = (char*)n; *i; i++) + { + if ((*i >= 'A') && (*i <= '}')) + { + continue; + } + if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.')) + { + continue; + } return 0; - } - return 1; + } + return 1; } @@ -266,33 +167,30 @@ int isnick(const char* n) { return 0; } - if (strlen(n) > NICKMAX-1) + int p = 0; + for (char* i = (char*)n; *i; i++, p++) { - return 0; - } - for (char* i = (char*)n; *i; i++) - { - /* can occur anywhere in a nickname */ + /* "A"-"}" can occur anywhere in a nickname */ if ((*i >= 'A') && (*i <= '}')) { continue; } - /* can occur anywhere BUT the first char of a nickname */ - if ((strchr("-0123456789",*i)) && (i > n)) + /* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */ + if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n)) { 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)) { @@ -300,26 +198,23 @@ char* cmode(userrec *user, chanrec *chan) return ""; } - for (unsigned int i = 0; i < user->chans.size(); i++) + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if (user->chans[i].channel) + if ((*i)->channel == chan) { - if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) + if (((*i)->uc_modes & UCMODE_OP) > 0) { - if ((user->chans[i].uc_modes & UCMODE_OP) > 0) - { - return "@"; - } - if ((user->chans[i].uc_modes & UCMODE_HOP) > 0) - { - return "%"; - } - if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0) - { - return "+"; - } - return ""; + return "@"; } + if (((*i)->uc_modes & UCMODE_HOP) > 0) + { + return "%"; + } + if (((*i)->uc_modes & UCMODE_VOICE) > 0) + { + return "+"; + } + return ""; } } return ""; @@ -330,14 +225,11 @@ int cflags(userrec *user, chanrec *chan) if ((!chan) || (!user)) return 0; - for (unsigned int i = 0; i < user->chans.size(); i++) + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if (user->chans[i].channel) + if ((*i)->channel == chan) { - if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) - { - return user->chans[i].uc_modes; - } + return (*i)->uc_modes; } } return 0; @@ -358,111 +250,50 @@ int cstatus(userrec *user, chanrec *chan) if (is_uline(user->server)) return STATUS_OP; - for (unsigned int i = 0; i < user->chans.size(); i++) + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if (user->chans[i].channel) + if ((*i)->channel == chan) { - if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) + if (((*i)->uc_modes & UCMODE_OP) > 0) { - if ((user->chans[i].uc_modes & UCMODE_OP) > 0) - { - return STATUS_OP; - } - if ((user->chans[i].uc_modes & UCMODE_HOP) > 0) - { - return STATUS_HOP; - } - if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0) - { - return STATUS_VOICE; - } - return STATUS_NORMAL; + return STATUS_OP; } - } - } - return STATUS_NORMAL; -} - -/* returns 1 if user u has channel c in their record, 0 if not */ - -int has_channel(userrec *u, chanrec *c) -{ - if ((!u) || (!c)) - { - log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter"); - return 0; - } - for (unsigned int i =0; i < u->chans.size(); i++) - { - if (u->chans[i].channel) - { - if (!strcasecmp(u->chans[i].channel->name,c->name)) + if (((*i)->uc_modes & UCMODE_HOP) > 0) { - return 1; + return STATUS_HOP; + } + if (((*i)->uc_modes & UCMODE_VOICE) > 0) + { + return STATUS_VOICE; } + return STATUS_NORMAL; } } - return 0; -} - - -void TidyBan(char *ban) -{ - if (!ban) { - log(DEFAULT,"*** BUG *** TidyBan was given an invalid parameter"); - return; - } - - char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF]; - - strlcpy(temp,ban,MAXBUF); - - 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++; - - strlcpy(NICK,temp,NICKMAX-1); - strlcpy(IDENT,pos_of_pling,IDENTMAX+1); - strlcpy(HOST,pos_of_at,160); - - snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST); + return STATUS_NORMAL; } -char lst[MAXBUF]; - std::string chlist(userrec *user,userrec* source) { - std::string cmp = ""; - std::string lst = ""; - log(DEBUG,"chlist: %s",user->nick); - if (!user) - { - return lst; - } - bool userinvisible = (strchr(user->modes,'i')); - for (unsigned int i = 0; i < user->chans.size(); i++) + std::string list; + + 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)))) { - cmp = std::string(user->chans[i].channel->name) + " "; - if (!strstr(lst.c_str(),cmp.c_str())) - { - // if the channel is NOT private/secret, OR the source user is on the channel, AND the user is not invisible. - // if the user is the same as the source, shortcircuit the comparison. - if ((source == user) || ((((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET)) && (!userinvisible)) || (has_channel(source,user->chans[i].channel))))) - { - lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " "; - } - } + list.append(cmode(user, rec->channel)).append(rec->channel->name).append(" "); } } } - return lst; + return list; } -