1 files changed, 67 insertions, 168 deletions

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 439320c1e..7b2a29f77 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -22,8 +22,6 @@
  */
 
 
-/* $Core */
-
 #ifdef _WIN32
 #define _CRT_RAND_S
 #include <stdlib.h>
@@ -34,66 +32,26 @@
 #include "exitcodes.h"
 #include <iostream>
 
-std::string InspIRCd::GetServerDescription(const std::string& servername)
-{
-	std::string description;
-
-	FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
-
-	if (!description.empty())
-	{
-		return description;
-	}
-	else
-	{
-		// not a remote server that can be found, it must be me.
-		return Config->ServerDesc;
-	}
-}
-
 /* Find a user record by nickname and return a pointer to it */
 User* InspIRCd::FindNick(const std::string &nick)
 {
 	if (!nick.empty() && isdigit(*nick.begin()))
 		return FindUUID(nick);
 
-	user_hash::iterator iter = this->Users->clientlist->find(nick);
+	user_hash::iterator iter = this->Users->clientlist.find(nick);
 
-	if (iter == this->Users->clientlist->end())
+	if (iter == this->Users->clientlist.end())
 		/* Couldn't find it */
 		return NULL;
 
 	return iter->second;
 }
 
-User* InspIRCd::FindNick(const char* nick)
-{
-	if (isdigit(*nick))
-		return FindUUID(nick);
-
-	user_hash::iterator iter = this->Users->clientlist->find(nick);
-
-	if (iter == this->Users->clientlist->end())
-		return NULL;
-
-	return iter->second;
-}
-
 User* InspIRCd::FindNickOnly(const std::string &nick)
 {
-	user_hash::iterator iter = this->Users->clientlist->find(nick);
-
-	if (iter == this->Users->clientlist->end())
-		return NULL;
-
-	return iter->second;
-}
-
-User* InspIRCd::FindNickOnly(const char* nick)
-{
-	user_hash::iterator iter = this->Users->clientlist->find(nick);
+	user_hash::iterator iter = this->Users->clientlist.find(nick);
 
-	if (iter == this->Users->clientlist->end())
+	if (iter == this->Users->clientlist.end())
 		return NULL;
 
 	return iter->second;
@@ -101,36 +59,20 @@ User* InspIRCd::FindNickOnly(const char* nick)
 
 User *InspIRCd::FindUUID(const std::string &uid)
 {
-	user_hash::iterator finduuid = this->Users->uuidlist->find(uid);
+	user_hash::iterator finduuid = this->Users->uuidlist.find(uid);
 
-	if (finduuid == this->Users->uuidlist->end())
+	if (finduuid == this->Users->uuidlist.end())
 		return NULL;
 
 	return finduuid->second;
 }
-
-User *InspIRCd::FindUUID(const char *uid)
-{
-	return FindUUID(std::string(uid));
-}
-
 /* find a channel record by channel name and return a pointer to it */
-Channel* InspIRCd::FindChan(const char* chan)
-{
-	chan_hash::iterator iter = chanlist->find(chan);
-
-	if (iter == chanlist->end())
-		/* Couldn't find it */
-		return NULL;
-
-	return iter->second;
-}
 
 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;
 
@@ -140,13 +82,14 @@ Channel* InspIRCd::FindChan(const std::string &chan)
 /* Send an error notice to all users, registered or not */
 void InspIRCd::SendError(const std::string &s)
 {
-	for (LocalUserList::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
+	const UserManager::LocalList& list = Users.GetLocalUsers();
+	for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); ++i)
 	{
 		User* u = *i;
 		if (u->registered == REG_ALL)
 		{
-		   	u->WriteServ("NOTICE %s :%s",u->nick.c_str(),s.c_str());
-	   	}
+			u->WriteNotice(s);
+		}
 		else
 		{
 			/* Unregistered connections receive ERROR, not a NOTICE */
@@ -155,12 +98,6 @@ void InspIRCd::SendError(const std::string &s)
 	}
 }
 
-/* return channel count */
-long InspIRCd::ChannelCount()
-{
-	return chanlist->size();
-}
-
 bool InspIRCd::IsValidMask(const std::string &mask)
 {
 	const char* dest = mask.c_str();
@@ -281,47 +218,35 @@ void InspIRCd::ProcessColors(file_cache& input)
 }
 
 /* true for valid channel name, false else */
