X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=29a4ae9985d07539300c1ce2e00c3d054fa9b761;hb=bb81e1a5f38b1d6487e53aa5ac69ca7ced9f6562;hp=ce51f8c87c5be28c0d064f988c573260c1d84bc3;hpb=b70de5aa7840e8b43c9c5bdbeb0146ec1d5ea1a0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index ce51f8c87..29a4ae998 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,31 +49,25 @@ 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) */ 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))) { @@ -151,10 +144,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'; @@ -167,25 +156,21 @@ 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) { - 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)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; @@ -219,12 +204,12 @@ void ChangeName(userrec* user, const char* gecos) if (user->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,38 +217,34 @@ 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); + 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) - + if (!n || !*n) { return 0; } - if (!strcmp(n,"")) + for (char* i = (char*)n; *i; i++) { - return 0; - } - for (unsigned int i = 0; i < strlen(n); 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,43 +252,34 @@ int isident(const char* n) int isnick(const char* n) { - if (!n) + if (!n || !*n) { return 0; } - if (!strcmp(n,"")) + int p = 0; + for (char* i = (char*)n; *i; i++, p++) { - return 0; - } - if (strlen(n) > NICKMAX) - { - return 0; - } - for (unsigned int i = 0; i != strlen(n); i++) - { - if ((n[i] < 33) || (n[i] > 125)) - { - return 0; - } - /* can't occur ANYWHERE in a nickname! */ - if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i])) + /* 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)) + /* can occur anywhere BUT the first char of a nickname */ + if ((strchr("-0123456789",*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)) { @@ -315,31 +287,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. */ @@ -355,54 +339,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 1; + return STATUS_HOP; } + if ((((ucrec*)(*i))->uc_modes & UCMODE_VOICE) > 0) + { + return STATUS_VOICE; + } + return STATUS_NORMAL; } } - return 0; + return STATUS_NORMAL; } - void TidyBan(char *ban) { if (!ban) { @@ -422,9 +380,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); } @@ -435,25 +393,23 @@ std::string chlist(userrec *user,userrec* source) { std::string cmp = ""; std::string lst = ""; - log(DEBUG,"chlist: %s",user->nick); - if (!user) + if (!user || !source) { return lst; } - for (unsigned int i = 0; i < user->chans.size(); i++) + bool userinvisible = (user->modebits & UM_INVISIBLE); + for (std::vector::const_iterator i = user->chans.begin(); i != user->chans.end(); i++) { - if (user->chans[i].channel != NULL) + if ((((ucrec*)(*i))->channel != NULL) && (((ucrec*)(*i))->channel->name)) { - if (user->chans[i].channel->name) + cmp = std::string(((ucrec*)(*i))->channel->name) + " "; + if (!strstr(lst.c_str(),cmp.c_str())) { - 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) || ((((!(((ucrec*)(*i))->channel->binarymodes & CM_PRIVATE)) && (!(((ucrec*)(*i))->channel->binarymodes & CM_SECRET)) && (!userinvisible)) || (((ucrec*)(*i))->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) + " "; - } + lst = lst + std::string(cmode(user,((ucrec*)(*i))->channel)) + std::string(((ucrec*)(*i))->channel->name) + " "; } } }