X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=1aeee4ae457554dc519ad60dea2c2b4e4b10aeb6;hb=d5fed3976bba0f1082522da9b79b6b1cc93d4c56;hp=f7576fe4789fe2ba7a0bcbcfd9ba13bfa6c3cc3d;hpb=deb5dd0dd3b9aeacc544080569c57dacb6cad9de;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/message.cpp b/src/message.cpp index f7576fe47..1aeee4ae4 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -1,3 +1,19 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * Inspire is copyright (C) 2002-2004 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. + * + * --------------------------------------------------- + */ + #include "inspircd.h" #include "inspircd_io.h" #include "inspircd_util.h" @@ -5,9 +21,7 @@ #include #include #include -#include #include -#include #include #include #ifdef GCC3 @@ -18,11 +32,7 @@ #include #include #include -#include #include -#include -#include -#include #include "connection.h" #include "users.h" #include "servers.h" @@ -32,21 +42,28 @@ #include "dynamic.h" #include "wildcard.h" #include "message.h" +#include "inspstring.h" +#include "dns.h" +#include "helperfuncs.h" using namespace std; extern int MODCOUNT; -extern vector modules; -extern vector factory; +extern std::vector modules; +extern std::vector factory; + +extern char ServerName[MAXBUF]; + +extern time_t TIME; + +extern FILE *log_file; +extern char DNSServer[MAXBUF]; /* 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"); @@ -54,7 +71,7 @@ int common_channels(userrec *u, userrec *u2) } for (int i = 0; i != MAXCHANS; i++) { - for (z = 0; z != MAXCHANS; z++) + for (int z = 0; z != MAXCHANS; z++) { if ((u->chans[i].channel != NULL) && (u2->chans[z].channel != NULL)) { @@ -147,7 +164,7 @@ void tidystring(char* str) temp[t++] = str[a++]; } temp[t] = '\0'; - strncpy(str,temp,MAXBUF); + strlcpy(str,temp,MAXBUF); } } @@ -156,59 +173,52 @@ void tidystring(char* str) void chop(char* str) { - 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(); - sprintf(str,"%s",str2); - - - if (strlen(str) >= 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(DNSServer); + int fd = d.ReverseLookup(unresolvedHost); + if (fd < 1) + return 0; + time_t T = time(NULL)+1; + while ((!d.HasResult()) && (time(NULL)fullname,gecos,MAXBUF); + if (!strcasecmp(user->server,ServerName)) + { + int MOD_RESULT = 0; + FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos)); + if (MOD_RESULT) + return; + } + strlcpy(user->fullname,gecos,MAXBUF); char buffer[MAXBUF]; snprintf(buffer,MAXBUF,"a %s :%s",user->nick,gecos); NetSendToAll(buffer); @@ -241,7 +258,14 @@ void ChangeName(userrec* user, const char* gecos) void ChangeDisplayedHost(userrec* user, const char* host) { - strncpy(user->dhost,host,160); + if (!strcasecmp(user->server,ServerName)) + { + int MOD_RESULT = 0; + FOREACH_RESULT(OnChangeLocalUserHost(user,host)); + if (MOD_RESULT) + return; + } + strlcpy(user->dhost,host,160); char buffer[MAXBUF]; snprintf(buffer,MAXBUF,"b %s %s",user->nick,host); NetSendToAll(buffer); @@ -251,7 +275,6 @@ void ChangeDisplayedHost(userrec* user, const char* host) int isident(const char* n) { - char v[MAXBUF]; if (!n) { @@ -279,8 +302,6 @@ int isident(const char* n) int isnick(const char* n) { - int i = 0; - char v[MAXBUF]; if (!n) { return 0; @@ -324,8 +345,6 @@ char* cmode(userrec *user, chanrec *chan) log(DEFAULT,"*** BUG *** cmode was given an invalid parameter"); return ""; } - - int i; for (int i = 0; i != MAXCHANS; i++) { if (user->chans[i].channel) @@ -348,6 +367,7 @@ char* cmode(userrec *user, chanrec *chan) } } } + return ""; } /* returns the status value for a given user on a channel, e.g. STATUS_OP for @@ -384,6 +404,7 @@ int cstatus(userrec *user, chanrec *chan) } } } + return STATUS_NORMAL; } /* returns 1 if user u has channel c in their record, 0 if not */ @@ -418,7 +439,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,'@'); @@ -428,20 +449,18 @@ 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); + 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) +char* chlist(userrec *user,userrec* source) { - int i = 0; char cmp[MAXBUF]; - log(DEBUG,"chlist: %s",user->nick); strcpy(lst,""); if (!user) @@ -454,15 +473,16 @@ char* chlist(userrec *user) { if (user->chans[i].channel->name) { - strcpy(cmp,user->chans[i].channel->name); - strcat(cmp," "); + strlcpy(cmp,user->chans[i].channel->name,MAXBUF); + strlcat(cmp," ",MAXBUF); if (!strstr(lst,cmp)) { - 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))) { - strcat(lst,cmode(user,user->chans[i].channel)); - strcat(lst,user->chans[i].channel->name); - strcat(lst," "); + strlcat(lst,cmode(user,user->chans[i].channel),MAXBUF); + strlcat(lst,user->chans[i].channel->name,MAXBUF); + strlcat(lst," ",MAXBUF); } } }