X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fusermanager.cpp;h=af76f56515d75b53effc1e5799cb5f9f1673323d;hb=4f946291b7fd022b50fe5aacb9b851cebfbb2278;hp=b518685faf6b2f19165b858cdb5956e9394997b5;hpb=343f12b9b2d4e519b09877f76a00f6a0714509f2;p=user%2Fhenk%2Fcode%2Finspircd.git 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;