Move the <disabled> tag out of the core to a new module.

[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 ae21c6940a4cf2d7a89230a6235d0fd3a43d65b8..803c19846288e67dd93be7f5fac9a8ce6570a860 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -92,7 +92,7 @@ class IdentRequestSocket : public EventHandler
        {
                age = ServerInstance->Time();
 
-               SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0));
+               SetFd(socket(user->server_sa.family(), SOCK_STREAM, 0));
 
                if (GetFd() == -1)
                        throw ModuleException("Could not create socket");
@@ -105,7 +105,7 @@ class IdentRequestSocket : public EventHandler
                memcpy(&bindaddr, &user->server_sa, sizeof(bindaddr));
                memcpy(&connaddr, &user->client_sa, sizeof(connaddr));
 
-               if (connaddr.sa.sa_family == AF_INET6)
+               if (connaddr.family() == AF_INET6)
                {
                        bindaddr.in6.sin6_port = 0;
                        connaddr.in6.sin6_port = htons(113);
@@ -126,7 +126,7 @@ class IdentRequestSocket : public EventHandler
                SocketEngine::NonBlocking(GetFd());
 
                /* Attempt connection (nonblocking) */
-               if (SocketEngine::Connect(this, &connaddr.sa, connaddr.sa_size()) == -1 && errno != EINPROGRESS)
+               if (SocketEngine::Connect(this, connaddr) == -1 && errno != EINPROGRESS)
                {
                        this->Close();
                        throw ModuleException("connect() failed");
@@ -140,16 +140,15 @@ class IdentRequestSocket : public EventHandler
                }
        }
 
-       void OnConnected()
+       void OnEventHandlerWrite() CXX11_OVERRIDE
        {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnConnected()");
                SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 
                char req[32];
 
                /* Build request in the form 'localport,remoteport\r\n' */
                int req_size;
-               if (user->client_sa.sa.sa_family == AF_INET6)
+               if (user->client_sa.family() == AF_INET6)
                        req_size = snprintf(req, sizeof(req), "%d,%d\r\n",
                                ntohs(user->client_sa.in6.sin6_port), ntohs(user->server_sa.in6.sin6_port));
                else
@@ -163,30 +162,6 @@ class IdentRequestSocket : public EventHandler
                        done = true;
        }
 
-       void HandleEvent(EventType et, int errornum = 0)
-       {
-               switch (et)
-               {
-                       case EVENT_READ:
-                               /* fd readable event, received ident response */
-                               ReadResponse();
-                       break;
-                       case EVENT_WRITE:
-                               /* fd writeable event, successfully connected! */
-                               OnConnected();
-                       break;
-                       case EVENT_ERROR:
-                               /* fd error event, ohshi- */
-                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "EVENT_ERROR");
-                               /* We *must* Close() here immediately or we get a
-                                * huge storm of EVENT_ERROR events!
-                                */
-                               Close();
-                               done = true;
-                       break;
-               }
-       }
-
        void Close()
        {
                /* Remove ident socket from engine, and close it, but dont detatch it
@@ -204,7 +179,7 @@ class IdentRequestSocket : public EventHandler
                return done;
        }
 
-       void ReadResponse()
+       void OnEventHandlerRead() CXX11_OVERRIDE
        {
                /* We don't really need to buffer for incomplete replies here, since IDENT replies are
                 * extremely short - there is *no* sane reason it'd be in more than one packet
@@ -263,6 +238,18 @@ class IdentRequestSocket : public EventHandler
                        }
                }
        }
+
+       void OnEventHandlerError(int errornum) CXX11_OVERRIDE
+       {
+               Close();
+               done = true;
+       }
+
+       CullResult cull() CXX11_OVERRIDE
+       {
+               Close();
+               return EventHandler::cull();
+       }
 };
 
 class ModuleIdent : public Module
@@ -271,7 +258,8 @@ class ModuleIdent : public Module
        bool NoLookupPrefix;
        SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
  public:
-       ModuleIdent() : ext("ident_socket", this)
+       ModuleIdent()
+               : ext("ident_socket", ExtensionItem::EXT_USER, this)
        {
        }
 
@@ -283,14 +271,28 @@ class ModuleIdent : public Module
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
-               RequestTimeout = tag->getInt("timeout", 5);
-               if (!RequestTimeout)
-                       RequestTimeout = 5;
+               RequestTimeout = tag->getDuration("timeout", 5, 1);
                NoLookupPrefix = tag->getBool("nolookupprefix", false);
        }
 
-       void OnUserInit(LocalUser *user) CXX11_OVERRIDE
+       void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
        {
+               IdentRequestSocket* isock = ext.get(user);
+               if (isock)
+               {
+                       // If an ident lookup request was in progress then cancel it.
+                       isock->Close();
+                       ext.unset(user);
+               }
+
+               // The ident protocol requires that clients are connecting over a protocol with ports.
+               if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6)
+                       return;
+
+               // We don't want to look this up once the user has connected.
+               if (user->registered == REG_ALL)
+                       return;
+
                ConfigTag* tag = user->MyClass->config;
                if (!tag->getBool("useident", true))
                        return;
@@ -299,7 +301,7 @@ class ModuleIdent : public Module
 
                try
                {
-                       IdentRequestSocket *isock = new IdentRequestSocket(user);
+                       isock = new IdentRequestSocket(user);
                        ext.set(user, isock);
                }
                catch (ModuleException &e)
@@ -362,28 +364,6 @@ class ModuleIdent : public Module
                        return MOD_RES_DENY;
                return MOD_RES_PASSTHRU;
        }
-
-       void OnCleanup(int target_type, void *item) CXX11_OVERRIDE
-       {
-               /* Module unloading, tidy up users */
-               if (target_type == TYPE_USER)
-               {
-                       LocalUser* user = IS_LOCAL((User*) item);
-                       if (user)
-                               OnUserDisconnect(user);
-               }
-       }
-
-       void OnUserDisconnect(LocalUser *user) CXX11_OVERRIDE
-       {
-               /* User disconnect (generic socket detatch event) */
-               IdentRequestSocket *isock = ext.get(user);
-               if (isock)
-               {
-                       isock->Close();
-                       ext.unset(user);
-               }
-       }
 };
 
 MODULE_INIT(ModuleIdent)