X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=28a11fda9645f1cc0ed58624bdfeaf62c5875b1f;hb=84a19a9ab6129deb71cdc24b216b74dd8eb80978;hp=eb25a672cd7429a6ab32226d94229b73dbb07a89;hpb=9a60d7454d57019a28221f63905ce3dbb7310f07;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/message.cpp b/src/message.cpp
index eb25a672c..28a11fda9 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -1,13 +1,28 @@
-#include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *           	  <Craig@chatspike.net>
+ *     
+ * 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 "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/utsname.h>
-#include <cstdio>
 #include <time.h>
 #include <string>
 #ifdef GCC3
@@ -18,47 +33,41 @@
 #include <map>
 #include <sstream>
 #include <vector>
-#include <errno.h>
 #include <deque>
-#include <errno.h>
-#include <unistd.h>
-#include <sched.h>
-#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"
-
-using namespace std;
+#include "inspstring.h"
+#include "dns.h"
+#include "helperfuncs.h"
 
 extern int MODCOUNT;
-extern vector<Module*> modules;
-extern vector<ircd_module*> factory;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> 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))
+	if ((!u) || (!u2) || (u->registered != 7) || (u2->registered != 7))
 	{
-		log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
 		return 0;
 	}
-	for (int i = 0; i != MAXCHANS; i++)
+	for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
 	{
-		for (z = 0; z != MAXCHANS; z++)
+		for (std::vector<ucrec*>::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)))
 					{
@@ -71,62 +80,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<strlen(str)-1) && (noparse==false))
+			if ((a < lenofstr - 1) && (noparse == false))
 			{
 				if ((str[a] == ' ') && (str[a+1] == ' '))
 				{
@@ -135,19 +117,20 @@ void tidystring(char* str)
 					a++;
 				}
 			}
-			
-			if (a<strlen(str)-1)
+
+			if (a < lenofstr - 1)
 			{
 				if ((str[a] == ' ') && (str[a+1] == ':'))
 				{
 					noparse = true;
 				}
 			}
-			
+
 			temp[t++] = str[a++];
 		}
+
 		temp[t] = '\0';
-		strncpy(str,temp,MAXBUF);
+		strlcpy(str,temp,MAXBUF);
 	}
 }
 
@@ -156,66 +139,60 @@ 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);
-  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;
+	}
+	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 = 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 = fcntl(s, F_GETFL, 0);
+	fcntl(s, F_SETFL, flags | O_NONBLOCK);
 }
 
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
+int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward)
 {
-  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);
+	int fd;
+	std::string ipaddr;
+
+	DNS d(Config->DNSServer);
+	if (forward)
+		fd = d.ForwardLookup(unresolvedHost);
+	else
+		fd = d.ReverseLookup(unresolvedHost);
+	if (fd < 0)
+		return 0;
+	time_t T = time(NULL)+1;
+	while ((!d.HasResult()) && (time(NULL)<T));
+	if (forward)
+		ipaddr = d.GetResultIP();
+	else
+		ipaddr = d.GetResult();
+	strlcpy(resolvedHost,ipaddr.c_str(),MAXBUF);
+	return (ipaddr != "");
 }
 
 int c_count(userrec* u)
 {
 	int z = 0;
-	for (int i =0; i != MAXCHANS; i++)
-		if (u->chans[i].channel != NULL)
+	for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
+		if (((ucrec*)(*i))->channel)
 			z++;
 	return z;
 
@@ -233,91 +210,85 @@ bool hasumode(userrec* user, char mode)
 
 void ChangeName(userrec* user, const char* gecos)
 {
-	strncpy(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)
 {
-	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,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)
 {
-        char v[MAXBUF];
-        if (!n)
-
-        {
-                return 0;
-        }
-        if (!strcmp(n,""))
-        {
-                return 0;
-        }
-        for (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]))
-                {
-                        return 0;
-                }
-        }
-        return 1;
-}
-
-
-int isnick(const char* n)
-{
-	int i = 0;
-	char v[MAXBUF];
-	if (!n)
+	if (!n || !*n)
 	{
 		return 0;
 	}
-	if (!strcmp(n,""))
+	for (char* i = (char*)n; *i; i++)
 	{
+		if ((*i >= 'A') && (*i <= '}'))
+		{
+			continue;
+		}
+		if (strchr(".-0123456789",*i))
+		{
+			continue;
+		}
 		return 0;
 	}
-	if (strlen(n) > NICKMAX-1)
+	return 1;
+}
+
+
+int isnick(const char* n)
+{
+	if (!n || !*n)
 	{
 		return 0;
 	}
-	for (int i = 0; i != strlen(n); i++)
+	int p = 0;
+	for (char* i = (char*)n; *i; i++, p++)
 	{
-		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;
+	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))
 	{
@@ -325,90 +296,80 @@ char* cmode(userrec *user, chanrec *chan)
 		return "";
 	}
 
