X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusers.cpp;h=cdacdc5c2ab52f126e59a093306e7f3bf8071310;hb=9a7af3161c2531c88424d43a88cee6eccf7d6117;hp=df7a36683eee15b117e91630d0e27b53bb56bfe4;hpb=75b1e01d41cd0144445f93e33b4554e2c9ab8735;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/users.cpp b/src/users.cpp
index df7a36683..cdacdc5c2 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -21,10 +21,17 @@
 #include "bancache.h"
 #include "commands/cmd_whowas.h"
 
-static unsigned long already_sent[MAX_DESCRIPTORS] = {0};
+static unsigned long* already_sent = NULL;
+
+
+void InitializeAlreadySent(SocketEngine* SE)
+{
+	already_sent = new unsigned long[SE->GetMaxFds()];
+	memset(already_sent, 0, sizeof(already_sent));
+}
 
 /* XXX: Used for speeding up WriteCommon operations */
-unsigned long uniq_id = 0;
+unsigned long uniq_id = 1;
 
 std::string User::ProcessNoticeMasks(const char *sm)
 {
@@ -91,7 +98,7 @@ void User::StartDNSLookup()
 	try
 	{
 		bool cached;
-		const char* sip = this->GetIPString();
+		const char* sip = this->GetIPString(false);
 
 		/* Special case for 4in6 (Have i mentioned i HATE 4in6?) */
 		if (!strncmp(sip, "0::ffff:", 8))
@@ -308,8 +315,11 @@ char* User::MakeHostIP()
 
 void User::CloseSocket()
 {
-	ServerInstance->SE->Shutdown(this, 2);
-	ServerInstance->SE->Close(this);
+	if (this->fd > -1)
+	{
+		ServerInstance->SE->Shutdown(this, 2);
+		ServerInstance->SE->Close(this);
+	}
 }
 
 char* User::GetFullHost()
@@ -807,21 +817,6 @@ void User::UnOper()
 	}
 }
 
