X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=05f5d2c9dbcaa0c7437c6c44ad540214db513c9a;hb=18ab1f358acd2ccdd2f95054ec56b83f17f18ddd;hp=da8061fba630e2e122357365f486251f01744202;hpb=929cd28544c59d122a8d36b2b5e3a394aa03108b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index da8061fba..05f5d2c9d 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -11,49 +11,36 @@
  * ---------------------------------------------------
  */
 
-/* $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, int port, bool iscached, sockaddr* ip, const std::string &targetip)
+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;
 	}
 
-	char ipaddr[MAXBUF];
-#ifdef IPV6
-	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(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));
+	FOREACH_MOD(I_OnHookIO, OnHookIO(New, via));
 
 	if (New->GetIOHook())
 	{
 		try
 		{
-			New->GetIOHook()->OnRawSocketAccept(socket, ipaddr, port);
+			New->GetIOHook()->OnStreamSocketAccept(New, client, server);
 		}
 		catch (CoreException& modexcept)
 		{
@@ -61,40 +48,32 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 		}
 	}
 
-	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();
-
-	if (!i)
-	{
-		this->QuitUser(New, "Access denied by configuration");
-		return;
-	}
+	New->SetClass();
 
 	/*
 	 * Check connect class settings and initialise settings into User.
@@ -104,9 +83,9 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 	this->local_users.push_back(New);
 
-	if ((this->local_users.size() > Instance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)Instance->SE->GetMaxFds()))
+	if ((this->local_users.size() > ServerInstance->Config->SoftLimit) || (this->local_users.size() >= (unsigned int)ServerInstance->SE->GetMaxFds()))
 	{
-		Instance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", Instance->Config->SoftLimit);
+		ServerInstance->SNO->WriteToSnoMask('a', "Warning: softlimit value has been reached: %d clients", ServerInstance->Config->SoftLimit);
 		this->QuitUser(New,"No more connections allowed");
 		return;
 	}
@@ -116,29 +95,29 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 	 * 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)
 			{
@@ -148,9 +127,9 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 		}
 	}
 
-	if (!Instance->SE->AddFd(New))
+	if (!ServerInstance->SE->AddFd(New, 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");
 	}
 
@@ -159,7 +138,7 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 	 */
 	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;
@@ -178,128 +157,129 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 		return;
 	}
 
+	if (IS_SERVER(user))
+	{
+		ServerInstance->Logs->Log("CULLLIST",DEBUG, "*** Warning *** - You tried to quit a fake user (%s)", user->nick.c_str());
+		return;
+	}
+
 	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());
 
-	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;
+	if (operreason && *operreason)
 		oper_reason.assign(operreason, 0, ServerInstance->Config->Limits.MaxQuit);
-	}
+	else
+		oper_reason = quitreason;
 
 	ServerInstance->GlobalCulls.AddItem(user);
 
 	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));
+	if (user->registered != REG_ALL)
+		if (ServerInstance->Users->unregistered_count)
+			ServerInstance->Users->unregistered_count--;
 
-	// Move the user onto their UID, to allow nick to be reused immediately
-	user->UpdateNickHash(user->uuid.c_str());
-}
+	if (IS_LOCAL(user))
+	{
+		LocalUser* lu = IS_LOCAL(user);
+		FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
+		lu->DoWrite();
+		if (lu->GetIOHook())
+		{
+			try
+			{
+				lu->GetIOHook()->OnStreamSocketClose(lu);
+			}
+			catch (CoreException& modexcept)
+			{
+				ServerInstance->Logs->Log("USERS",DEBUG, "%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
+			}
+		}
 
+		ServerInstance->SE->DelFd(lu);
+		lu->Close();
+	}
 
-void UserManager::AddLocalClone(User *user)
-{
-	int range = 32;
-	clonemap::iterator x;
-	switch (user->GetProtocolFamily())
+	/*
+	 * 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 (user->registered == REG_ALL)
 	{
-#ifdef SUPPORT_IP6LINKS
-		case AF_INET6:
+		if (IS_LOCAL(user))
 		{
-			range = ServerInstance->Config->c_ipv6_range;
+			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());
+			}
 		}
-		break;
-#endif
-		case AF_INET:
+		else
 		{
-			range = ServerInstance->Config->c_ipv4_range;
+			if ((!ServerInstance->SilentULine(user->server)) && (!user->quietquit))
+			{
+				ServerInstance->SNO->WriteToSnoMask('Q',"Client exiting on server %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());
+			}
 		}
-		break;
+		user->AddToWhoWas();
 	}
 
-	x = local_clones.find(user->GetCIDRMask(range));
+	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..");
+}
+
+
+void UserManager::AddLocalClone(User *user)
+{
+	clonemap::iterator x;
+	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->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;
-	}
 
-	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->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())
+	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--;
@@ -312,23 +292,7 @@ void UserManager::RemoveCloneCounts(User *user)
 
 unsigned long UserManager::GlobalCloneCount(User *user)
 {
-	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));
+	clonemap::iterator x = global_clones.find(user->GetCIDRMask());
 	if (x != global_clones.end())
 		return x->second;
 	else
@@ -337,23 +301,7 @@ unsigned long UserManager::GlobalCloneCount(User *user)
 
 unsigned long UserManager::LocalCloneCount(User *user)
 {
-	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));
+	clonemap::iterator x = local_clones.find(user->GetCIDRMask());
 	if (x != local_clones.end())
 		return x->second;
 	else
@@ -408,9 +356,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));
@@ -429,9 +377,9 @@ 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));
@@ -457,7 +405,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 
 	if (flags == WM_AND)
 	{
-		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;
 			bool send_to_user = true;
@@ -478,7 +426,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 	}
 	else if (flags == WM_OR)
 	{
-		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;
 			bool send_to_user = false;
@@ -503,7 +451,7 @@ void UserManager::WriteMode(const char* modes, int flags, const char* text, ...)
 /* 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);
+	ModeHandler* mh = ServerInstance->Modes->FindMode(mode, MODETYPE_USER);
 
 	if (mh)
 		return mh->GetCount();