X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=28a11fda9645f1cc0ed58624bdfeaf62c5875b1f;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=b8079d6838497631225d0da2a9484ab0f3e04977;hpb=48c05dc0dcdee55756404e5932b5ff3adf19d74e;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index b8079d683..28a11fda9 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -18,7 +18,7 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" -#include "inspircd_io.h" +#include "configreader.h" #include #include #include @@ -57,18 +57,17 @@ extern ServerConfig* Config; int common_channels(userrec *u, userrec *u2) { - if ((!u) || (!u2)) + if ((!u) || (!u2) || (u->registered != 7) || (u2->registered != 7)) { - log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter"); return 0; } - for (unsigned int i = 0; i < u->chans.size(); i++) + for (std::vector::const_iterator i = u->chans.begin(); i != u->chans.end(); i++) { - for (unsigned int z = 0; z != u2->chans.size(); z++) + for (std::vector::const_iterator z = u2->chans.begin(); z != u2->chans.end(); z++) { - if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL)) + if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*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 ((((ucrec*)(*i))->channel == ((ucrec*)(*z))->channel)) { if ((c_count(u)) && (c_count(u2))) { @@ -157,29 +156,34 @@ void chop(char* str) 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) { + int fd; + std::string ipaddr; + DNS d(Config->DNSServer); - int fd = d.ReverseLookup(unresolvedHost); + if (forward) + fd = d.ForwardLookup(unresolvedHost); + else + 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 (((ucrec*)(*i))->channel) z++; return z; @@ -214,48 +218,44 @@ void ChangeName(userrec* user, const char* gecos) return; FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos)); } - strlcpy(user->fullname,gecos,MAXBUF); + strlcpy(user->fullname,gecos,MAXGECOS+1); } 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); } /* verify that a user's ident and nickname is valid */ 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; - } - return 1; + } + for (char* i = (char*)n; *i; i++) + { + if ((*i >= 'A') && (*i <= '}')) + { + continue; + } + if (strchr(".-0123456789",*i)) + { + continue; + } + return 0; + } + return 1; } @@ -265,11 +265,8 @@ int isnick(const char* n) { return 0; } - if (strlen(n) > NICKMAX) - { - return 0; - } - for (char* i = (char*)n; *i; i++) + int p = 0; + for (char* i = (char*)n; *i; i++, p++) { /* can occur anywhere in a nickname */ if ((*i >= 'A') && (*i <= '}')) @@ -284,14 +281,14 @@ int isnick(const char* n) /* 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)) { @@ -299,31 +296,43 @@ 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 (((ucrec*)(*i))->channel == chan) { - if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) + if ((((ucrec*)(*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 ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0) + { + return "%"; + } + if ((((ucrec*)(*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 (((ucrec*)(*i))->channel == chan) + { + return ((ucrec*)(*i))->uc_modes; + } + } + return 0; +} + /* returns the status value for a given user on a channel, e.g. STATUS_OP for * op, STATUS_VOICE for voice etc. If the user has several modes set, the * highest mode the user has must be returned. */ @@ -339,54 +348,28 @@ 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 (((ucrec*)(*i))->channel == chan) { - if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) + if ((((ucrec*)(*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 ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0) + { + return STATUS_HOP; + } + if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0) { - return 1; + return STATUS_VOICE; } + return STATUS_NORMAL; } } - return 0; + return STATUS_NORMAL; } - void TidyBan(char *ban) { if (!ban) { @@ -406,9 +389,9 @@ void TidyBan(char *ban) pos_of_pling++; pos_of_at++; - strlcpy(NICK,temp,NICKMAX); + strlcpy(NICK,temp,NICKMAX-1); strlcpy(IDENT,pos_of_pling,IDENTMAX+1); - strlcpy(HOST,pos_of_at,160); + strlcpy(HOST,pos_of_at,63); snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST); } @@ -417,31 +400,35 @@ 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; - } - for (unsigned int i = 0; i < user->chans.size(); i++) + /* Should this be a stringstream? Not sure if it would be faster as streams are more oriented at appending stuff, which is all we do */ + std::ostringstream 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) + ucrec* rec = *i; + + if(rec->channel && rec->channel->name) { - if (user->chans[i].channel->name) - { - cmp = std::string(user->chans[i].channel->name) + " "; - if (!strstr(lst.c_str(),cmp.c_str())) + /* XXX - Why does this check need to be here at all? :< */ + /* Commenting this out until someone finds a case where we need it */ + //if (lst.find(rec->channel->name) == std::string::npos) + //{ + + /* + * If the target is the same as the sender, let them see all their channels. + * If the channel is NOT private/secret AND the user is not invisible. + * 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]) && !(user->modebits & UM_INVISIBLE)) || (rec->channel->HasUser(source)))) { - // if the channel is NOT private/secret, OR the source user is on the channel - if (((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET))) || (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 << cmode(user, rec->channel) << rec->channel->name << " "; } - } + //} } } - return lst; + + return list.str(); } -