-void User::QuitUser(InspIRCd* Instance, User *user, const std::string &quitreason, const char* operreason)
-{
-	Instance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick, quitreason.c_str());
-	user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident, user->host, *operreason ? operreason : quitreason.c_str());
-	user->quietquit = false;
-	user->quitmsg = quitreason;
-
-	if (!*operreason)
-		user->operquitmsg = quitreason;
-	else
-		user->operquitmsg = operreason;
-
-	Instance->GlobalCulls.AddItem(user);
-}
-
 /* adds or updates an entry in the whowas list */
 void User::AddToWhoWas()
 {
@@ -843,18 +838,18 @@ void User::CheckClass()
 
 	if ((!a) || (a->GetType() == CC_DENY))
 	{
-		User::QuitUser(ServerInstance, this, "Unauthorised connection");
+		ServerInstance->Users->QuitUser(this, "Unauthorised connection");
 		return;
 	}
 	else if ((a->GetMaxLocal()) && (ServerInstance->Users->LocalCloneCount(this) > a->GetMaxLocal()))
 	{
-		User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (local)");
+		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (local)");
 		ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum LOCAL connections (%ld) exceeded for IP %s", a->GetMaxLocal(), this->GetIPString());
 		return;
 	}
 	else if ((a->GetMaxGlobal()) && (ServerInstance->Users->GlobalCloneCount(this) > a->GetMaxGlobal()))
 	{
-		User::QuitUser(ServerInstance, this, "No more connections allowed from your host via this connect class (global)");
+		ServerInstance->Users->QuitUser(this, "No more connections allowed from your host via this connect class (global)");
 		ServerInstance->SNO->WriteToSnoMask('A', "WARNING: maximum GLOBAL connections (%ld) exceeded for IP %s", a->GetMaxGlobal(), this->GetIPString());
 		return;
 	}
@@ -882,7 +877,7 @@ void User::FullConnect()
 	 */
 	if (this->MyClass && !this->MyClass->GetPass().empty() && !this->haspassed)
 	{
-		User::QuitUser(ServerInstance, this, "Invalid password");
+		ServerInstance->Users->QuitUser(this, "Invalid password");
 		return;
 	}
 
@@ -907,12 +902,11 @@ void User::FullConnect()
 
 	this->WriteServ("NOTICE Auth :Welcome to \002%s\002!",ServerInstance->Config->Network);
 	this->WriteNumeric(001, "%s :Welcome to the %s IRC Network %s!%s@%s",this->nick, ServerInstance->Config->Network, this->nick, this->ident, this->host);
-	this->WriteNumeric(002, "%s :Your host is %s, running version %s",this->nick,ServerInstance->Config->ServerName,VERSION);
+	this->WriteNumeric(002, "%s :Your host is %s, running version InspIRCd-1.2",this->nick,ServerInstance->Config->ServerName);
 	this->WriteNumeric(003, "%s :This server was created %s %s", this->nick, __TIME__, __DATE__);
-	this->WriteNumeric(004, "%s %s %s %s %s %s", this->nick, ServerInstance->Config->ServerName, VERSION, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
+	this->WriteNumeric(004, "%s %s InspIRCd-1.2 %s %s %s", this->nick, ServerInstance->Config->ServerName, ServerInstance->Modes->UserModeList().c_str(), ServerInstance->Modes->ChannelModeList().c_str(), ServerInstance->Modes->ParaModeList().c_str());
 
 	ServerInstance->Config->Send005(this);
-
 	this->WriteNumeric(42, "%s %s :your unique ID", this->nick, this->uuid);
 
 
@@ -980,46 +974,29 @@ void User::InvalidateCache()
 
 bool User::ForceNickChange(const char* newnick)
 {
-	/*
-	 * XXX this makes no sense..
-	 * why do we do nothing for change on users not REG_ALL?
-	 * why do we trigger events twice for everyone previously (and just them now)
-	 * i think the first if () needs removing totally, or? -- w00t
-	 */
-	if (this->registered != REG_ALL)
-	{
-		int MOD_RESULT = 0;
+	int MOD_RESULT = 0;
 
-		this->InvalidateCache();
+	this->InvalidateCache();
 
-		FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
+	FOREACH_RESULT(I_OnUserPreNick,OnUserPreNick(this, newnick));
 
-		if (MOD_RESULT)
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
-
-		if (ServerInstance->XLines->MatchesLine("Q",newnick))
-		{
-			ServerInstance->stats->statsCollisions++;
-			return false;
-		}
+	if (MOD_RESULT)
+	{
+		ServerInstance->stats->statsCollisions++;
+		return false;
 	}
-	else
+
+	std::deque<classbase*> dummy;
+	Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
+	if (nickhandler) // wtfbbq, when would this not be here
 	{
-		std::deque<classbase*> dummy;
-		Command* nickhandler = ServerInstance->Parser->GetHandler("NICK");
-		if (nickhandler) // wtfbbq, when would this not be here
-		{
-			nickhandler->HandleInternal(1, dummy);
-			bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
-			nickhandler->HandleInternal(0, dummy);
-			return result;
-		}
+		nickhandler->HandleInternal(1, dummy);
+		bool result = (ServerInstance->Parser->CallHandler("NICK", &newnick, 1, this) == CMD_SUCCESS);
+		nickhandler->HandleInternal(0, dummy);
+		return result;
 	}
 
-	// Unreachable.
+	// Unreachable, we hope
 	return false;
 }
 
@@ -1095,7 +1072,7 @@ int User::GetProtocolFamily()
  * XXX the duplication here is horrid..
  * do we really need two methods doing essentially the same thing?
  */
-const char* User::GetIPString()
+const char* User::GetIPString(bool translate4in6)
 {
 	static char buf[1024];
 
@@ -1119,6 +1096,12 @@ const char* User::GetIPString()
 			{
 				strlcpy(&temp[1], buf, sizeof(temp) - 1);
 				*temp = '0';
+				if (translate4in6 && !strncmp(temp, "0::ffff:", 8))
+				{
+					this->cachedip = temp + 8;
+					return temp + 8;
+				}
+
 				this->cachedip = temp;
 				return temp;
 			}
@@ -1322,6 +1305,9 @@ void User::WriteCommon(const std::string &text)
 
 	uniq_id++;
 
+	if (!already_sent)
+		InitializeAlreadySent(ServerInstance->SE);
+
 	/* We dont want to be doing this n times, just once */
 	snprintf(tb,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
 	std::string out = tb;
@@ -1376,6 +1362,10 @@ void User::WriteCommonQuit(const std::string &normal_text, const std::string &op
 		return;
 
 	uniq_id++;
+
+	if (!already_sent)
+		InitializeAlreadySent(ServerInstance->SE);
+
 	snprintf(tb1,MAXBUF,":%s QUIT :%s",this->GetFullHost(),normal_text.c_str());
 	snprintf(tb2,MAXBUF,":%s QUIT :%s",this->GetFullHost(),oper_text.c_str());
 	std::string out1 = tb1;
@@ -1407,6 +1397,10 @@ void User::WriteCommonExcept(const std::string &text)
 		return;
 
 	uniq_id++;
+
+	if (!already_sent)
+		InitializeAlreadySent(ServerInstance->SE);
+
 	snprintf(tb1,MAXBUF,":%s %s",this->GetFullHost(),text.c_str());
 	out1 = tb1;
 
@@ -1430,7 +1424,7 @@ void User::WriteCommonExcept(const std::string &text)
 
 void User::WriteWallOps(const std::string &text)
 {
-	if (!IS_OPER(this) && IS_LOCAL(this))
+	if (!IS_LOCAL(this))
 		return;
 
 	std::string wallop("WALLOPS :");
@@ -1446,6 +1440,9 @@ void User::WriteWallOps(const std::string &text)
 
 void User::WriteWallOps(const char* text, ...)
 {
+	if (!IS_LOCAL(this))
+		return;
+
 	char textbuffer[MAXBUF];
 	va_list argsPtr;
 
@@ -1842,7 +1839,7 @@ void User::HandleEvent(EventType et, int errornum)
 	{
 		if (!WriteError.empty())
 		{
-			User::QuitUser(ServerInstance, this, GetWriteError());
+			ServerInstance->Users->QuitUser(this, GetWriteError());
 		}
 	}
 }