X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=4f8e25bee7e0dc7a3370aeff581162be8ecd922d;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=8adf507938f488ac03eb68300731e5010d9d1ca6;hpb=d56539c9abbc2165b29f88c5f62f712497de069b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index 8adf50793..4f8e25bee 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -19,7 +19,6 @@ using namespace std; #include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" -#include "inspircd_util.h" #include #include #include @@ -50,13 +49,8 @@ using namespace std; extern int MODCOUNT; extern std::vector modules; extern std::vector factory; - -extern char ServerName[MAXBUF]; - extern time_t TIME; - -extern FILE *log_file; -extern char DNSServer[MAXBUF]; +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) */ @@ -104,7 +98,7 @@ void tidystring(char* str) while (go_again) { bool noparse = false; - unsigned int t = 0, a = 0; + int t = 0, a = 0; go_again = false; const int lenofstr = strlen(str); @@ -151,10 +145,6 @@ void chop(char* str) log(DEBUG,"ERROR! Null string passed to chop()!"); return; } - string temp = str; - FOREACH_MOD OnServerRaw(temp,false,NULL); - const char* str2 = temp.c_str(); - snprintf(str,MAXBUF,"%s",str2); if (strlen(str) >= 511) { str[510] = '\r'; @@ -183,9 +173,9 @@ void NonBlocking(int s) int CleanAndResolve (char *resolvedHost, const char *unresolvedHost) { - DNS d(DNSServer); + DNS d(Config->DNSServer); int fd = d.ReverseLookup(unresolvedHost); - if (fd < 1) + if (fd < 0) return 0; time_t T = time(NULL)+1; while ((!d.HasResult()) && (time(NULL)fd > -1) { int MOD_RESULT = 0; - FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos)); + FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(user,gecos)); if (MOD_RESULT) return; - FOREACH_MOD OnChangeName(user,gecos); + 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) @@ -232,12 +222,13 @@ void ChangeDisplayedHost(userrec* user, const char* host) if (user->fd > -1) { int MOD_RESULT = 0; - FOREACH_RESULT(OnChangeLocalUserHost(user,host)); + FOREACH_RESULT(I_OnChangeLocalUserHost,OnChangeLocalUserHost(user,host)); if (MOD_RESULT) return; - FOREACH_MOD OnChangeHost(user,host); + FOREACH_MOD(I_OnChangeHost,OnChangeHost(user,host)); } strlcpy(user->dhost,host,160); + 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 */ @@ -253,17 +244,17 @@ int isident(const char* n) { return 0; } - for (unsigned int i = 0; i < strlen(n); i++) + for (char* i = (char*)n; *i; i++) { - if ((n[i] < 33) || (n[i] > 125)) + if ((*i >= 'A') && (*i <= '}')) { - return 0; + continue; } - /* can't occur ANYWHERE in an Ident! */ - if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i])) + if (strchr(".-0123456789",*i)) { - return 0; + continue; } + return 0; } return 1; } @@ -271,11 +262,7 @@ int isident(const char* n) int isnick(const char* n) { - if (!n) - { - return 0; - } - if (!strcmp(n,"")) + if (!n || !*n) { return 0; } @@ -283,22 +270,20 @@ int isnick(const char* n) { return 0; } - for (unsigned int i = 0; i != strlen(n); i++) + for (char* i = (char*)n; *i; i++) { - if ((n[i] < 33) || (n[i] > 125)) + /* can occur anywhere in a nickname */ + if ((*i >= 'A') && (*i <= '}')) { - return 0; + continue; } - /* can't occur ANYWHERE in a nickname! */ - if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i])) + /* can occur anywhere BUT the first char of a nickname */ + if ((strchr("-0123456789",*i)) && (i > n)) { - return 0; - } - /* can't occur as the first char of a nickname... */ - if ((strchr("0123456789",n[i])) && (!i)) - { - return 0; + continue; } + /* invalid character! abort */ + return 0; } return 1; } @@ -340,6 +325,24 @@ char* cmode(userrec *user, chanrec *chan) return ""; } +int cflags(userrec *user, chanrec *chan) +{ + if ((!chan) || (!user)) + return 0; + + for (unsigned int i = 0; i < user->chans.size(); i++) + { + if (user->chans[i].channel) + { + if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) + { + return user->chans[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. */ @@ -422,7 +425,7 @@ 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); @@ -440,6 +443,7 @@ std::string chlist(userrec *user,userrec* source) { return lst; } + bool userinvisible = (strchr(user->modes,'i')); for (unsigned int i = 0; i < user->chans.size(); i++) { if (user->chans[i].channel != NULL) @@ -449,8 +453,9 @@ std::string chlist(userrec *user,userrec* 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 - if (((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET))) || (has_channel(source,user->chans[i].channel))) + // 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) + " "; }