X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fhelperfuncs.cpp;h=cd173b55ffb1148fe22ab32013a957552815ab09;hb=37fd031da06761c8a050105b55d73a8ab499fb74;hp=d0bffc7dc91b2a7d932f108caf8dcc5b8985ab75;hpb=907b61918ff304708892b756ce62891c5435877a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d0bffc7dc..cd173b55f 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 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.
@@ -11,18 +11,17 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDhelper */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "exitcodes.h"
 
-std::string InspIRCd::GetServerDescription(const char* servername)
+std::string InspIRCd::GetServerDescription(const std::string& servername)
 {
 	std::string description;
 
-	FOREACH_MOD_I(this,I_OnGetServerDescription,OnGetServerDescription(servername,description));
+	FOREACH_MOD(I_OnGetServerDescription,OnGetServerDescription(servername,description));
 
 	if (!description.empty())
 	{
@@ -56,7 +55,7 @@ User* InspIRCd::FindNick(const char* nick)
 		return FindUUID(nick);
 
 	user_hash::iterator iter = this->Users->clientlist->find(nick);
-	
+
 	if (iter == this->Users->clientlist->end())
 		return NULL;
 
@@ -126,20 +125,16 @@ void InspIRCd::SendError(const std::string &s)
 {
 	for (std::vector<User*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
 	{
-		if ((*i)->registered == REG_ALL)
+		User* u = *i;
+		if (u->registered == REG_ALL)
 		{
-		   	(*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
+		   	u->WriteServ("NOTICE %s :%s",u->nick.c_str(),s.c_str());
 	   	}
 		else
 		{
 			/* Unregistered connections receive ERROR, not a NOTICE */
-			(*i)->Write("ERROR :" + s);
+			u->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();
 	}
 }
 
@@ -151,11 +146,11 @@ long InspIRCd::ChannelCount()
 
 bool InspIRCd::IsValidMask(const std::string &mask)
 {
-	char* dest = (char*)mask.c_str();
+	const char* dest = mask.c_str();
 	int exclamation = 0;
 	int atsign = 0;
 
-	for (char* i = dest; *i; i++)
+	for (const char* i = dest; *i; i++)
 	{
 		/* out of range character, bad mask */
 		if (*i < 32 || *i > 126)
@@ -182,9 +177,9 @@ bool InspIRCd::IsValidMask(const std::string &mask)
 }
 
 /* true for valid channel name, false else */
-bool IsChannelHandler::Call(const char *chname)
+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 != '#')
@@ -192,7 +187,6 @@ bool IsChannelHandler::Call(const char *chname)
 		return false;
 	}
 
-	c = (char *)chname + 1;
 	while (*c)
 	{
 		switch (*c)
@@ -205,9 +199,10 @@ bool IsChannelHandler::Call(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;
 	}
@@ -216,13 +211,13 @@ bool IsChannelHandler::Call(const char *chname)
 }
 
 /* true for valid nickname, false else */
-bool IsNickHandler::Call(const char* n)
+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 <= '}'))
 		{
@@ -241,7 +236,7 @@ bool IsNickHandler::Call(const char* n)
 	}
 
 	/* too long? or not -- pointer arithmetic rocks */
-	return (p < NICKMAX - 1);
+	return (p < max);
 }
 
 /* return true for good ident, false else */
@@ -250,7 +245,7 @@ bool IsIdentHandler::Call(const char* n)
 	if (!n || !*n)
 		return false;
 
-	for (char* i = (char*)n; *i; i++)
+	for (const char* i = n; *i; i++)
 	{
 		if ((*i >= 'A') && (*i <= '}'))
 		{
@@ -286,20 +281,6 @@ bool InspIRCd::OpenLog(char**, int)
 	{
 		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
 
@@ -307,21 +288,11 @@ bool InspIRCd::OpenLog(char**, int)
 	{
 		if (Config->logpath.empty())
 		{
-			std::string path = std::string(home) + "/.inspircd";
-			if (!mkdir(path.c_str(), 0700) || errno == EEXIST)
-			{
-				/* Log to ~/.inspircd/ircd.log */
-				Config->logpath = path + "/startup.log";
-			}
-			else
-			{
-				/* Couldn't make ~/.inspircd directory, log to current dir */
-				Config->logpath = "./startup.log";
-				printf("\nWARNING: Unable to create directory: %s (%s)\n", path.c_str(), strerror(errno));
-			}
+			Config->logpath = "logs/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
 	{
@@ -333,8 +304,8 @@ bool InspIRCd::OpenLog(char**, int)
 		return false;
 	}
 
-	FileWriter* fw = new FileWriter(this, Config->log_file);
-	FileLogStream *f = new FileLogStream(this, (Config->forcedebug ? DEBUG : DEFAULT), fw);
+	FileWriter* fw = new FileWriter(Config->log_file);
+	FileLogStream *f = new FileLogStream((Config->forcedebug ? DEBUG : DEFAULT), fw);
 
 	this->Logs->AddLogType("*", f, true);
 
@@ -351,24 +322,14 @@ void InspIRCd::CheckRoot()
 	}
 }
 
-void InspIRCd::CheckDie()
-{
-	if (*Config->DieValue)
-	{
-		printf("WARNING: %s\n\n",Config->DieValue);
-		this->Logs->Log("CONFIG",DEFAULT,"Died because of <die> tag: %s",Config->DieValue);
-		Exit(EXIT_STATUS_DIETAG);
-	}
-}
-
 void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const std::string &text)
 {
 	std::string copy_text = text;
 
-	int MOD_RESULT = 0;
-	FOREACH_RESULT_I(this, I_OnWhoisLine, OnWhoisLine(user, dest, numeric, copy_text));
+	ModResult MOD_RESULT;
+	FIRST_MOD_RESULT(OnWhoisLine, MOD_RESULT, (user, dest, numeric, copy_text));
 
-	if (!MOD_RESULT)
+	if (MOD_RESULT != MOD_RES_DENY)
 		user->WriteServ("%d %s", numeric, copy_text.c_str());
 }
 
@@ -383,7 +344,7 @@ void InspIRCd::SendWhoisLine(User* user, User* dest, int numeric, const char* fo
 	this->SendWhoisLine(user, dest, numeric, std::string(textbuffer));
 }
 
-/** Refactored by Brain, Jun 2008. Much faster with some clever O(1) array
+/** Refactored by Brain, Jun 2009. Much faster with some clever O(1) array
  * lookups and pointer maths.
  */
 long InspIRCd::Duration(const std::string &str)
@@ -426,22 +387,21 @@ long InspIRCd::Duration(const std::string &str)
 	return total + subtotal;
 }
 
-bool InspIRCd::ULine(const char* sserver)
+bool InspIRCd::ULine(const std::string& sserver)
 {
-	if (!sserver)
-		return false;
-	if (!*sserver)
+	if (sserver.empty())
 		return true;
 
-	return (Config->ulines.find(sserver) != Config->ulines.end());
+	return (Config->ulines.find(sserver.c_str()) != Config->ulines.end());
 }
 
-bool InspIRCd::SilentULine(const char* sserver)
+bool InspIRCd::SilentULine(const std::string& sserver)
 {
-	std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver);
+	std::map<irc::string,bool>::iterator n = Config->ulines.find(sserver.c_str());
 	if (n != Config->ulines.end())
 		return n->second;
-	else return false;
+	else
+		return false;
 }
 
 std::string InspIRCd::TimeString(time_t curtime)
@@ -449,3 +409,17 @@ 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);
+}