Fix crash on propogation after routed squit has reached it's destination. Thx HiroP.

[user/henk/code/inspircd.git] / src / modules / m_ident.cpp

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index 3f3399d3c604682b7eacda235b828706701b5b08..eb9f3f365c6bde4a3b6e018650d67c560d1ccd77 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -33,7 +33,7 @@ class RFC1413 : public InspSocket
        userrec* u;              // user record that the lookup is associated with
        int ufd;
 
-       RFC1413(InspIRCd* SI, userrec* user, int maxtime) : InspSocket(SI, user->GetIPString(), 113, false, maxtime), u(user)
+       RFC1413(InspIRCd* SI, userrec* user, int maxtime, const std::string &bindto) : InspSocket(SI, user->GetIPString(), 113, false, maxtime, bindto), u(user)
        {
                ufd = user->GetFd();
        }
@@ -147,13 +147,9 @@ class RFC1413 : public InspSocket
                        {
                                themlen = sizeof(sockaddr_in6);
                                uslen = sizeof(sockaddr_in6);
-                               success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
                        }
-                       else
-                               success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
-#else
-                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
 #endif
+                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
                        if (success)
                        {
                                delete[] sock_us;
@@ -167,10 +163,8 @@ class RFC1413 : public InspSocket
                                if (this->u->GetProtocolFamily() == AF_INET6)
                                        snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port));
                                else
-                                       snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
-#else
-                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
 #endif
+                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
                                this->Write(ident_request);
                                delete[] sock_us;
                                delete[] sock_them;
@@ -189,14 +183,15 @@ class ModuleIdent : public Module
 {
 
        ConfigReader* Conf;
-
        int IdentTimeout;
+       std::string PortBind;
 
  public:
        void ReadSettings()
        {
                Conf = new ConfigReader(ServerInstance);
-               IdentTimeout = Conf->ReadInteger("ident","timeout",0,true);
+               IdentTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
+               PortBind = Conf->ReadValue("ident", "bind", 0);
                if (!IdentTimeout)
                        IdentTimeout = 1;
                DELETE(Conf);
@@ -245,7 +240,7 @@ class ModuleIdent : public Module
                
 
                user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
-               RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout);
+               RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, PortBind);
                if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED))
                {
                        user->Extend("ident_data", (char*)ident);