X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=15066fd2856d742d2b005458698b6801695789f1;hb=a018f26eddbc72fdbf87fe5ee89112a53311fff1;hp=b9eff5a3991b21da78fecd74b6998055ba72be28;hpb=16fc672b685752007e47aed0fb97bc1ee7443c76;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b9eff5a39..15066fd28 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,42 +11,37 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #include "inspircd.h"
 #include "xline.h"
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddUser(InspIRCd* Instance, 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(Instance);
+		New = new LocalUser(socket, client, server);
 	}
 	catch (...)
 	{
-		Instance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
-		Instance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
+		ServerInstance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies 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(Instance, I_OnHookIO, OnHookIO(New, via));
+	FOREACH_MOD(I_OnHookIO, OnHookIO(eh, via));
 
-	if (New->GetIOHook())
+	if (eh->GetIOHook())
 	{
 		try
 		{
-			New->GetIOHook()->OnRawSocketAccept(socket, client, server);
+			eh->GetIOHook()->OnStreamSocketAccept(eh, client, server);
 		}
 		catch (CoreException& modexcept)
 		{
@@ -54,84 +49,78 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi
 		}
 	}
 
-	Instance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
+	ServerInstance->Logs->Log("USERS", DEBUG,"New user fd: %d", socket);
 
 	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);
+	(*(this->clientlist))[New->nick] = New;
 
-	New->server = Instance->FindServerNamePtr(Instance->Config->ServerName);
 	New->ident.assign("unknown");
 
 	New->registered = REG_NONE;
-	New->signon = Instance->Time() + Instance->Config->dns_timeout;
+	New->signon = ServerInstance->Time() + ServerInstance->Config->dns_timeout;
 	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);
 
-	Instance->Users->AddLocalClone(New);
-	Instance->Users->AddGlobalClone(New);
+	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();
+	this->local_users.push_back(New);
 
-	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;
 	}
 
+	FOREACH_MOD(I_OnUserInit,OnUserInit(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
+	 */
+	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() > 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);
-		this->QuitUser(New,"No more connections allowed");
-		return;
-	}
-
 	/*
 	 * 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
 	 * them over if they are exempt. -- w00t
 	 */
-	New->exempt = (Instance->XLines->MatchesLine("E",New) != NULL);
+	New->exempt = (ServerInstance->XLines->MatchesLine("E",New) != NULL);
 
