X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=1e3e9fa72ef35e1f6a19d86b4ecc1fc9437501b6;hb=0f87ad0d4b97874823c94a5168a06dcd444ad559;hp=f78ebeb57cc87787ca4aa782edc1d4276542022e;hpb=0f74e88f0996acff1580bcf5f2ea3dc986497339;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index f78ebeb57..1e3e9fa72 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -32,15 +32,16 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		ServerInstance->SNO->WriteToSnoMask('a', "WARNING *** Duplicate UUID allocated!");
 		return;
 	}
+	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)
 		{
@@ -127,7 +128,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 		}
 	}
 
-	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");
@@ -192,12 +193,13 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 	{
 		LocalUser* lu = IS_LOCAL(user);
 		FOREACH_MOD(I_OnUserDisconnect,OnUserDisconnect(lu));
-		lu->DoWrite();
-		if (lu->GetIOHook())
+		UserIOHandler* eh = &lu->eh;
+		eh->DoWrite();
+		if (eh->GetIOHook())
 		{
 			try
 			{
-				lu->GetIOHook()->OnStreamSocketClose(lu);
+				eh->GetIOHook()->OnStreamSocketClose(eh);
 			}
 			catch (CoreException& modexcept)
 			{
@@ -205,8 +207,8 @@ void UserManager::QuitUser(User *user, const std::string &quitreason, const char
 			}
 		}
 
-		ServerInstance->SE->DelFd(lu);
-		lu->Close();
+		ServerInstance->SE->DelFd(eh);
+		eh->Close();
 	}
 
 	/*
@@ -219,16 +221,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 [%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.c_str(), 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();