X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=de6e012ac15fca3bbace1d2229af91aeff4b29cd;hb=1f1258997c2d63eb54c5addece622af37f637a7b;hp=2239916c05598cbea70189b242ddd9588099ce5a;hpb=5cce62f7d799f073ea6ca1793328c08c2df7c3ff;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index 2239916c0..de6e012ac 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -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,46 +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" - -using namespace std; +#include "dns.h" +#include "helperfuncs.h" extern int MODCOUNT; 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)) { @@ -90,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; + } + 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'; + 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; @@ -252,25 +210,34 @@ bool hasumode(userrec* user, char mode) void ChangeName(userrec* user, const char* gecos) { + if (user->fd > -1) + { + int MOD_RESULT = 0; + FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos)); + if (MOD_RESULT) + return; + FOREACH_MOD OnChangeName(user,gecos); + } strlcpy(user->fullname,gecos,MAXBUF); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos); - NetSendToAll(buffer); } void ChangeDisplayedHost(userrec* user, const char* host) { + if (user->fd > -1) + { + int MOD_RESULT = 0; + FOREACH_RESULT(OnChangeLocalUserHost(user,host)); + if (MOD_RESULT) + return; + FOREACH_MOD OnChangeHost(user,host); + } strlcpy(user->dhost,host,160); - char buffer[MAXBUF]; - snprintf(buffer,MAXBUF,"b %s %s",user->nick,host); - NetSendToAll(buffer); } /* verify that a user's ident and nickname is valid */ int isident(const char* n) { - char v[MAXBUF]; if (!n) { @@ -280,14 +247,14 @@ int isident(const char* n) { return 0; } - for (int i = 0; i != strlen(n); i++) + for (unsigned int i = 0; i < strlen(n); i++) { if ((n[i] < 33) || (n[i] > 125)) { return 0; } /* can't occur ANYWHERE in an Ident! */ - if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i])) + if (strchr("<>,/?:;@'~#=+()*&%$£ \"!",n[i])) { return 0; } @@ -298,8 +265,6 @@ int isident(const char* n) int isnick(const char* n) { - int i = 0; - char v[MAXBUF]; if (!n) { return 0; @@ -308,11 +273,11 @@ int isnick(const char* n) { return 0; } - if (strlen(n) > NICKMAX-1) + if (strlen(n) > NICKMAX) { return 0; } - for (int i = 0; i != strlen(n); i++) + for (unsigned int i = 0; i != strlen(n); i++) { if ((n[i] < 33) || (n[i] > 125)) { @@ -344,8 +309,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) { @@ -367,6 +331,7 @@ char* cmode(userrec *user, chanrec *chan) } } } + return ""; } /* returns the status value for a given user on a channel, e.g. STATUS_OP for @@ -381,7 +346,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) { @@ -403,6 +371,7 @@ int cstatus(userrec *user, chanrec *chan) } } } + return STATUS_NORMAL; } /* returns 1 if user u has channel c in their record, 0 if not */ @@ -414,7 +383,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) { @@ -456,50 +425,33 @@ 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++) + 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 + if (((!(user->chans[i].channel->binarymodes & CM_PRIVATE)) && (!(user->chans[i].channel->binarymodes & CM_SECRET))) || (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); -} - -