X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=d071b13f0b1696e333604d0eeb1093ba4ea5a7e3;hb=20dbeb8cef60920c140ff08fa3e0d9f2c01fa430;hp=c2ac34d8880f60af880480388ad5b4bc7f3b9988;hpb=21ae94afcbc9e4aecc97b280b0c97349565493ce;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index c2ac34d88..d071b13f0 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: * * @@ -14,16 +14,15 @@ * --------------------------------------------------- */ +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 @@ -34,50 +33,38 @@ #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" - -using namespace std; +#include "helperfuncs.h" extern int MODCOUNT; extern std::vector modules; extern std::vector factory; - 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) { - 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)) { @@ -94,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) + if (strlen(str) >= 511) { - str[509] = '\r'; - str[510] = '\n'; - str[511] = '\0'; + str[510] = '\r'; + str[511] = '\n'; + str[512] = '\0'; + log(DEBUG,"Excess line chopped."); } } @@ -215,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)chans.size(); i++) if (u->chans[i].channel != NULL) z++; return z; @@ -248,25 +206,35 @@ bool hasumode(userrec* user, char mode) void ChangeName(userrec* user, const char* gecos) { - strlcpy(user->fullname,gecos,MAXBUF); - 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) { + 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); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"b %s %s",user->nick,host); - NetSendToAll(buffer); + 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) { @@ -276,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; } @@ -294,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)) + /* 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,8 +300,7 @@ 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) { @@ -366,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. */ @@ -378,7 +355,10 @@ 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) { @@ -412,7 +392,7 @@ 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) { @@ -454,50 +434,35 @@ void TidyBan(char *ban) 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) { - strlcpy(cmp,user->chans[i].channel->name,MAXBUF); - strlcat(cmp," ",MAXBUF); - 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))))) { - strlcat(lst,cmode(user,user->chans[i].channel),MAXBUF); - strlcat(lst,user->chans[i].channel->name,MAXBUF); - strlcat(lst," ",MAXBUF); + 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); -} - -