X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=0ec8db966601540fe60e04324e8a958c8b65eef1;hb=86775e2e98f55b3b88befe2daff0ca23f02f3155;hp=842a6a4cad49dd95002986f46609422e4187773b;hpb=dc92b9996c92cfcafb7347e8e1c97e16ffd4e746;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 842a6a4ca..0ec8db966 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -2,85 +2,28 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-#include <stdarg.h>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
-#include "mode.h"
-#include "xline.h"
-#include "inspircd.h"
-
-static char TIMESTR[26];
-static time_t LAST = 0;
-
-/** Log()
- *  Write a line of text `text' to the logfile (and stdout, if in nofork) if the level `level'
- *  is greater than the configured loglevel.
- */
-void InspIRCd::Log(int level, const char* text, ...)
-{
-	/* Do this check again here so that we save pointless vsnprintf calls */
-	if ((level < Config->LogLevel) && !Config->forcedebug)
-		return;
-
-	va_list argsPtr;
-	char textbuffer[65536];
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, 65536, text, argsPtr);
-	va_end(argsPtr);
-
-	this->Log(level, std::string(textbuffer));
-}
-
-void InspIRCd::Log(int level, const std::string &text)
-{
-	if (!this->Config)
-		return;
-
-	/* If we were given -debug we output all messages, regardless of configured loglevel */
-	if ((level < Config->LogLevel) && !Config->forcedebug)
-		return;
-
-	if (Time() != LAST)
-	{
-		time_t local = Time();
-		struct tm *timeinfo = localtime(&local);
+/* $Core */
 
-		strlcpy(TIMESTR,asctime(timeinfo),26);
-		TIMESTR[24] = ':';
-		LAST = Time();
-	}
-
-	if (Config->log_file && Config->writelog)
-	{
-		std::string out = std::string(TIMESTR) + " " + text.c_str() + "\n";
-		this->Logger->WriteLogLine(out);
-	}
-
-	if (Config->nofork)
-	{
-		printf("%s %s\n", TIMESTR, text.c_str());
-	}
-}
+#include "inspircd.h"
+#include "xline.h"
+#include "exitcodes.h"
 
 std::string InspIRCd::GetServerDescription(const char* servername)
 {
-	std::string description = "";
+	std::string description;
 
 	FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
-	if (description != "")
+	if (!description.empty())
 	{
 		return description;
 	}
@@ -91,289 +34,156 @@ std::string InspIRCd::GetServerDescription(const char* servername)
 	}
 }
 
-/* XXX - We don't use WriteMode for this because WriteMode is very slow and
- * this isnt. Basically WriteMode has to iterate ALL the users 'n' times for
- * the number of modes provided, e.g. if you send WriteMode 'og' to write to
- * opers with globops, and you have 2000 users, thats 4000 iterations. WriteOpers
- * uses the oper list, which means if you have 2000 users but only 5 opers,
- * it iterates 5 times.
- */
-void InspIRCd::WriteOpers(const char* text, ...)
-{
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-
-	this->WriteOpers(std::string(textbuffer));
-}
-
-void InspIRCd::WriteOpers(const std::string &text)
-{
-	for (std::vector<userrec*>::iterator i = this->all_opers.begin(); i != this->all_opers.end(); i++)
-	{
-		userrec* a = *i;
-		if (IS_LOCAL(a) && a->modes[UM_SERVERNOTICE])
-		{
-			// send server notices to all with +s
-			a->WriteServ("NOTICE %s :%s",a->nick,text.c_str());
-		}
-	}
-}
-
-void InspIRCd::ServerNoticeAll(char* text, ...)
+/* Find a user record by nickname and return a pointer to it */
+User* InspIRCd::FindNick(const std::string &nick)
 {
-	if (!text)
-		return;
+	if (!nick.empty() && isdigit(*nick.begin()))
+		return FindUUID(nick);
 
-	char textbuffer[MAXBUF];
-	char formatbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
+	user_hash::iterator iter = this->Users->clientlist->find(nick);
 
-	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s",Config->ServerName,textbuffer);
+	if (iter == this->Users->clientlist->end())
+		/* Couldn't find it */
+		return NULL;
 
-	for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-	{
-		userrec* t = *i;
-		t->WriteServ(std::string(formatbuffer));
-	}
+	return iter->second;
 }
 
