X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=6d5941f7e7ea5042eaa1d795e593b552c3c2d0cd;hb=eb28eaea35d9d109a0b7b890de9d957d562da675;hp=9cfecb8500d8c4dd405a2919407bad1c6ceb6d55;hpb=689c27adfd88e0af0524c93d8eff4c44f034cff1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index 9cfecb850..6d5941f7e 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 @@ -50,204 +46,29 @@ extern int MODCOUNT; extern std::vector modules; extern std::vector factory; extern time_t TIME; -extern ServerConfig* Config; +extern InspIRCd* ServerInstance; -/* 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) */ +/* verify that a user's ident and nickname is valid */ -int common_channels(userrec *u, userrec *u2) +int isident(const char* n) { - if ((!u) || (!u2)) + if (!n || !*n) { - log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter"); return 0; } - for (unsigned int i = 0; i < u->chans.size(); i++) + for (char* i = (char*)n; *i; i++) { - for (unsigned int z = 0; z != u2->chans.size(); z++) + if ((*i >= 'A') && (*i <= '}')) { - 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; - } - } - } + continue; } - } - 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) - { - 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. ;) - */ - - while (a < lenofstr) + if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.')) { - 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++]; + continue; } - - 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."); - } -} - - -void Blocking(int s) -{ - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags ^ O_NONBLOCK); -} - -void NonBlocking(int s) -{ - int flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags | O_NONBLOCK); -} - -int CleanAndResolve (char *resolvedHost, const char *unresolvedHost) -{ - 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) - 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) - { - int MOD_RESULT = 0; - FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(user,gecos)); - if (MOD_RESULT) - return; - FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos)); } - 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; - 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) -{ - if (!n || !*n) - { - return 0; - } - for (char* i = (char*)n; *i; i++) - { - if ((*i >= 'A') && (*i <= '}')) - { - continue; - } - if (strchr(".-0123456789",*i)) - { - continue; - } - return 0; - } - return 1; + return 1; } @@ -260,13 +81,13 @@ int isnick(const char* n) int p = 0; for (char* i = (char*)n; *i; i++, p++) { - /* 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; } @@ -288,26 +109,23 @@ const 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 ((user->chans[i].channel == chan) && (chan != NULL)) + if (((*i)->uc_modes & UCMODE_OP) > 0) + { + return "@"; + } + if (((*i)->uc_modes & UCMODE_HOP) > 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_VOICE) > 0) + { + return "+"; + } + return ""; } } return ""; @@ -318,14 +136,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 ((user->chans[i].channel == chan) && (chan != NULL)) - { - return user->chans[i].uc_modes; - } + return (*i)->uc_modes; } } return 0; @@ -346,111 +161,25 @@ 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 ((user->chans[i].channel == chan) && (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 (u->chans[i].channel == c) + if (((*i)->uc_modes & UCMODE_HOP) > 0) { - return 1; + return STATUS_HOP; } - } - } - 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,63); - - snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST); -} - -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++) - { - if (user->chans[i].channel != NULL) - { - if (user->chans[i].channel->name) + if (((*i)->uc_modes & UCMODE_VOICE) > 0) { - 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) + " "; - } - } + return STATUS_VOICE; } + return STATUS_NORMAL; } } - return lst; + return STATUS_NORMAL; }