X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmessage.cpp;h=268cc65540617635467ffc534503a82fa837ae0a;hb=922d4ebf7a27a6577d6b4f91e0f42ccdfa989455;hp=e8d55150a9d4028e52aa79b28920ee10a14eb61b;hpb=61637bdbb3a84527d4f93c2ba8792a6efd29ba8f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/message.cpp b/src/message.cpp
index e8d55150a..268cc6554 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:
  *                <brain@chatspike.net>
  *           	  <Craig@chatspike.net>
@@ -18,31 +18,25 @@ using namespace std;
 
 #include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspircd_util.h"
+#include "configreader.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
 #include <sys/utsname.h>
 #include <time.h>
 #include <string>
-#ifdef GCC3
 #include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include <map>
 #include <sstream>
 #include <vector>
 #include <deque>
-#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"
@@ -51,413 +45,250 @@ using namespace std;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
-
-extern char ServerName[MAXBUF];
-
 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) */
-
+ * (used by QUIT, NICK etc which arent channel specific notices)
+ *
+ * The old algorithm in 1.0 for this was relatively inefficient, iterating over
+ * the first users channels then the second users channels within the outer loop,
+ * therefore it was a maximum of x*y iterations (upon returning 0 and checking
+ * all possible iterations). However this new function instead checks against the
+ * channel's userlist in the inner loop which is a std::map<userrec*,userrec*>
+ * and saves us time as we already know what pointer value we are after.
+ * Don't quote me on the maths as i am not a mathematician or computer scientist,
+ * but i believe this algorithm is now x+(log y) maximum iterations instead.
+ */
 int common_channels(userrec *u, userrec *u2)
 {
-	if ((!u) || (!u2))
-	{
-		log(DEFAULT,"*** BUG *** common_channels was given an invalid parameter");
+	if ((!u) || (!u2) || (u->registered != REG_ALL) || (u2->registered != REG_ALL))
 		return 0;
-	}
-	for (int i = 0; i != MAXCHANS; i++)
-	{
-		for (int z = 0; z != MAXCHANS; z++)
-		{
-			if ((u->chans[i].channel != NULL) && (u2->chans[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 ((c_count(u)) && (c_count(u2)))
-					{
-						return 1;
-					}
-				}
-			}
-		}
-	}
-	return 0;
-}
-
 
-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))
-	{
-		str++;
-	}
-	
-	while (go_again)
+	/* Outer loop */
+	for (std::vector<ucrec*>::const_iterator i = u->chans.begin(); i != u->chans.end(); i++)
 	{
-		bool noparse = false;
-		unsigned int t = 0, a = 0;
-		go_again = false;
-		while (a < strlen(str))
+		/* Fetch the channel from the user */
+		ucrec* user_channel = *i;
+
+		if (user_channel->channel)
 		{
-			if ((a<strlen(str)-1) && (noparse==false))
-			{
-				if ((str[a] == ' ') && (str[a+1] == ' '))
-				{
-					log(DEBUG,"Tidied extra space out of string: %s",str);
-					go_again = true;
-					a++;
-				}
-			}
-			
-			if (a<strlen(str)-1)
-			{
-				if ((str[a] == ' ') && (str[a+1] == ':'))
-				{
-					noparse = true;
-				}
-			}
-			
-			temp[t++] = str[a++];
+			/* Eliminate the inner loop (which used to be ~equal in size to the outer loop)
+			 * by replacing it with a map::find which *should* be more efficient
+			 */
+			if (user_channel->channel->HasUser(u2))
+				return 1;
 		}
-		temp[t] = '\0';
-		strlcpy(str,temp,MAXBUF);
-	}
-}
-
-/* chop a string down to 512 characters and preserve linefeed (irc max
- * line length) */
-
-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();
-	snprintf(str,MAXBUF,"%s",str2);
-	if (strlen(str) >= 511)
-	{
-		str[510] = '\r';
-		str[511] = '\n';
-		str[512] = '\0';
-		log(DEBUG,"Excess line chopped.");
 	}
+	return 0;
 }
 
-
 void Blocking(int s)
 {
-	int flags;
-	log(DEBUG,"Blocking: %d",s);
-	flags = fcntl(s, F_GETFL, 0);
+	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);
+	int flags = fcntl(s, F_GETFL, 0);
 	fcntl(s, F_SETFL, flags | O_NONBLOCK);
 }
 
-int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
-{
-	DNS d(DNSServer);
-	int fd = d.ReverseLookup(unresolvedHost);
-	if (fd < 1)
-		return 0;
-	time_t T = time(NULL)+1;
-	while ((!d.HasResult()) && (time(NULL)<T));
-	std::string 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 ((*i)->channel)
 			z++;
 	return z;
 
 }
 
