Port bindings for gnutls now bind via ip:port, rather than on all ports for that ip, fixes feature request for roadmap. NOTE, this still needs doing for the openssl module!

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9188 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 4 insertions, 6 deletions

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index b518685fa..af76f5651 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -18,7 +18,7 @@
 #include "bancache.h"
 
 /* add a client connection to the sockets list */
-void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, sockaddr* ip)
+void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscached, int socketfamily, 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.
@@ -43,9 +43,11 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 #endif
 		inet_ntop(AF_INET, &((const sockaddr_in*)ip)->sin_addr, ipaddr, sizeof(ipaddr));
 
+	New->SetFd(socket);
+	New->SetSockAddr(socketfamily, ipaddr, port);
 
 	/* Give each of the modules an attempt to hook the user for I/O */
-	FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New));
+	FOREACH_MOD_I(Instance, I_OnHookUserIO, OnHookUserIO(New, targetip));
 
 	if (New->io)
 	{
@@ -78,10 +80,6 @@ void UserManager::AddClient(InspIRCd* Instance, int socket, int port, bool iscac
 	New->signon = Instance->Time() + Instance->Config->dns_timeout;
 	New->lastping = 1;
 
-	New->SetSockAddr(socketfamily, ipaddr, port);
-
-	New->SetFd(socket);
-
 	/* Smarter than your average bear^H^H^H^Hset of strlcpys. */
 	for (const char* temp = New->GetIPString(); *temp && j < 64; temp++, j++)
 		New->dhost[j] = New->host[j] = *temp;