X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=e7d1fd05c2bb888eed24d908e7ab92f80660236a;hb=4c12eafe612932f4b3f6806fc1bea79942998941;hp=09c9a5bde2431f59bdc1c28a8732f4a3ba278078;hpb=0d95204c9848a56b02a1aca717ddca7f5e60e5a6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 09c9a5bde..e7d1fd05c 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -23,6 +23,25 @@
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
+#include "iohook.h"
+
+UserManager::UserManager()
+	: clientlist(new user_hash)
+	, uuidlist(new user_hash)
+	, unregistered_count(0), local_count(0)
+{
+}
+
+UserManager::~UserManager()
+{
+	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 */
 void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
@@ -37,7 +56,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	}
 	catch (...)
 	{
-		ServerInstance->Logs->Log("USERS", LOG_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,11 +73,11 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		}
 		catch (CoreException& modexcept)
 		{
-			ServerInstance->Logs->Log("SOCKET", LOG_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", LOG_DEBUG,"New user fd: %d", socket);
+	ServerInstance->Logs->Log("USERS", LOG_DEBUG, "New user fd: %d", socket);
 
 	this->unregistered_count++;
 
@@ -74,6 +93,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	ServerInstance->Users->AddGlobalClone(New);
 
 	New->localuseriter = this->local_users.insert(local_users.end(), New);
+	local_count++;
 
 	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
 	{
@@ -92,7 +112,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	 * Check connect class settings and initialise settings into User.
 	 * This will be done again after DNS resolution. -- w00t
 	 */
-	New->CheckClass();
+	New->CheckClass(ServerInstance->Config->CCOnConnect);
 	if (New->quitting)
 		return;
 
@@ -135,7 +155,7 @@ 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", LOG_DEBUG,"Internal error on new connection");
+		ServerInstance->Logs->Log("USERS", LOG_DEBUG, "Internal error on new connection");
 		this->QuitUser(New, "Internal error handling connection");
 	}
 
@@ -229,7 +249,6 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	ServerInstance->Users->uuidlist->erase(user->uuid);
 }
 
-
 void UserManager::AddLocalClone(User *user)
 {
 	local_clones[user->GetCIDRMask()]++;
@@ -284,42 +303,6 @@ unsigned long UserManager::LocalCloneCount(User *user)
 		return 0;
 }
 
-/* this function counts all users connected, wether they are registered or NOT. */
-unsigned int UserManager::UserCount()
-{
-	/*
-	 * XXX: Todo:
-	 *  As part of this restructuring, move clientlist/etc fields into usermanager.
-	 * 	-- w00t
-	 */
-	return this->clientlist->size();
-}
-
-/* this counts only registered users, so that the percentages in /MAP don't mess up */
-unsigned int UserManager::RegisteredUserCount()
-{
-	return this->clientlist->size() - this->UnregisteredUserCount();
-}
-
-/* return how many users are opered */
-unsigned int UserManager::OperCount()
-{
-	return this->all_opers.size();
-}
-
-/* return how many users are unregistered */
-unsigned int UserManager::UnregisteredUserCount()
-{
-	return this->unregistered_count;
-}
-
-/* return how many local registered users there are */
-unsigned int UserManager::LocalUserCount()
-{
-	/* Doesnt count unregistered clients */
-	return (this->local_users.size() - this->UnregisteredUserCount());
-}
-
 void UserManager::ServerNoticeAll(const char* text, ...)
 {
 	std::string message;
@@ -356,3 +339,14 @@ void UserManager::GarbageCollect()
 		(**i).RemoveExpiredInvites();
 	}
 }
+
+/* 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)
+ */
+bool UserManager::AllModulesReportReady(LocalUser* user)
+{
+	ModResult res;
+	FIRST_MOD_RESULT(OnCheckReady, res, (user));
+	return (res == MOD_RES_PASSTHRU);
+}