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

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index d518b790e..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,28 +30,55 @@ 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);
 
-	New->SetFd(socket);
+	/* 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;
+
+	/* The users default nick is their UUID */
+	strlcpy(New->nick, New->uuid, 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->registered = REG_NONE;
+	New->signon = Instance->Time() + Instance->Config->dns_timeout;
+	New->lastping = 1;
 
 	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
 	for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
@@ -79,11 +106,11 @@ 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() >= MAXCLIENTS))
 	{
-		Instance->WriteOpers("*** Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
+		Instance->SNO->WriteToSnoMask('A', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
 		User::QuitUser(Instance, New,"No more connections allowed");
 		return;
 	}
@@ -99,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;
@@ -117,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);
@@ -125,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
@@ -142,14 +169,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");
+		User::QuitUser(Instance, New, "Internal error handling connection");
+	}
 
 	/* NOTE: even if dns lookups are *off*, we still need to display this.
 	 * BOPM and other stuff requires it.
@@ -224,3 +248,157 @@ unsigned long UserManager::LocalCloneCount(User *user)
 	else
 		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, ...)
+{
+	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, 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, 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;
+}
+
+
+