X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=4f8e25bee7e0dc7a3370aeff581162be8ecd922d;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=1c2bd4cf467cb96b9e6acbb4d5db3b12ecf76f82;hpb=7a51b2bed1cdc0e6c2522f2b2d10f3f787ff677d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index 1c2bd4cf4..4f8e25bee 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -1,13 +1,28 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. + * E-mail: + * + * + * + * Written by Craig Edwards, Craig McLure, and others. + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + +using namespace std; + +#include "inspircd_config.h" #include "inspircd.h" #include "inspircd_io.h" -#include "inspircd_util.h" -#include "inspircd_config.h" #include #include #include -#include #include -#include #include #include #ifdef GCC3 @@ -18,45 +33,42 @@ #include #include #include -#include #include -#include -#include -#include -#include "connection.h" #include "users.h" -#include "servers.h" #include "ctables.h" #include "globals.h" #include "modules.h" #include "dynamic.h" #include "wildcard.h" +#include "commands.h" #include "message.h" +#include "inspstring.h" +#include "dns.h" +#include "helperfuncs.h" extern int MODCOUNT; -extern vector modules; -extern vector factory; +extern std::vector modules; +extern std::vector factory; +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) */ int common_channels(userrec *u, userrec *u2) { - int i = 0; - int z = 0; - if ((!u) || (!u2)) { log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter"); return 0; } - for (int i = 0; i != MAXCHANS; i++) + for (unsigned int i = 0; i < u->chans.size(); i++) { - for (z = 0; z != MAXCHANS; z++) + for (unsigned int z = 0; z != u2->chans.size(); z++) { 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 ((!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))) { @@ -69,62 +81,35 @@ int common_channels(userrec *u, userrec *u2) return 0; } - -void safedelete(userrec *p) -{ - if (p) - { - log(DEBUG,"deleting %s %s %s %s",p->nick,p->ident,p->dhost,p->fullname); - log(DEBUG,"safedelete(userrec*): pointer is safe to delete"); - delete p; - p = NULL; - } - else - { - log(DEBUG,"safedelete(userrec*): unsafe pointer operation squished"); - } -} - -void safedelete(chanrec *p) -{ - if (p) - { - delete p; - p = NULL; - log(DEBUG,"safedelete(chanrec*): pointer is safe to delete"); - } - else - { - log(DEBUG,"safedelete(chanrec*): unsafe pointer operation squished"); - } -} - - void tidystring(char* str) { // strips out double spaces before a : parameter - + char temp[MAXBUF]; bool go_again = true; - + if (!str) - { return; - } - - while ((str[0] == ' ') && (strlen(str)>0)) - { + + // pointer voodoo++ --w00t + while ((*str) && (*str == ' ')) str++; - } - + while (go_again) { bool noparse = false; int t = 0, a = 0; go_again = false; - while (a < strlen(str)) + 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 ((a= 512) - { - str[509] = '\r'; - str[510] = '\n'; - str[511] = '\0'; - } + 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; - log(DEBUG,"Blocking: %d",s); - flags = fcntl(s, F_GETFL, 0); - fcntl(s, F_SETFL, flags ^ O_NONBLOCK); + int flags; + log(DEBUG,"Blocking: %d",s); + 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); - //fcntl(s, F_SETFL, O_NONBLOCK); - fcntl(s, F_SETFL, flags | O_NONBLOCK); + int flags; + log(DEBUG,"NonBlocking: %d",s); + flags = fcntl(s, F_GETFL, 0); + fcntl(s, F_SETFL, flags | O_NONBLOCK); } int CleanAndResolve (char *resolvedHost, const char *unresolvedHost) { - struct hostent *hostPtr = NULL; - struct in_addr addr; - - memset (resolvedHost, '\0',MAXBUF); - if(unresolvedHost == NULL) - return(ERROR); - if ((inet_aton(unresolvedHost,&addr)) == 0) - return(ERROR); - hostPtr = gethostbyaddr ((char *)&addr.s_addr,sizeof(addr.s_addr),AF_INET); - if (hostPtr != NULL) - snprintf(resolvedHost,MAXBUF,"%s",hostPtr->h_name); - else - snprintf(resolvedHost,MAXBUF,"%s",unresolvedHost); - return (TRUE); + 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; @@ -231,33 +206,35 @@ bool hasumode(userrec* user, char mode) void ChangeName(userrec* user, const char* gecos) { - strncpy(user->fullname,gecos,MAXBUF); - - // TODO: replace these with functions: - // NetSendToAll - to all - // NetSendToCommon - to all that hold users sharing a common channel with another user - // NetSendToOne - to one server - // NetSendToAllExcept - send to all but one - // all by servername - - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos); - NetSendToAll(buffer); + 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) { - strncpy(user->dhost,host,160); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"b %s %s",user->nick,host); - NetSendToAll(buffer); + 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); + 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) { - char v[MAXBUF]; if (!n) { @@ -267,17 +244,17 @@ int isident(const char* n) { return 0; } - for (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; } @@ -285,36 +262,28 @@ int isident(const char* n) int isnick(const char* n) { - int i = 0; - char v[MAXBUF]; - if (!n) - { - return 0; - } - if (!strcmp(n,"")) + if (!n || !*n) { return 0; } - if (strlen(n) > NICKMAX-1) + if (strlen(n) > NICKMAX) { return 0; } - for (int i = 0; i != strlen(n); i++) + for (char* i = (char*)n; *i; 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; } @@ -331,26 +300,47 @@ char* cmode(userrec *user, chanrec *chan) return ""; } - int i; - for (int i = 0; i != MAXCHANS; i++) + for (unsigned int i = 0; i < user->chans.size(); i++) { - if ((user->chans[i].channel == chan) && (chan != NULL)) + if (user->chans[i].channel) { - if ((user->chans[i].uc_modes & UCMODE_OP) > 0) - { - return "@"; - } - if ((user->chans[i].uc_modes & UCMODE_HOP) > 0) + if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) { - return "%"; + 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 ""; } - if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0) + } + } + 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 "+"; + return user->chans[i].uc_modes; } - return ""; } } + return 0; } /* returns the status value for a given user on a channel, e.g. STATUS_OP for @@ -365,25 +355,32 @@ int cstatus(userrec *user, chanrec *chan) return 0; } - for (int i = 0; i != MAXCHANS; i++) + if (is_uline(user->server)) + return STATUS_OP; + + for (unsigned int i = 0; i < user->chans.size(); i++) { - if ((user->chans[i].channel == chan) && (chan != NULL)) + if (user->chans[i].channel) { - if ((user->chans[i].uc_modes & UCMODE_OP) > 0) - { - return STATUS_OP; - } - if ((user->chans[i].uc_modes & UCMODE_HOP) > 0) + if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL)) { - return STATUS_HOP; - } - if ((user->chans[i].uc_modes & UCMODE_VOICE) > 0) - { - return STATUS_VOICE; + 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_NORMAL; } } + return STATUS_NORMAL; } /* returns 1 if user u has channel c in their record, 0 if not */ @@ -395,11 +392,14 @@ int has_channel(userrec *u, chanrec *c) log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter"); return 0; } - for (int i =0; i != MAXCHANS; i++) + for (unsigned int i =0; i < u->chans.size(); i++) { - if (u->chans[i].channel == c) + if (u->chans[i].channel) { - return 1; + if (!strcasecmp(u->chans[i].channel->name,c->name)) + { + return 1; + } } } return 0; @@ -415,7 +415,7 @@ void TidyBan(char *ban) char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF]; - strcpy(temp,ban); + strlcpy(temp,ban,MAXBUF); char* pos_of_pling = strchr(temp,'!'); char* pos_of_at = strchr(temp,'@'); @@ -425,59 +425,44 @@ void TidyBan(char *ban) pos_of_pling++; pos_of_at++; - strncpy(NICK,temp,NICKMAX); - strncpy(IDENT,pos_of_pling,IDENTMAX+1); - strncpy(HOST,pos_of_at,160); + strlcpy(NICK,temp,NICKMAX-1); + strlcpy(IDENT,pos_of_pling,IDENTMAX+1); + strlcpy(HOST,pos_of_at,160); - sprintf(ban,"%s!%s@%s",NICK,IDENT,HOST); + snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST); } char lst[MAXBUF]; -char* chlist(userrec *user) +std::string chlist(userrec *user,userrec* source) { - int i = 0; - char cmp[MAXBUF]; - + std::string cmp = ""; + std::string lst = ""; log(DEBUG,"chlist: %s",user->nick); - strcpy(lst,""); if (!user) { return lst; } - for (int i = 0; i != MAXCHANS; i++) + 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) { - strcpy(cmp,user->chans[i].channel->name); - strcat(cmp," "); - if (!strstr(lst,cmp)) + cmp = std::string(user->chans[i].channel->name) + " "; + if (!strstr(lst.c_str(),cmp.c_str())) { - if ((!user->chans[i].channel->c_private) && (!user->chans[i].channel->secret)) + // 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))))) { - strcat(lst,cmode(user,user->chans[i].channel)); - strcat(lst,user->chans[i].channel->name); - strcat(lst," "); + lst = lst + std::string(cmode(user,user->chans[i].channel)) + std::string(user->chans[i].channel->name) + " "; } } } } } - if (strlen(lst)) - { - lst[strlen(lst)-1] = '\0'; // chop trailing space - } return lst; } - -void send_network_quit(const char* nick, const char* reason) -{ - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"Q %s :%s",nick,reason); - NetSendToAll(buffer); -} - -