-bool IsChannelHandler::Call(const char *chname, size_t max)
+bool IsChannelHandler::Call(const std::string& chname)
 {
-	const char *c = chname + 1;
+	if (chname.empty() || chname.length() > ServerInstance->Config->Limits.ChanMax)
+		return false;
 
-	/* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
-	if (!chname || *chname != '#')
-	{
+	if (chname[0] != '#')
 		return false;
-	}
 
-	while (*c)
+	for (std::string::const_iterator i = chname.begin()+1; i != chname.end(); ++i)
 	{
-		switch (*c)
+		switch (*i)
 		{
 			case ' ':
 			case ',':
 			case 7:
 				return false;
 		}
-
-		c++;
-	}
-
-	size_t len = c - chname;
-	/* too long a name - note funky pointer arithmetic here. */
-	if (len > max)
-	{
-			return false;
 	}
 
 	return true;
 }
 
 /* true for valid nickname, false else */
-bool IsNickHandler::Call(const char* n, size_t max)
+bool IsNickHandler::Call(const std::string& n)
 {
-	if (!n || !*n)
+	if (n.empty() || n.length() > ServerInstance->Config->Limits.NickMax)
 		return false;
 
-	unsigned int p = 0;
-	for (const char* i = n; *i; i++, p++)
+	for (std::string::const_iterator i = n.begin(); i != n.end(); ++i)
 	{
 		if ((*i >= 'A') && (*i <= '}'))
 		{
@@ -329,7 +254,7 @@ bool IsNickHandler::Call(const char* n, size_t max)
 			continue;
 		}
 
-		if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i > n))
+		if ((((*i >= '0') && (*i <= '9')) || (*i == '-')) && (i != n.begin()))
 		{
 			/* "0"-"9", "-" can occur anywhere BUT the first char of a nickname */
 			continue;
@@ -339,17 +264,16 @@ bool IsNickHandler::Call(const char* n, size_t max)
 		return false;
 	}
 
-	/* too long? or not */
-	return (p <= max);
+	return true;
 }
 
 /* return true for good ident, false else */
