Fix potential for duplicate SID if the SID is auto generated.

[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 a0f590f9572f12ee92a2ae6fe8d28ee695334a30..0fef4d33b984a33c22108c090edffbcf58b6ffca 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -11,11 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for RFC 1413 ident lookups */
@@ -35,7 +30,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();
        }
@@ -79,6 +74,7 @@ class RFC1413 : public InspSocket
                                                                {
                                                                        if (this->Instance->IsIdent(section))
                                                                        {
+                                                                               u->Extend("IDENT", new std::string(std::string(section) + "," + std::string(u->ident)));
                                                                                strlcpy(u->ident,section,IDENTMAX);
                                                                                u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
                                                                        }
@@ -148,13 +144,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;
@@ -168,10 +160,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;
@@ -190,21 +180,22 @@ 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);
        }
 
        ModuleIdent(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
 
                ReadSettings();
@@ -215,6 +206,17 @@ class ModuleIdent : public Module
                List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
        }
 
+       void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       {
+               if ((displayable) && (extname == "IDENT"))
+               {
+                       std::string* ident;
+                       if (GetExt("IDENT", ident))
+                               proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *ident);
+               }
+       }
+
+
        virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ReadSettings();
@@ -235,7 +237,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);
@@ -265,6 +267,7 @@ class ModuleIdent : public Module
                {
                        userrec* user = (userrec*)item;
                        RFC1413* ident;
+                       std::string* identstr;
                        if (user->GetExt("ident_data", ident))
                        {
                                // FIX: If the user record is deleted, the socket wont be removed
@@ -273,7 +276,10 @@ class ModuleIdent : public Module
                                // to NULL and check it so that we dont write users who have gone away.
                                ident->u = NULL;
                                ServerInstance->SE->DelFd(ident);
-                               //delete ident;
+                       }
+                       if (user->GetExt("IDENT", identstr))
+                       {
+                               delete identstr;
                        }
                }
        }
@@ -289,11 +295,16 @@ class ModuleIdent : public Module
                 * and this would leave at least one of the invalid ;)
                 */
                RFC1413* ident;
+               std::string* identstr;
                if (user->GetExt("ident_data", ident))
                {
                        ident->u = NULL;
                        ServerInstance->SE->DelFd(ident);
                }
+               if (user->GetExt("IDENT", identstr))
+               {
+                       delete identstr;
+               }
        }
 
        virtual ~ModuleIdent()
@@ -308,27 +319,4 @@ class ModuleIdent : public Module
 
 };
 
-class ModuleIdentFactory : public ModuleFactory
-{
- public:
-       ModuleIdentFactory()
-       {
-       }
-
-       ~ModuleIdentFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleIdent(Me);
-       }
-
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleIdentFactory;
-}
-
+MODULE_INIT(ModuleIdent)