-void InspIRCd::ServerPrivmsgAll(char* text, ...)
+User* InspIRCd::FindNick(const char* nick)
 {
-	if (!text)
-		return;
+	if (isdigit(*nick))
+		return FindUUID(nick);
 
-	char textbuffer[MAXBUF];
-	char formatbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
+	user_hash::iterator iter = this->Users->clientlist->find(nick);
 
-	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s",Config->ServerName,textbuffer);
+	if (iter == this->Users->clientlist->end())
+		return NULL;
 
-	for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-	{
-		userrec* t = *i;
-		t->WriteServ(std::string(formatbuffer));
-	}
+	return iter->second;
 }
 
-void InspIRCd::WriteMode(const char* modes, int flags, const char* text, ...)
+User* InspIRCd::FindNickOnly(const std::string &nick)
 {
-	char textbuffer[MAXBUF];
-	int modelen;
-	va_list argsPtr;
-
-	if (!text || !modes || !flags)
-	{
-		this->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
-		return;
-	}
+	user_hash::iterator iter = this->Users->clientlist->find(nick);
 
-	va_start(argsPtr, text);
-	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
-	va_end(argsPtr);
-	modelen = strlen(modes);
+	if (iter == this->Users->clientlist->end())
+		return NULL;
 
-	if (flags == WM_AND)
-	{
-		for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-		{
-			userrec* t = *i;
-			bool send_to_user = true;
-
-			for (int n = 0; n < modelen; n++)
-			{
-				if (!t->modes[modes[n]-65])
-				{
-					send_to_user = false;
-					break;
-				}
-			}
-			if (send_to_user)
-				t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
-		}
-	}
-	else
-	if (flags == WM_OR)
-	{
-		for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-		{
-			userrec* t = *i;
-			bool send_to_user = false;
-
-			for (int n = 0; n < modelen; n++)
-			{
-				if (t->modes[modes[n]-65])
-				{
-					send_to_user = true;
-					break;
-				}
-			}
-			if (send_to_user)
-				t->WriteServ("NOTICE %s :%s",t->nick,textbuffer);
-		}
-	}
+	return iter->second;
 }
 
-/* Find a user record by nickname and return a pointer to it */
-
-userrec* InspIRCd::FindNick(const std::string &nick)
+User* InspIRCd::FindNickOnly(const char* nick)
 {
-	user_hash::iterator iter = clientlist.find(nick);
+	user_hash::iterator iter = this->Users->clientlist->find(nick);
 
-	if (iter == clientlist.end())
-		/* Couldn't find it */
+	if (iter == this->Users->clientlist->end())
 		return NULL;
 
 	return iter->second;
 }
 
-userrec* InspIRCd::FindNick(const char* nick)
+User *InspIRCd::FindUUID(const std::string &uid)
 {
-	user_hash::iterator iter;
+	return FindUUID(uid.c_str());
+}
 
-	if (!nick)
-		return NULL;
+User *InspIRCd::FindUUID(const char *uid)
+{
+	user_hash::iterator finduuid = this->Users->uuidlist->find(uid);
 
-	iter = clientlist.find(nick);
-	
-	if (iter == clientlist.end())
+	if (finduuid == this->Users->uuidlist->end())
 		return NULL;
 
-	return iter->second;
+	return finduuid->second;
 }
 
 /* find a channel record by channel name and return a pointer to it */
-
-chanrec* InspIRCd::FindChan(const char* chan)
+Channel* InspIRCd::FindChan(const char* chan)
 {
-	chan_hash::iterator iter;
-
-	if (!chan)
-		return NULL;
+	chan_hash::iterator iter = chanlist->find(chan);
 
-	iter = chanlist.find(chan);
-
-	if (iter == chanlist.end())
+	if (iter == chanlist->end())
 		/* Couldn't find it */
 		return NULL;
 
 	return iter->second;
 }
 
-chanrec* InspIRCd::FindChan(const std::string &chan)
+Channel* InspIRCd::FindChan(const std::string &chan)
 {
-	chan_hash::iterator iter = chanlist.find(chan);
+	chan_hash::iterator iter = chanlist->find(chan);
 
-	if (iter == chanlist.end())
+	if (iter == chanlist->end())
 		/* Couldn't find it */
 		return NULL;
 
 	return iter->second;
 }
 
