X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=41061f6d1d82decc109b3eb1fb3b6d4b34378ce3;hb=30fc51c6ddca487a1b89da9ab0ab59da003aee36;hp=1966c9b4729f86193e8c8fa87694a3bf9395c936;hpb=9b99c5ad31eb8de222d2b3aa1daa9412f0b25857;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 1966c9b47..41061f6d1 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -67,17 +67,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	/* NOTE: Calling this one parameter constructor for User automatically
 	 * allocates a new UUID and places it in the hash_map.
 	 */
-	LocalUser* New = NULL;
-	try
-	{
-		New = new LocalUser(socket, client, server);
-	}
-	catch (...)
-	{
-		ServerInstance->Logs->Log("USERS", LOG_DEFAULT, "*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
-		ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
-		return;
-	}
+	LocalUser* const New = new LocalUser(socket, client, server);
 	UserIOHandler* eh = &New->eh;
 
 	// If this listener has an IO hook provider set then tell it about the connection
@@ -93,7 +83,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	this->clientlist[New->nick] = New;
 
 	New->registered = REG_NONE;
-	New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
+	New->signon = ServerInstance->Time();
 	New->lastping = 1;
 
 	this->AddClone(New);
@@ -254,6 +244,18 @@ void UserManager::RemoveCloneCounts(User *user)
 	}
 }
 
+void UserManager::RehashCloneCounts()
+{
+	clonemap.clear();
+
+	const user_hash& hash = ServerInstance->Users.GetUsers();
+	for (user_hash::const_iterator i = hash.begin(); i != hash.end(); ++i)
+	{
+		User* u = i->second;
+		AddClone(u);
+	}
+}
+
 const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
 	CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());
@@ -281,10 +283,7 @@ 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 (LocalList::const_iterator i = local_users.begin(); i != local_users.end(); ++i)
-	{
 		(**i).already_sent = 0;
-		(**i).RemoveExpiredInvites();
-	}
 }
 
 /* this returns true when all modules are satisfied that the user should be allowed onto the irc server
@@ -308,9 +307,11 @@ void UserManager::DoBackgroundUserStuff()
 	/*
 	 * loop over all local users..
 	 */
-	for (LocalList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+	for (LocalList::iterator i = local_users.begin(); i != local_users.end(); )
 	{
+		// It's possible that we quit the user below due to ping timeout etc. and QuitUser() removes it from the list
 		LocalUser* curr = *i;
+		++i;
 
 		if (curr->CommandFloodPenalty || curr->eh.getSendQSize())
 		{
@@ -348,10 +349,15 @@ void UserManager::DoBackgroundUserStuff()
 					curr->FullConnect();
 					continue;
 				}
+
+				// If the user has been quit in OnCheckReady then we shouldn't
+				// quit them again for having a registration timeout.
+				if (curr->quitting)
+					continue;
 				break;
 		}
 
-		if (curr->registered != REG_ALL && (ServerInstance->Time() > (curr->age + curr->MyClass->GetRegTimeout())))
+		if (curr->registered != REG_ALL && curr->MyClass && (ServerInstance->Time() > (curr->signon + curr->MyClass->GetRegTimeout())))
 		{
 			/*
 			 * registration timeout -- didnt send USER/NICK/HOST