-	if (BanCacheHit *b = Instance->BanCache->GetHit(New->GetIPString()))
+	if (BanCacheHit *b = ServerInstance->BanCache->GetHit(New->GetIPString()))
 	{
 		if (!b->Type.empty() && !New->exempt)
 		{
 			/* user banned */
-			Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
-			if (*Instance->Config->MoronBanner)
-				New->WriteServ("NOTICE %s :*** %s", New->nick.c_str(), Instance->Config->MoronBanner);
+			ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Positive hit for ") + New->GetIPString());
+			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;
 		}
 		else
 		{
-			Instance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
+			ServerInstance->Logs->Log("BANCACHE", DEBUG, std::string("BanCache: Negative hit for ") + New->GetIPString());
 		}
 	}
 	else
 	{
 		if (!New->exempt)
 		{
-			XLine* r = Instance->XLines->MatchesLine("Z",New);
+			XLine* r = ServerInstance->XLines->MatchesLine("Z",New);
 
 			if (r)
 			{
@@ -141,9 +130,9 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi
 		}
 	}
 
-	if (!Instance->SE->AddFd(New))
+	if (!ServerInstance->SE->AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
 	{
-		Instance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
+		ServerInstance->Logs->Log("USERS", DEBUG,"Internal error on new connection");
 		this->QuitUser(New, "Internal error handling connection");
 	}
 
@@ -152,7 +141,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, ClientListenSocket* vi
 	 */
 	New->WriteServ("NOTICE Auth :*** Looking up your hostname...");
 
-	if (Instance->Config->NoUserDns)
+	if (ServerInstance->Config->NoUserDns)
 	{
 		New->WriteServ("NOTICE %s :*** Skipping host resolution (disabled by server administrator)", New->nick.c_str());
 		New->dns_done = true;
@@ -171,7 +160,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 		return;
 	}
 
-	if (IS_FAKE(user))
+	if (IS_SERVER(user))
 	{
 		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
 		return;
@@ -179,7 +168,7 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 	user->quitting = true;
 
-	ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s '%s'", user->nick.c_str(), quitreason.c_str());
+	ServerInstance->Logs->Log("USERS", DEBUG, "QuitUser: %s=%s '%s'", user->uuid.c_str(), 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());
 
 	std::string reason;
@@ -194,40 +183,19 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 
 	if (user->registered == REG_ALL)
 	{
-		FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
-		user->PurgeEmptyChannels();
+		FOREACH_MOD(I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
 		user->WriteCommonQuit(reason, oper_reason);
 	}
 
-	FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(user));
-
-	user->UpdateNickHash(user->uuid.c_str());
-
-	user_hash::iterator iter = this->clientlist->find(user->uuid);
-
 	if (user->registered != REG_ALL)
 		if (ServerInstance->Users->unregistered_count)
 			ServerInstance->Users->unregistered_count--;
 
 	if (IS_LOCAL(user))
 	{
-		if (!user->sendq.empty())
-			user->FlushWriteBuf();
-
-		if (user->GetIOHook())
-		{
-			try
-			{
-				user->GetIOHook()->OnRawSocketClose(user->GetFd());
-			}
-			catch (CoreException& modexcept)
-			{
-				ServerInstance->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-			}
-		}
-
-		ServerInstance->SE->DelFd(user);
-		user->CloseSocket();
+		LocalUser* lu = IS_LOCAL(user);
+		FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+		lu->eh.Close();
 	}
 
 	/*
@@ -240,103 +208,69 @@ 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 [%s] (%s)",
+					user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
 			}
 		}
 		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 [%s] (%s)",
+					user->server.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str(), oper_reason.c_str(), user->GetIPString());
 			}
 		}
 		user->AddToWhoWas();
 	}
 
+	user_hash::iterator iter = this->clientlist->find(user->nick);
+
 	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..");
 
-	if (IS_LOCAL(user))
-	{
-		std::vector<User*>::iterator x = find(local_users.begin(),local_users.end(),user);
-		if (x != local_users.end())
-			local_users.erase(x);
-		else
-			ServerInstance->Logs->Log("USERS", DEBUG, "Failed to remove user from vector");
-	}
+	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));
+	x = local_clones.find(user->GetCIDRMask());
 	if (x != local_clones.end())
 		x->second++;
 	else
-		local_clones[user->GetCIDRMask(range)] = 1;
+		local_clones[user->GetCIDRMask()] = 1;
 }
 
 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));
+	x = global_clones.find(user->GetCIDRMask());
 	if (x != global_clones.end())
 		x->second++;
 	else
-		global_clones[user->GetCIDRMask(range)] = 1;
+		global_clones[user->GetCIDRMask()] = 1;
 }
 
 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--;
@@ -349,17 +283,7 @@ void UserManager::RemoveCloneCounts(User *user)
 
 unsigned long UserManager::GlobalCloneCount(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 = global_clones.find(user->GetCIDRMask(range));
+	clonemap::iterator x = global_clones.find(user->GetCIDRMask());
 	if (x != global_clones.end())
 		return x->second;
 	else
@@ -368,17 +292,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
@@ -433,9 +347,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 (std::vector<LocalUser*>::const_iterator i = local_users.begin(); i != local_users.end(); i++)
 	{
 		User* t = *i;
 		t->WriteServ(std::string(formatbuffer));
@@ -454,84 +368,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 (std::vector<LocalUser*>::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;
+	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;
 }