X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=e3ddfc9f2b1c07e84783719ab12d82cd9695ca18;hb=216877cc5b595b5b6bbc5f953e226618201cc0f6;hp=e74f7dadcd5ecd162677ea62ce9e6e4a95931930;hpb=46a39046196f55b52336e19662bb7bac85b731ac;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index e74f7dadc..e3ddfc9f2 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 monkies have been unleashed.");
+		ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
 		ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
@@ -63,23 +63,17 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	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->ident.assign("unknown");
-
 	New->registered = REG_NONE;
 	New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
 	New->lastping = 1;
 
-	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-	New->dhost.assign(New->GetIPString(), 0, 64);
-	New->host.assign(New->GetIPString(), 0, 64);
-
 	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()))
 	{
@@ -152,6 +146,10 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	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.");
 
+	FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
+	if (New->quitting)
+		return;
+
 	FOREACH_MOD(I_OnUserInit,OnUserInit(New));
 
 	if (ServerInstance->Config->NoUserDns)
@@ -169,13 +167,13 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 {
 	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", 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", DEFAULT, "ERROR: Tried to quit server user: " + user->nick);
 		return;
 	}
 
@@ -213,7 +211,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 	/*
 	 * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
-	 * if they were an oper with +sn +qQ.
+	 * if they were an oper with +s +qQ.
 	 */
 	if (user->registered == REG_ALL)
 	{
@@ -221,16 +219,16 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 		{
 			if (!user->quietquit)
 			{
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s] (%s)",
-					user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
+				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]",
+					user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str());
 			}
 		}
 		else
 		{
 			if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
 			{
-				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s] (%s)",
-					user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
+				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->AddToWhoWas();
@@ -241,7 +239,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", DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
 
 	ServerInstance->Users->uuidlist->erase(user->uuid);
 }
@@ -249,23 +247,12 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 void UserManager::AddLocalClone(User *user)
 {
-	clonemap::iterator x;
-	x = local_clones.find(user->GetCIDRMask());
-	if (x != local_clones.end())
-		x->second++;
-	else
-		local_clones[user->GetCIDRMask()] = 1;
+	local_clones[user->GetCIDRMask()]++;
 }
 
 void UserManager::AddGlobalClone(User *user)
 {
-	clonemap::iterator x;
-
-	x = global_clones.find(user->GetCIDRMask());
-	if (x != global_clones.end())
-		x->second++;
-	else
-		global_clones[user->GetCIDRMask()] = 1;
+	global_clones[user->GetCIDRMask()]++;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
@@ -362,7 +349,7 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 
 	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), 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));
@@ -383,7 +370,7 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
 
 	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), 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));