X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=8ed87a338015230a2da8ddb6aaa036eacb248cca;hb=e586aaab7c4f7b03514c83451d73b73f55dc6998;hp=b6a33d2c48c0f3eae4a1b7cbd11450a1161932d0;hpb=20ea635c9fcd0d559ff6fc2863ab581591bc4ef8;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b6a33d2c4..8ed87a338 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -37,7 +37,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	}
 	catch (...)
 	{
-		ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
+		ServerInstance->Logs->Log("USERS", LOG_DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
 		ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
@@ -54,16 +54,16 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		}
 		catch (CoreException& modexcept)
 		{
-			ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			ServerInstance->Logs->Log("SOCKET", LOG_DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
 		}
 	}
 
-	ServerInstance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
+	ServerInstance->Logs->Log("USERS", LOG_DEBUG,"New user fd: %d", socket);
 
 	this->unregistered_count++;
 
 	/* The users default nick is their UUID */
-	New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
+	New->nick = New->uuid;
 	(*(this->clientlist))[New->nick] = New;
 
 	New->registered = REG_NONE;
@@ -73,7 +73,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	ServerInstance->Users->AddLocalClone(New);
 	ServerInstance->Users->AddGlobalClone(New);
 
-	this->local_users.push_back(New);
+	New->localuseriter = this->local_users.insert(local_users.end(), New);
 
 	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
 	{
@@ -108,15 +108,15 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		if (!b->Type.empty() && !New->exempt)
 		{
 			/* user banned */
-			ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
+			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
 			if (!ServerInstance->Config->MoronBanner.empty())
-				New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
+				New->WriteNotice("*** " +  ServerInstance->Config->MoronBanner);
 			this->QuitUser(New, b->Reason);
 			return;
 		}
 		else
 		{
-			ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
+			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Negative hit for " + New->GetIPString());
 		}
 	}
 	else
@@ -135,48 +135,37 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 
 	if (!ServerInstance->SE->AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
 	{
-		ServerInstance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
+		ServerInstance->Logs->Log("USERS", LOG_DEBUG,"Internal error on new connection");
 		this->QuitUser(New, "Internal error handling connection");
 	}
 
-	/* NOTE: even if dns lookups are *off*, we still need to display this.
-	 * BOPM and other stuff requires it.
-	 */
-	New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
 	if (ServerInstance->Config->RawLog)
-		New->WriteServ("NOTICE Auth :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
+		New->WriteNotice("*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
 
 	FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
-	FOREACH_MOD(I_OnUserInit,OnUserInit(New));
+	if (New->quitting)
+		return;
 
-	if (ServerInstance->Config->NoUserDns)
-	{
-		New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
-		New->dns_done = true;
-	}
-	else
-	{
-		New->StartDNSLookup();
-	}
+	FOREACH_MOD(I_OnUserInit,OnUserInit(New));
 }
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
 {
 	if (user->quitting)
 	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Tried to quit quitting user: " + user->nick);
 		return;
 	}
 
 	if (IS_SERVER(user))
 	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Tried to quit server user: " + user->nick);
 		return;
 	}
 
 	user->quitting = true;
 
-	ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str());
+	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), user->nick.c_str(), quitreason.c_str());
 	user->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
 
 	std::string reason;
@@ -217,7 +206,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 			if (!user->quietquit)
 			{
 				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]",
-					user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str());
+					user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_reason.c_str());
 			}
 		}
 		else
@@ -225,10 +214,9 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 			if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
 			{
 				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s (%s) [%s]",
-					user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str());
+					user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString().c_str(), oper_reason.c_str());
 			}
 		}
-		user->AddToWhoWas();
 	}
 
 	user_hash::iterator iter = this->clientlist->find(user->nick);
@@ -236,7 +224,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	if (iter != this->clientlist->end())
 		this->clientlist->erase(iter);
 	else
-		ServerInstance->Logs->Log("USERS", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
 
 	ServerInstance->Users->uuidlist->erase(user->uuid);
 }
@@ -338,18 +326,17 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 		return;
 
 	char textbuffer[MAXBUF];
-	char formatbuffer[MAXBUF];
 	va_list argsPtr;
 	va_start (argsPtr, text);
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
+	const std::string message = "NOTICE $" + ServerInstance->Config->ServerName + " :" + textbuffer;
 
-	for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
-		t->WriteServ(std::string(formatbuffer));
+		t->WriteServ(message);
 	}
 }
 
@@ -359,18 +346,17 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
 		return;
 
 	char textbuffer[MAXBUF];
-	char formatbuffer[MAXBUF];
 	va_list argsPtr;
 	va_start (argsPtr, text);
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
+	const std::string message = "PRIVMSG $" + ServerInstance->Config->ServerName + " :" + textbuffer;
 
-	for (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
-		t->WriteServ(std::string(formatbuffer));
+		t->WriteServ(message);
 	}
 }
 
@@ -387,3 +373,14 @@ int UserManager::ModeCount(const char mode)
 	}
 	return c;
 }
+
+void UserManager::GarbageCollect()
+{
+	// Reset the already_sent IDs so we don't wrap it around and drop a message
+	LocalUser::already_sent_id = 0;
+	for (LocalUserList::const_iterator i = this->local_users.begin(); i != this->local_users.end(); i++)
+	{
+		(**i).already_sent = 0;
+		(**i).RemoveExpiredInvites();
+	}
+}