-bool IsIdentHandler::Call(const char* n)
+bool IsIdentHandler::Call(const std::string& n)
 {
-	if (!n || !*n)
+	if (n.empty())
 		return false;
 
-	for (const char* i = n; *i; i++)
+	for (std::string::const_iterator i = n.begin(); i != n.end(); ++i)
 	{
 		if ((*i >= 'A') && (*i <= '}'))
 		{
@@ -367,7 +291,7 @@ bool IsIdentHandler::Call(const char* n)
 	return true;
 }
 
-bool IsSIDHandler::Call(const std::string &str)
+bool InspIRCd::IsSID(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
@@ -377,35 +301,13 @@ bool IsSIDHandler::Call(const std::string &str)
 			 ((str[2] >= 'A' && str[2] <= 'Z') || isdigit(str[2])));
 }
 
-/* open the proper logfile */
-bool InspIRCd::OpenLog(char**, int)
-{
-	if (!Config->cmdline.writelog) return true; // Skip opening default log if -nolog
-
-	if (Config->cmdline.startup_log.empty())
-		Config->cmdline.startup_log = LOG_PATH "/startup.log";
-	FILE* startup = fopen(Config->cmdline.startup_log.c_str(), "a+");
-
-	if (!startup)
-	{
-		return false;
-	}
-
-	FileWriter* fw = new FileWriter(startup);
-	FileLogStream *f = new FileLogStream((Config->cmdline.forcedebug ? DEBUG : DEFAULT), fw);
-
-	this->Logs->AddLogType("*", f, true);
-
-	return true;
-}
-
 void InspIRCd::CheckRoot()
 {
 #ifndef _WIN32
 	if (geteuid() == 0)
 	{
 		std::cout << "ERROR: You are running an irc server as root! DO NOT DO THIS!" << std::endl << std::endl;
-		this->Logs->Log("STARTUP",DEFAULT,"Can't start as root");
+		this->Logs->Log("STARTUP", LOG_DEFAULT, "Can't start as root");
 		Exit(EXIT_STATUS_ROOT);
 	}
 #endif
@@ -419,24 +321,20 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::str
 	FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
 
 	if (MOD_RESULT != MOD_RES_DENY)
-		user->WriteServ("%d %s", numeric, copy_text.c_str());
+		user->WriteNumeric(numeric, copy_text);
 }
 
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* format, ...)
 {
-	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));
+	std::string textbuffer;
+	VAFORMAT(textbuffer, format, format)
+	this->SendWhoisLine(user, dest, numeric, textbuffer);
 }
 
 /** 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 long InspIRCd::Duration(const std::string &str)
 {
 	unsigned char multiplier = 0;
 	long total = 0;
@@ -476,31 +374,44 @@ long InspIRCd::Duration(const std::string &str)
 	return total + subtotal;
 }
 
-bool InspIRCd::ULine(const std::string& sserver)
+const char* InspIRCd::Format(va_list &vaList, const char* formatString)
 {
-	if (sserver.empty())
-		return true;
+	static std::vector<char> formatBuffer(1024);
+
+	while (true)
+	{
+		va_list dst;
+		va_copy(dst, vaList);
+
+		int vsnret = vsnprintf(&formatBuffer[0], formatBuffer.size(), formatString, dst);
+		va_end(dst);
+
+		if (vsnret > 0 && static_cast<unsigned>(vsnret) < formatBuffer.size())
+		{
+			break;
+		}
 
-	return (Config->ulines.find(sserver.c_str()) != Config->ulines.end());
+		formatBuffer.resize(formatBuffer.size() * 2);
+	}
+
+	return &formatBuffer[0];
 }
 
-bool InspIRCd::SilentULine(const std::string& sserver)
+const char* InspIRCd::Format(const char* formatString, ...)
 {
-	std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver.c_str());
-	if (n != Config->ulines.end())
-		return n->second;
-	else
-		return false;
+	const char* ret;
+	VAFORMAT(ret, formatString, formatString);
+	return ret;
 }
 
-std::string InspIRCd::TimeString(time_t curtime)
+std::string InspIRCd::TimeString(time_t curtime, const char* format, bool utc)
 {
 #ifdef _WIN32
 	if (curtime < 0)
 		curtime = 0;
 #endif
 
-	struct tm* timeinfo = localtime(&curtime);
+	struct tm* timeinfo = utc ? gmtime(&curtime) : localtime(&curtime);
 	if (!timeinfo)
 	{
 		curtime = 0;
@@ -514,27 +425,15 @@ std::string InspIRCd::TimeString(time_t curtime)
 	else if (timeinfo->tm_year + 1900 < 1000)
 		timeinfo->tm_year = 0;
 
-	return std::string(asctime(timeinfo),24);
-}
+	// This is the default format used by asctime without the terminating new line.
+	if (!format)
+		format = "%a %b %d %H:%M:%S %Y";
 
-// You should only pass a single character to this.
-void InspIRCd::AddExtBanChar(char c)
-{
-	std::string &tok = Config->data005;
-	std::string::size_type ebpos = tok.find(" EXTBAN=,");
+	char buffer[512];
+	if (!strftime(buffer, sizeof(buffer), format, timeinfo))
+		buffer[0] = '\0';
 
-	if (ebpos == std::string::npos)
-	{
-		tok.append(" EXTBAN=,");
-		tok.push_back(c);
-	}
-	else
-	{
-		ebpos += 9;
-		while (isalpha(tok[ebpos]) && tok[ebpos] < c)
-			ebpos++;
-		tok.insert(ebpos, 1, c);
-	}
+	return buffer;
 }
 
 std::string InspIRCd::GenRandomStr(int length, bool printable)
@@ -588,11 +487,11 @@ ModResult OnCheckExemptionHandler::Call(User* user, Channel* chan, const std::st
 		std::string::size_type pos = current.find(':');
 		if (pos == std::string::npos)
 			continue;
-		if (current.substr(0,pos) == restriction)
+		if (!current.compare(0, pos, restriction))
 			minmode = current[pos+1];
 	}
 
-	ModeHandler* mh = ServerInstance->Modes->FindMode(minmode, MODETYPE_CHANNEL);
+	PrefixMode* mh = ServerInstance->Modes->FindPrefixMode(minmode);
 	if (mh && mypfx >= mh->GetPrefixRank())
 		return MOD_RES_ALLOW;
 	if (mh || minmode == '*')