-	int i;
-	for (int i = 0; i != MAXCHANS; i++)
+	for (std::vector<ucrec*>::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 "";
 }
 
-/* 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. */
-
-int cstatus(userrec *user, chanrec *chan)
+int cflags(userrec *user, chanrec *chan)
 {
 	if ((!chan) || (!user))
-	{
-		log(DEFAULT,"*** BUG *** cstatus was given an invalid parameter");
 		return 0;
-	}
 
-	for (int i = 0; i != MAXCHANS; i++)
+	for (std::vector<ucrec*>::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 ((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 ((ucrec*)(*i))->uc_modes;
 		}
 	}
+	return 0;
 }
 
-/* returns 1 if user u has channel c in their record, 0 if not */
+/* 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. */
 
-int has_channel(userrec *u, chanrec *c)
+int cstatus(userrec *user, chanrec *chan)
 {
-	if ((!u) || (!c))
+	if ((!chan) || (!user))
 	{
-		log(DEFAULT,"*** BUG *** has_channel was given an invalid parameter");
+		log(DEFAULT,"*** BUG *** cstatus was given an invalid parameter");
 		return 0;
 	}
-	for (int i =0; i != MAXCHANS; i++)
+
+	if (is_uline(user->server))
+		return STATUS_OP;
+
+	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
 	{
-		if (u->chans[i].channel)
+		if (((ucrec*)(*i))->channel == chan)
 		{
-			if (!strcasecmp(u->chans[i].channel->name,c->name))
+			if ((((ucrec*)(*i))->uc_modes & UCMODE_OP) > 0)
 			{
-				return 1;
+				return STATUS_OP;
 			}
+			if ((((ucrec*)(*i))->uc_modes & UCMODE_HOP) > 0)
+			{
+				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) {
@@ -418,7 +379,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,59 +389,46 @@ 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,63);
 
-	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];
-
-        log(DEBUG,"chlist: %s",user->nick);
-	strcpy(lst,"");
-	if (!user)
-	{
-		return lst;
-	}
-	for (int i = 0; i != MAXCHANS; i++)
+	/* Should this be a stringstream? Not sure if it would be faster as streams are more oriented at appending stuff, which is all we do */
+	std::ostringstream list;
+	
+	if (!user || !source)
+		return "";
+	
+	for (std::vector<ucrec*>::const_iterator i = user->chans.begin(); i != user->chans.end(); i++)
 	{
-		if (user->chans[i].channel != NULL)
+		ucrec* rec = *i;
+		
+		if(rec->channel && rec->channel->name)
 		{
-			if (user->chans[i].channel->name)
-			{
-				strcpy(cmp,user->chans[i].channel->name);
-				strcat(cmp," ");
-				if (!strstr(lst,cmp))
+			/* XXX - Why does this check need to be here at all? :< */
+			/* Commenting this out until someone finds a case where we need it */
+			//if (lst.find(rec->channel->name) == std::string::npos)
+			//{
+			
+				/*
+				 * If the target is the same as the sender, let them see all their channels.
+				 * If the channel is NOT private/secret AND the user is not invisible.
+				 * If the user is an oper, and the <options:operspywhois> option is set.
+				 */
+				if ((source == user) || (*source->oper && Config->OperSpyWhois) || (((!rec->channel->modes[CM_PRIVATE]) && (!rec->channel->modes[CM_SECRET]) && !(user->modebits & UM_INVISIBLE)) || (rec->channel->HasUser(source))))
 				{
-					if ((!user->chans[i].channel->c_private) && (!user->chans[i].channel->secret))
-					{
-						strcat(lst,cmode(user,user->chans[i].channel));
-						strcat(lst,user->chans[i].channel->name);
-						strcat(lst," ");
-					}
+					list << cmode(user, rec->channel) << rec->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);
+	
+	return list.str();
 }
-
-