-bool hasumode(userrec* user, char mode)
-{
-	if (user)
-	{
-		return (strchr(user->modes,mode)>0);
-	}
-	else return false;
-}
-
-
 void ChangeName(userrec* user, const char* gecos)
 {
-	if (!strcasecmp(user->server,ServerName))
+	if (user->fd > -1)
 	{
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(OnChangeLocalUserGECOS(user,gecos));
+		FOREACH_RESULT(I_OnChangeLocalUserGECOS,OnChangeLocalUserGECOS(user,gecos));
 		if (MOD_RESULT)
 			return;
+		FOREACH_MOD(I_OnChangeName,OnChangeName(user,gecos));
 	}
-	strlcpy(user->fullname,gecos,MAXBUF);
+	strlcpy(user->fullname,gecos,MAXGECOS+1);
 }
 
 void ChangeDisplayedHost(userrec* user, const char* host)
 {
-        if (!strcasecmp(user->server,ServerName))
-        {
-                int MOD_RESULT = 0;
-                FOREACH_RESULT(OnChangeLocalUserHost(user,host));
-                if (MOD_RESULT)
-                        return;
-        }
-	strlcpy(user->dhost,host,160);
+	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)
 {
-        if (!n)
-
-        {
-                return 0;
-        }
-        if (!strcmp(n,""))
-        {
-                return 0;
-        }
-        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]))
-                {
-                        return 0;
-                }
-        }
-        return 1;
-}
-
-
-int isnick(const char* n)
-{
-	if (!n)
+	if (!n || !*n)
 	{
 		return 0;
 	}
-	if (!strcmp(n,""))
+	for (char* i = (char*)n; *i; i++)
 	{
+		if ((*i >= 'A') && (*i <= '}'))
+		{
+			continue;
+		}
+		if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
+		{
+			continue;
+		}
 		return 0;
 	}
-	if (strlen(n) > NICKMAX)
+	return 1;
+}
+
+
+int isnick(const char* n)
+{
+	if (!n || !*n)
 	{
 		return 0;
 	}
-	for (unsigned 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))
+		/* "A"-"}" can occur anywhere in a nickname */
+		if ((*i >= 'A') && (*i <= '}'))
 		{
-			return 0;
+			continue;
 		}
-		/* can't occur ANYWHERE in a nickname! */
-		if (strchr("<>,./?:;@'~#=+()*&%$£ \"!",n[i]))
+		/* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
+		if ((((*i >= '0') && (*i <= '9')) || (*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))
 	{
 		log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
 		return "";
 	}
-	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 ((*i)->channel == chan)
 		{
-			if ((!strcasecmp(user->chans[i].channel->name,chan->name)) && (chan != NULL))
+			if (((*i)->uc_modes & UCMODE_OP) > 0)
+			{
+				return "@";
+			}
+			if (((*i)->uc_modes & UCMODE_HOP) > 0)
+			{
+				return "%";
+			}
+			if (((*i)->uc_modes & UCMODE_VOICE) > 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 "+";
 			}
+			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 ((*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 (*i)->uc_modes;
 		}
 	}
-	return STATUS_NORMAL;
+	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 ((*i)->channel == chan)
 		{
-			if (!strcasecmp(u->chans[i].channel->name,c->name))
+			if (((*i)->uc_modes & UCMODE_OP) > 0)
 			{
-				return 1;
+				return STATUS_OP;
+			}
+			if (((*i)->uc_modes & UCMODE_HOP) > 0)
+			{
+				return STATUS_HOP;
+			}
+			if (((*i)->uc_modes & UCMODE_VOICE) > 0)
+			{
+				return STATUS_VOICE;
 			}
+			return STATUS_NORMAL;
 		}
 	}
-	return 0;
+	return STATUS_NORMAL;
 }
 
-
-void TidyBan(char *ban)
+std::string chlist(userrec *user,userrec* source)
 {
-	if (!ban) {
-		log(DEFAULT,"*** BUG *** TidyBan was given an invalid parameter");
-		return;
-	}
+	std::string list;
 	
-	char temp[MAXBUF],NICK[MAXBUF],IDENT[MAXBUF],HOST[MAXBUF];
-
-	strlcpy(temp,ban,MAXBUF);
-
-	char* pos_of_pling = strchr(temp,'!');
-	char* pos_of_at = strchr(temp,'@');
-
-	pos_of_pling[0] = '\0';
-	pos_of_at[0] = '\0';
-	pos_of_pling++;
-	pos_of_at++;
-
-	strlcpy(NICK,temp,NICKMAX);
-	strlcpy(IDENT,pos_of_pling,IDENTMAX+1);
-	strlcpy(HOST,pos_of_at,160);
-
-	snprintf(ban,MAXBUF,"%s!%s@%s",NICK,IDENT,HOST);
-}
-
-char lst[MAXBUF];
-
-char* chlist(userrec *user,userrec* source)
-{
-	char cmp[MAXBUF];
-        log(DEBUG,"chlist: %s",user->nick);
-	strcpy(lst,"");
-	if (!user)
-	{
-		return lst;
-	}
-	for (int i = 0; i != MAXCHANS; i++)
+	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)
-		{
-			if (user->chans[i].channel->name)
+		ucrec* rec = *i;
+		
+		if(rec->channel && rec->channel->name)
+		{	
+			/* If the target is the same as the sender, let them see all their channels.
+			 * If the channel is NOT private/secret OR the user shares a common channel
+			 * 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])) || (rec->channel->HasUser(source))))
 			{
-				strlcpy(cmp,user->chans[i].channel->name,MAXBUF);
-				strlcat(cmp," ",MAXBUF);
-				if (!strstr(lst,cmp))
-				{
-					// 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);
-					}
-				}
+				list.append(cmode(user, rec->channel)).append(rec->channel->name).append(" ");
 			}
 		}
 	}
-	if (strlen(lst))
-	{
-		lst[strlen(lst)-1] = '\0'; // chop trailing space
-	}
-	return lst;
+	return list;
 }
-
-
-