X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=6a23ad79517efb043899e5b865a2b92df6303a96;hb=2db77cda56947d4ee0f913c8082f6607855ca713;hp=5ee84590b8b1b667733420927e6ad3fde743a958;hpb=dd98d56cabcd08a3d5207454e002b187af98d28a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 5ee84590b..6a23ad795 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
+void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
 {
 	/* NOTE: Calling this one parameter constructor for User automatically
 	 * allocates a new UUID and places it in the hash_map.
@@ -30,24 +30,42 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	}
 	catch (...)
 	{
-		Instance->Log(DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
+		Instance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
 		Instance->SNO->WriteToSnoMask('A', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
 
-	Instance->Log(DEBUG,"New user fd: %d", socket);
-
-	int j = 0;
-
-	this->unregistered_count++;
-
 	char ipaddr[MAXBUF];
 #ifdef IPV6
 	if (socketfamily == AF_INET6)
 		inet_ntop(AF_INET6, &((const sockaddr_in6*)ip)->sin6_addr, ipaddr, sizeof(ipaddr));
 	else
 #endif
-	inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
+		inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
+
+	New->SetFd(socket);
+	New->SetSockAddr(socketfamily, ipaddr, port);
+
+	/* Give each of the modules an attempt to hook the user for I/O */
+	FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New, targetip));
+
+	if (New->io)
+	{
+		try
+		{
+			New->io->OnRawSocketAccept(socket, ipaddr, port);
+		}
+		catch (CoreException& modexcept)
+		{
+			ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+		}
+	}
+
+	Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
+
+	int j = 0;
+
+	this->unregistered_count++;
 
 	(*(this->clientlist))[New->uuid] = New;
 
@@ -62,10 +80,6 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	New->signon = Instance->Time() + Instance->Config->dns_timeout;
 	New->lastping = 1;
 
-	New->SetSockAddr(socketfamily, ipaddr, port);
-
-	New->SetFd(socket);
-
 	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
 	for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
 		New->dhost[j] = New->host[j] = *temp;
@@ -112,7 +126,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	 * than about 10,000 users on ONE server!)
 	 */
 #ifndef WINDOWS
-	if ((unsigned int)socket >= MAX_DESCRIPTORS)
+	if (socket >= Instance->SE->GetMaxFds())
 	{
 		User::QuitUser(Instance, New, "Server is full");
 		return;
@@ -130,7 +144,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 		if (!b->Type.empty() && !New->exempt)
 		{
 			/* user banned */
-			Instance->Log(DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
+			Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
 			if (*Instance->Config->MoronBanner)
 				New->WriteServ("NOTICE %s :*** %s", New->nick, Instance->Config->MoronBanner);
 			User::QuitUser(Instance, New, b->Reason);
@@ -138,7 +152,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 		}
 		else
 		{
-			Instance->Log(DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
+			Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
 		}
 	}
 	else
@@ -157,7 +171,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	if (!Instance->SE->AddFd(New))
 	{
-		Instance->Log(DEBUG,"Internal error on new connection");
+		Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
 		User::QuitUser(Instance, New, "Internal error handling connection");
 	}
 
@@ -271,7 +285,7 @@ unsigned int UserManager::LocalUserCount()
 	return (this->local_users.size() - this->UnregisteredUserCount());
 }
 
-void UserManager::ServerNoticeAll(char* text, ...)
+void UserManager::ServerNoticeAll(const char* text, ...)
 {
 	if (!text)
 		return;
@@ -292,7 +306,7 @@ void UserManager::ServerNoticeAll(char* text, ...)
 	}
 }
 
-void UserManager::ServerPrivmsgAll(char* text, ...)
+void UserManager::ServerPrivmsgAll(const char* text, ...)
 {
 	if (!text)
 		return;
@@ -321,7 +335,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 
 	if (!text || !modes || !flags)
 	{
-		ServerInstance->Log(DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+		ServerInstance->Logs->Log("USERS", DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
 		return;
 	}