X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=76446c5b57fb07371adaa9b6730e6f335d7e0805;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=b355bc890ce32e2ff10f1f00a029d5421310e487;hpb=ee913368d7162dbe0dd119091f8b468eb7be0f1a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b355bc890..76446c5b5 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -1,52 +1,61 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* $Core */
 
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
 
+UserManager::UserManager()
+	: unregistered_count(0), local_count(0)
+{
+}
+
 /* add a client connection to the sockets list */
-void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 {
 	/* NOTE: Calling this one parameter constructor for User automatically
 	 * allocates a new UUID and places it in the hash_map.
 	 */
-	User* New = NULL;
+	LocalUser* New = NULL;
 	try
 	{
-		New = new User();
+		New = new LocalUser(socket, client, server);
 	}
 	catch (...)
 	{
-		ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
+		ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkeys have been unleashed.");
 		ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
-
-	New->SetFd(socket);
-	memcpy(&New->client_sa, client, sizeof(irc::sockets::sockaddrs));
-	memcpy(&New->server_sa, server, sizeof(irc::sockets::sockaddrs));
+	UserIOHandler* eh = &New->eh;
 
 	/* Give each of the modules an attempt to hook the user for I/O */
-	FOREACH_MOD(I_OnHookIO, OnHookIO(New, via));
+	FOREACH_MOD(I_OnHookIO, OnHookIO(eh, via));
 
-	if (New->GetIOHook())
+	if (eh->GetIOHook())
 	{
 		try
 		{
-			New->GetIOHook()->OnStreamSocketAccept(New, client, server);
+			eh->GetIOHook()->OnStreamSocketAccept(eh, client, server);
 		}
 		catch (CoreException& modexcept)
 		{
@@ -58,51 +67,40 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
 
 	this->unregistered_count++;
 
-	(*(this->clientlist))[New->uuid] = New;
-
 	/* The users default nick is their UUID */
-	New->nick.assign(New->uuid, 0, ServerInstance->Config->Limits.NickMax);
-
-	New->server = ServerInstance->FindServerNamePtr(ServerInstance->Config->ServerName);
-	New->ident.assign("unknown");
+	New->nick = New->uuid;
+	(*(this->clientlist))[New->nick] = New;
 
 	New->registered = REG_NONE;
-	New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
+	New->signon = ServerInstance->Time();
 	New->lastping = 1;
 
-	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
-	New->dhost.assign(New->GetIPString(), 0, 64);
-	New->host.assign(New->GetIPString(), 0, 64);
-
 	ServerInstance->Users->AddLocalClone(New);
 	ServerInstance->Users->AddGlobalClone(New);
 
-	/*
-	 * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved.
-	 * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t
-	 */
-	ConnectClass* i = New->SetClass();
+	New->localuseriter = this->local_users.insert(local_users.end(), New);
+	local_count++;
 
-	if (!i)
+	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
 	{
-		this->QuitUser(New, "Access denied by configuration");
+		ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit);
+		this->QuitUser(New,"No more connections allowed");
 		return;
 	}
 
+	/*
+	 * First class check. We do this again in FullConnect after DNS is done, and NICK/USER is recieved.
+	 * See my note down there for why this is required. DO NOT REMOVE. :) -- w00t
+	 */
+	New->SetClass();
+
 	/*
 	 * Check connect class settings and initialise settings into User.
 	 * This will be done again after DNS resolution. -- w00t
 	 */
 	New->CheckClass();
-
-	this->local_users.push_back(New);
-
-	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
-	{
-		ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit);
-		this->QuitUser(New,"No more connections allowed");
+	if (New->quitting)
 		return;
-	}
 
 	/*
 	 * even with bancache, we still have to keep User::exempt current.
@@ -117,8 +115,8 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
 		{
 			/* user banned */
 			ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
-			if (*ServerInstance->Config->MoronBanner)
-				New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner);
+			if (!ServerInstance->Config->MoronBanner.empty())
+				New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), ServerInstance->Config->MoronBanner.c_str());
 			this->QuitUser(New, b->Reason);
 			return;
 		}
@@ -141,7 +139,7 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
 		}
 	}
 
