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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 5ee84590b..73096d4a8 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::AddUser(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,46 +30,56 @@ 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);
+
+	this->unregistered_count++;
 
 	(*(this->clientlist))[New->uuid] = New;
 
 	/* The users default nick is their UUID */
-	strlcpy(New->nick, New->uuid, NICKMAX - 1);
+	New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
 
 	New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
-	/* We don't need range checking here, we KNOW 'unknown\0' will fit into the ident field. */
-	strcpy(New->ident, "unknown");
+	New->ident.assign("unknown");
 
 	New->registered = REG_NONE;
 	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;
-	New->dhost[j] = New->host[j] = 0;
+	New->dhost.assign(New->GetIPString(), 0, 64);
+	New->host.assign(New->GetIPString(), 0, 64);
 
 	Instance->Users->AddLocalClone(New);
 	Instance->Users->AddGlobalClone(New);
@@ -82,7 +92,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	if (!i)
 	{
-		User::QuitUser(Instance, New, "Access denied by configuration");
+		this->QuitUser(New, "Access denied by configuration");
 		return;
 	}
 
@@ -94,10 +104,10 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	this->local_users.push_back(New);
 
-	if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= MAXCLIENTS))
+	if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds()))
 	{
 		Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
-		User::QuitUser(Instance, New,"No more connections allowed");
+		this->QuitUser(New,"No more connections allowed");
 		return;
 	}
 
@@ -111,13 +121,12 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	 * which for the time being is a physical impossibility (even the largest networks dont have more
 	 * 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");
+		this->QuitUser(New, "Server is full");
 		return;
 	}
-#endif
+
 	/*
 	 * even with bancache, we still have to keep User::exempt current.
 	 * besides that, if we get a positive bancache hit, we still won't fuck
@@ -130,15 +139,15 @@ 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);
+				New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner);
+			this->QuitUser(New, b->Reason);
 			return;
 		}
 		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,8 +166,8 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	if (!Instance->SE->AddFd(New))
 	{
-		Instance->Log(DEBUG,"Internal error on new connection");
-		User::QuitUser(Instance, New, "Internal error handling connection");
+		Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
+		this->QuitUser(New, "Internal error handling connection");
 	}
 
 	/* NOTE: even if dns lookups are *off*, we still need to display this.
@@ -168,6 +177,7 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 
 	if (Instance->Config->NoUserDns)
 	{
+		New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
 		New->dns_done = true;
 	}
 	else
@@ -176,6 +186,22 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	}
 }
 
+void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
+{
+	ServerInstance->Logs->Log("USERS", DEBUG,"QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str());
+	user->Write("ERROR :Closing link (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
+	user->quietquit = false;
+	user->quitmsg = quitreason;
+
+	if (!*operreason)
+		user->operquitmsg = quitreason;
+	else
+		user->operquitmsg = operreason;
+
+	ServerInstance->GlobalCulls.AddItem(user);
+}
+
+
 void UserManager::AddLocalClone(User *user)
 {
 	clonemap::iterator x = local_clones.find(user->GetIPString());
@@ -271,7 +297,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 +318,7 @@ void UserManager::ServerNoticeAll(char* text, ...)
 	}
 }
 
-void UserManager::ServerPrivmsgAll(char* text, ...)
+void UserManager::ServerPrivmsgAll(const char* text, ...)
 {
 	if (!text)
 		return;
@@ -321,7 +347,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;
 	}
 
@@ -347,7 +373,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 			}
 			if (send_to_user)
 			{
-				t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+				t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
 			}
 		}
 	}
@@ -369,7 +395,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 
 			if (send_to_user)
 			{
-				t->WriteServ("NOTICE %s :%s", t->nick, textbuffer);
+				t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
 			}
 		}
 	}