-
-/*
- * sends out an error notice to all connected clients (not to be used
- * lightly!)
- */
-void InspIRCd::SendError(const char *s)
+/* Send an error notice to all users, registered or not */
+void InspIRCd::SendError(const std::string &s)
 {
-	for (std::vector<userrec*>::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+	for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
 	{
-		userrec* t = (userrec*)(*i);
-		if (t->registered == REG_ALL)
+		if ((*i)->registered == REG_ALL)
 		{
-		   	t->WriteServ("NOTICE %s :%s",t->nick,s);
+		   	(*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str());
 	   	}
 		else
 		{
-			// fix - unregistered connections receive ERROR, not NOTICE
-			t->Write("ERROR :%s",s);
+			/* Unregistered connections receive ERROR, not a NOTICE */
+			(*i)->Write("ERROR :" + s);
 		}
+		/* This might generate a whole load of EAGAIN, but we dont really
+		 * care about this, as if we call SendError something catastrophic
+		 * has occured anyway, and we wont receive the events for these.
+		 */
+		(*i)->FlushWriteBuf();
 	}
 }
 
-// this function counts all users connected, wether they are registered or NOT.
-int InspIRCd::UserCount()
-{
-	return clientlist.size();
-}
-
-// this counts only registered users, so that the percentages in /MAP don't mess up when users are sitting in an unregistered state
-int InspIRCd::RegisteredUserCount()
-{
-	return clientlist.size() - this->UnregisteredUserCount();
-}
-
-int InspIRCd::InvisibleUserCount()
+/* return channel count */
+long InspIRCd::ChannelCount()
 {
-	int c = 0;
-
-	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
-	{
-		c += ((i->second->registered == REG_ALL) && (i->second->modes[UM_INVISIBLE]));
-	}
-
-	return c;
+	return chanlist->size();
 }
 
-int InspIRCd::OperCount()
+bool InspIRCd::IsValidMask(const std::string &mask)
 {
-	int c = 0;
+	const char* dest = mask.c_str();
+	int exclamation = 0;
+	int atsign = 0;
 
-	for (user_hash::const_iterator i = clientlist.begin(); i != clientlist.end(); i++)
+	for (const char* i = dest; *i; i++)
 	{
-		if (*(i->second->oper))
-			c++;
-	}
-	return c;
-}
-
-int InspIRCd::UnregisteredUserCount()
-{
-	int c = 0;
+		/* out of range character, bad mask */
+		if (*i < 32 || *i > 126)
+		{
+			return false;
+		}
 
-	for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-	{
-		userrec* t = (userrec*)(*i);
-		if (t->registered != REG_ALL)
-			c++;
+		switch (*i)
+		{
+			case '!':
+				exclamation++;
+				break;
+			case '@':
+				atsign++;
+				break;
+		}
 	}
 
-	return c;
-}
-
-long InspIRCd::ChannelCount()
-{
-	return chanlist.size();
-}
-
-long InspIRCd::LocalUserCount()
-{
-	int c = 0;
-
-	for (std::vector<userrec*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
-	{
-		userrec* t = (userrec*)(*i);
-		if (t->registered == REG_ALL)
-			c++;
-	}
+	/* valid masks only have 1 ! and @ */
+	if (exclamation != 1 || atsign != 1)
+		return false;
 
-	return c;
+	return true;
 }
 
-bool InspIRCd::IsChannel(const char *chname)
+/* true for valid channel name, false else */
+bool IsChannelHandler::Call(const char *chname, size_t max)
 {
-	char *c;
+	const char *c = chname + 1;
 
 	/* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
 	if (!chname || *chname != '#')
@@ -381,7 +191,6 @@ bool InspIRCd::IsChannel(const char *chname)
 		return false;
 	}
 
-	c = (char *)chname + 1;
 	while (*c)
 	{
 		switch (*c)
@@ -394,9 +203,10 @@ bool InspIRCd::IsChannel(const char *chname)
 
 		c++;
 	}
-		
+
+	size_t len = c - chname;
 	/* too long a name - note funky pointer arithmetic here. */
-	if ((c - chname) > CHANMAX)
+	if (len > max)
 	{
 			return false;
 	}
@@ -404,13 +214,14 @@ bool InspIRCd::IsChannel(const char *chname)
 	return true;
 }
 
-bool InspIRCd::IsNick(const char* n)
+/* true for valid nickname, false else */
+bool IsNickHandler::Call(const char* n, size_t max)
 {
 	if (!n || !*n)
 		return false;
- 
-	int p = 0;
-	for (char* i = (char*)n; *i; i++, p++)
+
+	unsigned int p = 0;
+	for (const char* i = n; *i; i++, p++)
 	{
 		if ((*i >= 'A') && (*i <= '}'))
 		{
@@ -429,19 +240,77 @@ bool InspIRCd::IsNick(const char* n)
 	}
 
 	/* too long? or not -- pointer arithmetic rocks */
-	return (p < NICKMAX - 1);
+	return (p < max);
 }
 
-void InspIRCd::OpenLog(char** argv, int argc)
+/* return true for good ident, false else */
+bool IsIdentHandler::Call(const char* n)
 {
+	if (!n || !*n)
+		return false;
+
+	for (const char* i = n; *i; i++)
+	{
+		if ((*i >= 'A') && (*i <= '}'))
+		{
+			continue;
+		}
+
+		if (((*i >= '0') && (*i <= '9')) || (*i == '-') || (*i == '.'))
+		{
+			continue;
+		}
+
+		return false;
+	}
+
+	return true;
+}
+
+bool IsSIDHandler::Call(const std::string &str)
+{
+	/* Returns true if the string given is exactly 3 characters long,
+	 * starts with a digit, and the other two characters are A-Z or digits
+	 */
+	return ((str.length() == 3) && isdigit(str[0]) &&
+			((str[1] >= 'A' && str[1] <= 'Z') || isdigit(str[1])) &&
+			 ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
+}
+
+/* open the proper logfile */
+bool InspIRCd::OpenLog(char**, int)
+{
+	/* This function only happens at startup now */
+	if (Config->nofork)
+	{
+		this->Logs->SetupNoFork();
+	}
+	Config->MyDir = Config->GetFullProgDir();
+
+	/* Attempt to find home directory, portable to windows */
+	const char* home = getenv("HOME");
+	if (!home)
+	{
+		/* No $HOME, log to %USERPROFILE% */
+		home = getenv("USERPROFILE");
+		if (!home)
+		{
+			/* Nothing could be found at all, log to current dir */
+			Config->logpath = "./startup.log";
+		}
+	}
+
+	if (!Config->writelog) return true; // Skip opening default log if -nolog
+
 	if (!*this->LogFileName)
 	{
-		if (Config->logpath == "")
+		if (Config->logpath.empty())
 		{
-			Config->logpath = ServerConfig::GetFullProgDir(argv,argc) + "/ircd.log";
+			Config->logpath = "./startup.log";
 		}
 
-		Config->log_file = fopen(Config->logpath.c_str(),"a+");
+		if (!Config->log_file)
+			Config->log_file = fopen(Config->logpath.c_str(),"a+");
 	}
 	else
 	{
@@ -450,11 +319,15 @@ void InspIRCd::OpenLog(char** argv, int argc)
 
 	if (!Config->log_file)
 	{
-		printf("ERROR: Could not write to logfile %s: %s\n\n", Config->logpath.c_str(), strerror(errno));
-		Exit(ERROR);
+		return false;
 	}
 
-	this->Logger = new FileLogger(this, Config->log_file);
+	FileWriter* fw = new FileWriter(this, Config->log_file);
+	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
+
+	this->Logs->AddLogType("*", f, true);
+
+	return true;
 }
 
 void InspIRCd::CheckRoot()
@@ -462,63 +335,110 @@ void InspIRCd::CheckRoot()
 	if (geteuid() == 0)
 	{
 		printf("WARNING!!! You are running an irc server as ROOT!!! DO NOT DO THIS!!!\n\n");
-		this->Log(DEFAULT,"Cant start as root");
-		Exit(ERROR);
+		this->Logs->Log("STARTUP",DEFAULT,"Cant start as root");
+		Exit(EXIT_STATUS_ROOT);
 	}
 }
 
-void InspIRCd::CheckDie()
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
 {
-	if (*Config->DieValue)
-	{
-		printf("WARNING: %s\n\n",Config->DieValue);
-		this->Log(DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
-		Exit(ERROR);
-	}
+	std::string copy_text = text;
+
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(this, OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
+
+	if (!MOD_RESULT)
+		user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
-/* We must load the modules AFTER initializing the socket engine, now */
-void InspIRCd::LoadAllModules()
+void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
 {
-	char configToken[MAXBUF];
-	Config->module_names.clear();
-	this->ModCount = -1;
+	char textbuffer[MAXBUF];
+	va_list argsPtr;
+	va_start (argsPtr, format);
+	vsnprintf(textbuffer, MAXBUF, format, argsPtr);
+	va_end(argsPtr);
+
+	this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
+}
 
-	for (int count = 0; count < Config->ConfValueEnum(Config->config_data, "module"); count++)
+/** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array
+ * lookups and pointer maths.
+ */
+long InspIRCd::Duration(const std::string &str)
+{
+	unsigned char multiplier = 0;
+	long total = 0;
+	long times = 1;
+	long subtotal = 0;
+
+	/* Iterate each item in the string, looking for number or multiplier */
+	for (std::string::const_reverse_iterator i = str.rbegin(); i != str.rend(); ++i)
 	{
-		Config->ConfValue(Config->config_data, "module","name",count,configToken,MAXBUF);
-		printf("[\033[1;32m*\033[0m] Loading module:\t\033[1;32m%s\033[0m\n",configToken);
-		
-		if (!this->LoadModule(configToken))		
+		/* Found a number, queue it onto the current number */
+		if ((*i >= '0') && (*i <= '9'))
+		{
+			subtotal = subtotal + ((*i - '0') * times);
+			times = times * 10;
+		}
+		else
 		{
-			this->Log(DEFAULT,"There was an error loading a module: %s", this->ModuleError());
-			printf("\nThere was an error loading a module: %s\n\n",this->ModuleError());
-			Exit(ERROR);
+			/* Found something thats not a number, find out how much
+			 * it multiplies the built up number by, multiply the total
+			 * and reset the built up number.
+			 */
+			if (subtotal)
+				total += subtotal * duration_multi[multiplier];
+
+			/* Next subtotal please */
+			subtotal = 0;
+			multiplier = *i;
+			times = 1;
 		}
 	}
-	printf("\nA total of \033[1;32m%d\033[0m module%s been loaded.\n", this->ModCount+1, this->ModCount+1 == 1 ? " has" : "s have");
-	this->Log(DEFAULT,"Total loaded modules: %d", this->ModCount+1);
+	if (multiplier)
+	{
+		total += subtotal * duration_multi[multiplier];
+		subtotal = 0;
+	}
+	/* Any trailing values built up are treated as raw seconds */
+	return total + subtotal;
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const std::string &text)
+bool InspIRCd::ULine(const char* sserver)
 {
-	std::string copy_text = text;
-
-	int MOD_RESULT = 0;
-	FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
+	if (!sserver)
+		return false;
+	if (!*sserver)
+		return true;
 
-	if (!MOD_RESULT)
-		user->WriteServ("%d %s", numeric, copy_text.c_str());
+	return (Config->ulines.find(sserver) != Config->ulines.end());
 }
 
-void InspIRCd::SendWhoisLine(userrec* user, userrec* dest, int numeric, const char* format, ...)
+bool InspIRCd::SilentULine(const char* sserver)
 {
-	char textbuffer[MAXBUF];
-	va_list argsPtr;
-	va_start (argsPtr, format);
-	vsnprintf(textbuffer, MAXBUF, format, argsPtr);
-	va_end(argsPtr);
+	std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver);
+	if (n != Config->ulines.end())
+		return n->second;
+	else return false;
+}
 
-	this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
+std::string InspIRCd::TimeString(time_t curtime)
+{
+	return std::string(ctime(&curtime),24);
 }
 
+// You should only pass a single character to this.
+void InspIRCd::AddExtBanChar(char c)
+{
+	std::string &tok = Config->data005;
+	std::string::size_type ebpos;
+
+	if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos)
+	{
+		tok.append(" EXTBAN=,");
+		tok.push_back(c);
+	}
+	else
+		tok.insert(ebpos + 9, 1, c);
+}