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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 41061f6d1..95deca00a 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -49,7 +49,8 @@ namespace
 }
 
 UserManager::UserManager()
-	: unregistered_count(0)
+	: already_sent_id(0)
+	, unregistered_count(0)
 {
 }
 
@@ -71,8 +72,12 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	UserIOHandler* eh = &New->eh;
 
 	// If this listener has an IO hook provider set then tell it about the connection
-	if (via->iohookprov)
-		via->iohookprov->OnAccept(eh, client, server);
+	for (ListenSocket::IOHookProvList::iterator i = via->iohookprovs.begin(); i != via->iohookprovs.end(); ++i)
+	{
+		ListenSocket::IOHookProvRef& iohookprovref = *i;
+		if (iohookprovref)
+			iohookprovref->OnAccept(eh, client, server);
+	}
 
 	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New user fd: %d", socket);
 
@@ -126,7 +131,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 			/* user banned */
 			ServerInstance->Logs->Log("BANCACHE", LOG_DEBUG, "BanCache: Positive hit for " + New->GetIPString());
 			if (!ServerInstance->Config->XLineMessage.empty())
-				New->WriteNumeric(ERR_YOUREBANNEDCREEP, ":" + ServerInstance->Config->XLineMessage);
+				New->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
 			this->QuitUser(New, b->Reason);
 			return;
 		}
@@ -278,14 +283,6 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 	}
 }
 
-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;
-}
-
 /* this returns true when all modules are satisfied that the user should be allowed onto the irc server
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the
  * registration timeout maximum seconds)
@@ -368,3 +365,18 @@ void UserManager::DoBackgroundUserStuff()
 		}
 	}
 }
+
+already_sent_t UserManager::NextAlreadySentId()
+{
+	if (++already_sent_id == 0)
+	{
+		// Wrapped around, reset the already_sent ids of all users
+		already_sent_id = 1;
+		for (LocalList::iterator i = local_users.begin(); i != local_users.end(); ++i)
+		{
+			LocalUser* user = *i;
+			user->already_sent = 0;
+		}
+	}
+	return already_sent_id;
+}