X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=3c234f13f5c3ebee11f4e799fd7d6afdf742a06b;hb=30fec322809582f91be70cc1bb16c9678180db76;hp=13646f225c2abf1e75d6b1e4b6f7b16a7ef8ed97;hpb=f1f8173bb5ca5f5ce01ad92d0ccd309f232fc138;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 13646f225..3c234f13f 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -26,21 +26,16 @@
 #include "iohook.h"
 
 UserManager::UserManager()
-	: clientlist(new user_hash)
-	, uuidlist(new user_hash)
-	, unregistered_count(0)
+	: unregistered_count(0)
 {
 }
 
 UserManager::~UserManager()
 {
-	for (user_hash::iterator i = clientlist->begin(); i != clientlist->end(); ++i)
+	for (user_hash::iterator i = clientlist.begin(); i != clientlist.end(); ++i)
 	{
 		delete i->second;
 	}
-
-	delete clientlist;
-	delete uuidlist;
 }
 
 /* add a client connection to the sockets list */
@@ -72,18 +67,17 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 
 	/* The users default nick is their UUID */
 	New->nick = New->uuid;
-	(*(this->clientlist))[New->nick] = New;
+	this->clientlist[New->nick] = New;
 
 	New->registered = REG_NONE;
 	New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
 	New->lastping = 1;
 
-	ServerInstance->Users->AddLocalClone(New);
-	ServerInstance->Users->AddGlobalClone(New);
+	this->AddClone(New);
 
 	this->local_users.push_front(New);
 
-	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
+	if (this->local_users.size() > ServerInstance->Config->SoftLimit)
 	{
 		ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit);
 		this->QuitUser(New,"No more connections allowed");
@@ -141,7 +135,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		}
 	}
 
-	if (!ServerInstance->SE->AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
+	if (!SocketEngine::AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
 	{
 		ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Internal error on new connection");
 		this->QuitUser(New, "Internal error handling connection");
@@ -201,68 +195,47 @@ void UserManager::QuitUser(User* user, const std::string& quitreason, const std:
 			ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]", user->GetFullRealHost().c_str(), user->GetIPString().c_str(), operreason->c_str());
 	}
 
-	user_hash::iterator iter = this->clientlist->find(user->nick);
-
-	if (iter != this->clientlist->end())
-		this->clientlist->erase(iter);
-	else
+	if (!clientlist.erase(user->nick))
 		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
 
-	uuidlist->erase(user->uuid);
-}
-
-void UserManager::AddLocalClone(User *user)
-{
-	local_clones[user->GetCIDRMask()]++;
+	uuidlist.erase(user->uuid);
+	user->PurgeEmptyChannels();
 }
 
-void UserManager::AddGlobalClone(User *user)
+void UserManager::AddClone(User* user)
 {
-	global_clones[user->GetCIDRMask()]++;
+	CloneCounts& counts = clonemap[user->GetCIDRMask()];
+	counts.global++;
+	if (IS_LOCAL(user))
+		counts.local++;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
 {
-	if (IS_LOCAL(user))
+	CloneMap::iterator it = clonemap.find(user->GetCIDRMask());
+	if (it != clonemap.end())
 	{
-		clonemap::iterator x = local_clones.find(user->GetCIDRMask());
-		if (x != local_clones.end())
+		CloneCounts& counts = it->second;
+		counts.global--;
+		if (counts.global == 0)
 		{
-			x->second--;
-			if (!x->second)
-			{
-				local_clones.erase(x);
-			}
+			// No more users from this IP, remove entry from the map
+			clonemap.erase(it);
+			return;
 		}
-	}
 
-	clonemap::iterator y = global_clones.find(user->GetCIDRMask());
-	if (y != global_clones.end())
-	{
-		y->second--;
-		if (!y->second)
-		{
-			global_clones.erase(y);
-		}
+		if (IS_LOCAL(user))
+			counts.local--;
 	}
 }
 
-unsigned long UserManager::GlobalCloneCount(User *user)
-{
-	clonemap::iterator x = global_clones.find(user->GetCIDRMask());
-	if (x != global_clones.end())
-		return x->second;
-	else
-		return 0;
-}
-
-unsigned long UserManager::LocalCloneCount(User *user)
+const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
-	clonemap::iterator x = local_clones.find(user->GetCIDRMask());
-	if (x != local_clones.end())
-		return x->second;
+	CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());
+	if (it != clonemap.end())
+		return it->second;
 	else
-		return 0;
+		return zeroclonecounts;
 }
 
 void UserManager::ServerNoticeAll(const char* text, ...)
@@ -336,7 +309,7 @@ void UserManager::DoBackgroundUserStuff()
 					if (!curr->lastping)
 					{
 						time_t time = ServerInstance->Time() - (curr->nping - curr->MyClass->GetPingTime());
-						const std::string message = "Ping timeout: " + ConvToStr(time) + (time == 1 ? " seconds" : " second");
+						const std::string message = "Ping timeout: " + ConvToStr(time) + (time != 1 ? " seconds" : " second");
 						this->QuitUser(curr, message);
 						continue;
 					}