-	if (!ServerInstance->SE->AddFd(New, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
+	if (!ServerInstance->SE->AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
 	{
 		ServerInstance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
 		this->QuitUser(New, "Internal error handling connection");
@@ -151,6 +149,14 @@ void UserManager::AddUser(int socket, ClientListenSocket* via, irc::sockets::soc
 	 * BOPM and other stuff requires it.
 	 */
 	New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
+	if (ServerInstance->Config->RawLog)
+		New->WriteServ("NOTICE Auth :*** Raw I/O logging is enabled on this server. All messages, passwords, and commands are being recorded.");
+
+	FOREACH_MOD(I_OnSetUserIP,OnSetUserIP(New));
+	if (New->quitting)
+		return;
+
+	FOREACH_MOD(I_OnUserInit,OnUserInit(New));
 
 	if (ServerInstance->Config->NoUserDns)
 	{
@@ -167,13 +173,13 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 {
 	if (user->quitting)
 	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a user (%s) twice. Did your module call QuitUser twice?", user->nick.c_str());
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Tried to quit quitting user: " + user->nick);
 		return;
 	}
 
 	if (IS_SERVER(user))
 	{
-		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Tried to quit server user: " + user->nick);
 		return;
 	}
 
@@ -195,40 +201,23 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	if (user->registered == REG_ALL)
 	{
 		FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
-		user->PurgeEmptyChannels();
 		user->WriteCommonQuit(reason, oper_reason);
 	}
 
-	FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(user));
-
 	if (user->registered != REG_ALL)
 		if (ServerInstance->Users->unregistered_count)
 			ServerInstance->Users->unregistered_count--;
 
 	if (IS_LOCAL(user))
 	{
-		user->DoWrite();
-		if (user->GetIOHook())
-		{
-			try
-			{
-				user->GetIOHook()->OnStreamSocketClose(user);
-			}
-			catch (CoreException& modexcept)
-			{
-				ServerInstance->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-			}
-		}
-
-		ServerInstance->SE->DelFd(user);
-		user->Close();
-		// user->Close() will set fd to -1; this breaks IS_LOCAL. Fix
-		user->SetFd(INT_MAX);
+		LocalUser* lu = IS_LOCAL(user);
+		FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+		lu->eh.Close();
 	}
 
 	/*
 	 * this must come before the ServerInstance->SNO->WriteToSnoMaskso that it doesnt try to fill their buffer with anything
-	 * if they were an oper with +sn +qQ.
+	 * if they were an oper with +s +qQ.
 	 */
 	if (user->registered == REG_ALL)
 	{
@@ -236,16 +225,16 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 		{
 			if (!user->quietquit)
 			{
-				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s!%s@%s [%s]",
-					user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
+				ServerInstance->SNO->WriteToSnoMask('q',"Client exiting: %s (%s) [%s]",
+					user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str());
 			}
 		}
 		else
 		{
 			if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
 			{
-				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s!%s@%s [%s]",
-					user->server, user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str());
+				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %s: %s (%s) [%s]",
+					user->server.c_str(), user->GetFullRealHost().c_str(), user->GetIPString(), oper_reason.c_str());
 			}
 		}
 		user->AddToWhoWas();
@@ -256,76 +245,38 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	if (iter != this->clientlist->end())
 		this->clientlist->erase(iter);
 	else
-		ServerInstance->Logs->Log("USERS", DEBUG, "iter == clientlist->end, can't remove them from hash... problematic..");
+		ServerInstance->Logs->Log("USERS", DEFAULT, "ERROR: Nick not found in clientlist, cannot remove: " + user->nick);
+
+	ServerInstance->Users->uuidlist->erase(user->uuid);
 }
 
 
 void UserManager::AddLocalClone(User *user)
 {
-	int range = 32;
-	clonemap::iterator x;
-	switch (user->client_sa.sa.sa_family)
-	{
-		case AF_INET6:
-			range = ServerInstance->Config->c_ipv6_range;
-		break;
-		case AF_INET:
-			range = ServerInstance->Config->c_ipv4_range;
-		break;
-	}
-
-	x = local_clones.find(user->GetCIDRMask(range));
-	if (x != local_clones.end())
-		x->second++;
-	else
-		local_clones[user->GetCIDRMask(range)] = 1;
+	local_clones[user->GetCIDRMask()]++;
 }
 
 void UserManager::AddGlobalClone(User *user)
 {
-	int range = 32;
-	clonemap::iterator x;
-	switch (user->client_sa.sa.sa_family)
-	{
-		case AF_INET6:
-			range = ServerInstance->Config->c_ipv6_range;
-		break;
-		case AF_INET:
-			range = ServerInstance->Config->c_ipv4_range;
-		break;
-	}
-
-	x = global_clones.find(user->GetCIDRMask(range));
-	if (x != global_clones.end())
-		x->second++;
-	else
-		global_clones[user->GetCIDRMask(range)] = 1;
+	global_clones[user->GetCIDRMask()]++;
 }
 
 void UserManager::RemoveCloneCounts(User *user)
 {
-	int range = 32;
-	switch (user->client_sa.sa.sa_family)
-	{
-		case AF_INET6:
-			range = ServerInstance->Config->c_ipv6_range;
-		break;
-		case AF_INET:
-			range = ServerInstance->Config->c_ipv4_range;
-		break;
-	}
-
-	clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
-	if (x != local_clones.end())
+	if (IS_LOCAL(user))
 	{
-		x->second--;
-		if (!x->second)
+		clonemap::iterator x = local_clones.find(user->GetCIDRMask());
+		if (x != local_clones.end())
 		{
-			local_clones.erase(x);
+			x->second--;
+			if (!x->second)
+			{
+				local_clones.erase(x);
+			}
 		}
 	}
 
-	clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
+	clonemap::iterator y = global_clones.find(user->GetCIDRMask());
 	if (y != global_clones.end())
 	{
 		y->second--;
@@ -336,19 +287,25 @@ void UserManager::RemoveCloneCounts(User *user)
 	}
 }
 
-unsigned long UserManager::GlobalCloneCount(User *user)
+void UserManager::RehashCloneCounts()
 {
-	int range = 32;
-	switch (user->client_sa.sa.sa_family)
+	local_clones.clear();
+	global_clones.clear();
+
+	const user_hash& hash = *ServerInstance->Users->clientlist;
+	for (user_hash::const_iterator i = hash.begin(); i != hash.end(); ++i)
 	{
-		case AF_INET6:
-			range = ServerInstance->Config->c_ipv6_range;
-		break;
-		case AF_INET:
-			range = ServerInstance->Config->c_ipv4_range;
-		break;
+		User* u = i->second;
+
+		if (IS_LOCAL(u))
+			AddLocalClone(u);
+		AddGlobalClone(u);
 	}
-	clonemap::iterator x = global_clones.find(user->GetCIDRMask(range));
+}
+
+unsigned long UserManager::GlobalCloneCount(User *user)
+{
+	clonemap::iterator x = global_clones.find(user->GetCIDRMask());
 	if (x != global_clones.end())
 		return x->second;
 	else
@@ -357,17 +314,7 @@ unsigned long UserManager::GlobalCloneCount(User *user)
 
 unsigned long UserManager::LocalCloneCount(User *user)
 {
-	int range = 32;
-	switch (user->client_sa.sa.sa_family)
-	{
-		case AF_INET6:
-			range = ServerInstance->Config->c_ipv6_range;
-		break;
-		case AF_INET:
-			range = ServerInstance->Config->c_ipv4_range;
-		break;
-	}
-	clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
+	clonemap::iterator x = local_clones.find(user->GetCIDRMask());
 	if (x != local_clones.end())
 		return x->second;
 	else
@@ -407,7 +354,7 @@ unsigned int UserManager::UnregisteredUserCount()
 unsigned int UserManager::LocalUserCount()
 {
 	/* Doesnt count unregistered clients */
-	return (this->local_users.size() - this->UnregisteredUserCount());
+	return (this->local_count - this->UnregisteredUserCount());
 }
 
 void UserManager::ServerNoticeAll(const char* text, ...)
@@ -422,9 +369,9 @@ void UserManager::ServerNoticeAll(const char* text, ...)
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName, textbuffer);
+	snprintf(formatbuffer,MAXBUF,"NOTICE $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
-	for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (LocalUserList::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
 		t->WriteServ(std::string(formatbuffer));
@@ -443,84 +390,25 @@ void UserManager::ServerPrivmsgAll(const char* text, ...)
 	vsnprintf(textbuffer, MAXBUF, text, argsPtr);
 	va_end(argsPtr);
 
-	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName, textbuffer);
+	snprintf(formatbuffer,MAXBUF,"PRIVMSG $%s :%s", ServerInstance->Config->ServerName.c_str(), textbuffer);
 
-	for (std::vector<User*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
+	for (LocalUserList::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 = ServerInstance->Modes->FindMode(mode, MODETYPE_USER);
-
-	if (mh)
-		return mh->GetCount();
-	else
-		return 0;
+	int c = 0;
+	for(user_hash::iterator i = clientlist->begin(); i != clientlist->end(); ++i)
+	{
+		User* u = i->second;
+		if (u->modes[mode-65])
+			c++;
+	}
+	return c;
 }