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

diff --git a/src/message.cpp b/src/message.cpp
index e8d55150a..de6e012ac 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -19,7 +19,6 @@ using namespace std;
 #include "inspircd_config.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
-#include "inspircd_util.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/errno.h>
@@ -35,14 +34,13 @@ using namespace std;
 #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,13 +49,8 @@ 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) */
@@ -69,9 +62,9 @@ int common_channels(userrec *u, userrec *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 (int 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))
 			{
@@ -88,32 +81,35 @@ int common_channels(userrec *u, userrec *u2)
 	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))
-	{
+
+	// pointer voodoo++ --w00t
+	while ((*str) && (*str == ' '))
 		str++;
-	}
-	
+
 	while (go_again)
 	{
 		bool noparse = false;
-		unsigned int t = 0, a = 0;
+		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] == ' '))
 				{
@@ -122,17 +118,18 @@ 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';
 		strlcpy(str,temp,MAXBUF);
 	}
@@ -180,9 +177,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)<T));
@@ -194,7 +191,7 @@ int CleanAndResolve (char *resolvedHost, const char *unresolvedHost)
 int c_count(userrec* u)
 {
 	int z = 0;
-	for (int i =0; i != MAXCHANS; i++)
+	for (unsigned int i =0; i < u->chans.size(); i++)
 		if (u->chans[i].channel != NULL)
 			z++;
 	return z;
@@ -213,24 +210,26 @@ bool hasumode(userrec* user, char mode)
 
 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));
 		if (MOD_RESULT)
 			return;
+		FOREACH_MOD OnChangeName(user,gecos);
 	}
 	strlcpy(user->fullname,gecos,MAXBUF);
 }
 
 void ChangeDisplayedHost(userrec* user, const char* host)
 {
-        if (!strcasecmp(user->server,ServerName))
+        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);
 }
@@ -309,7 +308,8 @@ char* cmode(userrec *user, chanrec *chan)
 		log(DEFAULT,"*** BUG *** cmode was given an invalid parameter");
 		return "";
 	}
-	for (int i = 0; i != MAXCHANS; i++)
+
+	for (unsigned int i = 0; i < user->chans.size(); i++)
 	{
 		if (user->chans[i].channel)
 		{
@@ -346,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)
 		{
@@ -380,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)
 		{
@@ -422,42 +425,33 @@ void TidyBan(char *ban)
 
 char lst[MAXBUF];
 
-char* chlist(userrec *user,userrec* source)
+std::string chlist(userrec *user,userrec* source)
 {
-	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 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;
 }
 
-
-