X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=a171c32d203aec7ae4cafc8712aea2b95941bc4d;hb=7e4b66804044616a85d5049cbfdb88efa012cc51;hp=bc5eb01a9d401f25131454ae9740c5139c738c1b;hpb=1e5728d84c1b4b0d86bf745ce253aa458575df20;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index bc5eb01a9..a171c32d2 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->WriteOpers("*** WARNING *** Duplicate UUID allocated!");
+		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;
-
-	Instance->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);
 
-	(*(Instance->clientlist))[New->uuid] = New;
+	/* 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, NICKMAX - 1);
 
 	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;
 	}
 
@@ -92,12 +102,12 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	 */
 	New->CheckClass();
 
-	Instance->local_users.push_back(New);
+	this->local_users.push_back(New);
 
-	if ((Instance->local_users.size() > Instance->Config->SoftLimit) || (Instance->local_users.size() >= MAXCLIENTS))
+	if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds()))
 	{
-		Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
-		User::QuitUser(Instance, New,"No more connections allowed");
+		Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
+		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
@@ -155,14 +164,11 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 		}
 	}
 
-        if (socket > -1)
-        {
-                if (!Instance->SE->AddFd(New))
-                {
-			Instance->Log(DEBUG,"Internal error on new connection");
-			User::QuitUser(Instance, New, "Internal error handling connection");
-                }
-        }
+	if (!Instance->SE->AddFd(New))
+	{
+		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.
 	 * BOPM and other stuff requires it.
@@ -171,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
@@ -179,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());
@@ -246,32 +269,148 @@ unsigned int UserManager::UserCount()
 	 *  As part of this restructuring, move clientlist/etc fields into usermanager.
 	 * 	-- w00t
 	 */
-	return ServerInstance->clientlist->size();
+	return this->clientlist->size();
 }
 
 /* this counts only registered users, so that the percentages in /MAP don't mess up */
 unsigned int UserManager::RegisteredUserCount()
 {
-	return ServerInstance->clientlist->size() - this->UnregisteredUserCount();
+	return this->clientlist->size() - this->UnregisteredUserCount();
 }
 
 /* return how many users are opered */
 unsigned int UserManager::OperCount()
 {
-	return ServerInstance->all_opers.size();
+	return this->all_opers.size();
 }
 
 /* return how many users are unregistered */
 unsigned int UserManager::UnregisteredUserCount()
 {
-	return ServerInstance->unregistered_count;
+	return this->unregistered_count;
 }
 
 /* return how many local registered users there are */
 unsigned int UserManager::LocalUserCount()
 {
-        /* Doesnt count unregistered clients */
-        return (ServerInstance->local_users.size() - this->UnregisteredUserCount());
+	/* Doesnt count unregistered clients */
+	return (this->local_users.size() - this->UnregisteredUserCount());
+}
+
+void UserManager::ServerNoticeAll(const char* text, ...)
+{
+	if (!text)
+		return;
+
+	char textbuffer[MAXBUF];
+	char formatbuffer[MAXBUF];
+	va_list argsPtr;
+	va_start (argsPtr, text);
+	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	va_end(argsPtr);
+
+	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName, textbuffer);
+
+	for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	{
+		User* t = *i;
+		t->WriteServ(std::string(formatbuffer));
+	}
+}
+
+void UserManager::ServerPrivmsgAll(const char* text, ...)
+{
+	if (!text)
+		return;
+
+	char textbuffer[MAXBUF];
+	char formatbuffer[MAXBUF];
+	va_list argsPtr;
+	va_start (argsPtr, text);
+	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	va_end(argsPtr);
+
+	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName, textbuffer);
+
+	for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	{
+		User* t = *i;
+		t->WriteServ(std::string(formatbuffer));
+	}
+}
+
+void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
+{
+	char textbuffer[MAXBUF];
+	int modelen;
+	va_list argsPtr;
+
+	if (!text || !modes || !flags)
+	{
+		ServerInstance->Logs->Log("USERS", DEFAULT,"*** BUG *** WriteMode was given an invalid parameter");
+		return;
+	}
+
+	va_start(argsPtr, text);
+	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+	va_end(argsPtr);
+	modelen = strlen(modes);
+
+	if (flags == WM_AND)
+	{
+		for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+		{
+			User* t = *i;
+			bool send_to_user = true;
+
+			for (int n = 0; n < modelen; n++)
+			{
+				if (!t->IsModeSet(modes[n]))
+				{
+					send_to_user = false;
+					break;
+				}
+			}
+			if (send_to_user)
+			{
+				t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
+			}
+		}
+	}
+	else if (flags == WM_OR)
+	{
+		for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+		{
+			User* t = *i;
+			bool send_to_user = false;
+
+			for (int n = 0; n < modelen; n++)
+			{
+				if (t->IsModeSet(modes[n]))
+				{
+					send_to_user = true;
+					break;
+				}
+			}
+
+			if (send_to_user)
+			{
+				t->WriteServ("NOTICE %s :%s", t->nick.c_str(), textbuffer);
+			}
+		}
+	}
+}
+
+/* return how many users have a given mode e.g. 'a' */
+int UserManager::ModeCount(const char mode)
+{
+	ModeHandler* mh = this->ServerInstance->Modes->FindMode(mode, MODETYPE_USER);
+
+	if (mh)
+		return mh->GetCount();
+	else
+		return 0;
 }
 
 
+