X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=da8061fba630e2e122357365f486251f01744202;hb=c71801ebc4577b19e604c0d91a95fdcfe5250cc9;hp=e5fdb7adc563e835a5fda0d24df255044d4238b6;hpb=78c14ffcc5429f4855e2f3a6c822a1d37f9f591a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index e5fdb7adc..da8061fba 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip, const std::string &targetip)
+void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscached, 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.
@@ -31,20 +31,20 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 	catch (...)
 	{
 		Instance->Logs->Log("USERS", DEFAULT,"*** WTF *** Duplicated UUID! -- Crack smoking monkies have been unleashed.");
-		Instance->SNO->WriteToSnoMask('A', "WARNING *** Duplicate UUID allocated!");
+		Instance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
 
 	char ipaddr[MAXBUF];
 #ifdef IPV6
-	if (socketfamily == AF_INET6)
+	if (ip->sa_family == 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));
 
 	New->SetFd(socket);
-	New->SetSockAddr(socketfamily, ipaddr, port);
+	New->SetSockAddr(ip->sa_family, 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));
@@ -106,27 +106,11 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 	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);
+		Instance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
 		this->QuitUser(New,"No more connections allowed");
 		return;
 	}
 
-	/*
-	 * XXX -
-	 * this is done as a safety check to keep the file descriptors within range of fd_ref_table.
-	 * its a pretty big but for the moment valid assumption:
-	 * file descriptors are handed out starting at 0, and are recycled as theyre freed.
-	 * therefore if there is ever an fd over 65535, 65536 clients must be connected to the
-	 * irc server at once (or the irc server otherwise initiating this many connections, files etc)
-	 * which for the time being is a physical impossibility (even the largest networks dont have more
-	 * than about 10,000 users on ONE server!)
-	 */
-	if (socket >= Instance->SE->GetMaxFds())
-	{
-		this->QuitUser(New, "Server is full");
-		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
@@ -188,17 +172,47 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 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());
+	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());
+		return;
+	}
+
+	user->quitting = true;
+
+	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;
 
+	std::string reason;
+	std::string oper_reason;
+	reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
 	if (!*operreason)
+	{
 		user->operquitmsg = quitreason;
+		oper_reason.assign(quitreason, 0, ServerInstance->Config->Limits.MaxQuit);
+	}
 	else
+	{
 		user->operquitmsg = operreason;
+		oper_reason.assign(operreason, 0, ServerInstance->Config->Limits.MaxQuit);
+	}
 
 	ServerInstance->GlobalCulls.AddItem(user);
+
+	if (user->registered == REG_ALL)
+	{
+		FOREACH_MOD_I(ServerInstance,I_OnUserQuit,OnUserQuit(user, reason, oper_reason));
+		user->PurgeEmptyChannels();
+		user->WriteCommonQuit(reason, oper_reason);
+	}
+
+	FOREACH_MOD_I(ServerInstance,I_OnUserDisconnect,OnUserDisconnect(user));
+
+	// Move the user onto their UID, to allow nick to be reused immediately
+	user->UpdateNickHash(user->uuid.c_str());
 }
 
 
@@ -284,7 +298,7 @@ void UserManager::RemoveCloneCounts(User *user)
 			local_clones.erase(x);
 		}
 	}
-	
+
 	clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
 	if (y != global_clones.end())
 	{
@@ -298,7 +312,23 @@ void UserManager::RemoveCloneCounts(User *user)
 
 unsigned long UserManager::GlobalCloneCount(User *user)
 {
-	clonemap::iterator x = global_clones.find(user->GetIPString());
+	int range = 32;
+	switch (user->GetProtocolFamily())
+	{
+#ifdef SUPPORT_IP6LINKS
+		case AF_INET6:
+		{
+			range = ServerInstance->Config->c_ipv6_range;
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			range = ServerInstance->Config->c_ipv4_range;
+		}
+		break;
+	}
+	clonemap::iterator x = global_clones.find(user->GetCIDRMask(range));
 	if (x != global_clones.end())
 		return x->second;
 	else
@@ -307,7 +337,23 @@ unsigned long UserManager::GlobalCloneCount(User *user)
 
 unsigned long UserManager::LocalCloneCount(User *user)
 {
-	clonemap::iterator x = local_clones.find(user->GetIPString());
+	int range = 32;
+	switch (user->GetProtocolFamily())
+	{
+#ifdef SUPPORT_IP6LINKS
+		case AF_INET6:
+		{
+			range = ServerInstance->Config->c_ipv6_range;
+		}
+		break;
+#endif
+		case AF_INET:
+		{
+			range = ServerInstance->Config->c_ipv4_range;
+		}
+		break;
+	}
+	clonemap::iterator x = local_clones.find(user->GetCIDRMask(range));
 	if (x != local_clones.end())
 		return x->second;
 	else
@@ -464,6 +510,3 @@ int UserManager::ModeCount(const char mode)
 	else
 		return 0;
 }
-
-
-