X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=f8b1f0de257cfe4d4b4d53f8c911c810460ac055;hb=4d42d544584875d0d71dab99f6785ac98324b971;hp=e526238eddb6688bd9125fb8a0682cebe91c2f88;hpb=d164d06d1aaa7fb92ccbbe957dd66082c28b5838;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index e526238ed..f8b1f0de2 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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.
@@ -37,14 +37,14 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 	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));
@@ -172,8 +172,15 @@ void UserManager::AddUser(InspIRCd* Instance, int socket, int port, bool iscache
 
 void UserManager::QuitUser(User *user, const std::string &quitreason, const char* operreason)
 {
+	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;
+	}
+
 	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->Write("ERROR :Closing link: (%s@%s) [%s]", user->ident.c_str(), user->host.c_str(), *operreason ? operreason : quitreason.c_str());
+	user->quitting = true;
 	user->quietquit = false;
 	user->quitmsg = quitreason;
 
@@ -268,7 +275,7 @@ void UserManager::RemoveCloneCounts(User *user)
 			local_clones.erase(x);
 		}
 	}
-	
+
 	clonemap::iterator y = global_clones.find(user->GetCIDRMask(range));
 	if (y != global_clones.end())
 	{
@@ -480,6 +487,3 @@ int UserManager::ModeCount(const char mode)
 	else
 		return 0;
 }
-
-
-