Convert a bunch of time-related config options to getDuration.

[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 516287668c9fd7f45426fe127a1dabb05cf23e25..806c70ad2410b86c4ece7c09850f50abab959b3d 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -117,33 +117,32 @@ class IdentRequestSocket : public EventHandler
                }
 
                /* Attempt to bind (ident requests must come from the ip the query is referring to */
-               if (ServerInstance->SE->Bind(GetFd(), bindaddr) < 0)
+               if (SocketEngine::Bind(GetFd(), bindaddr) < 0)
                {
                        this->Close();
                        throw ModuleException("failed to bind()");
                }
 
-               ServerInstance->SE->NonBlocking(GetFd());
+               SocketEngine::NonBlocking(GetFd());
 
                /* Attempt connection (nonblocking) */
-               if (ServerInstance->SE->Connect(this, &connaddr.sa, connaddr.sa_size()) == -1 && errno != EINPROGRESS)
+               if (SocketEngine::Connect(this, &connaddr.sa, connaddr.sa_size()) == -1 && errno != EINPROGRESS)
                {
                        this->Close();
                        throw ModuleException("connect() failed");
                }
 
                /* Add fd to socket engine */
-               if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_READ | FD_WANT_POLL_WRITE))
+               if (!SocketEngine::AddFd(this, FD_WANT_NO_READ | FD_WANT_POLL_WRITE))
                {
                        this->Close();
                        throw ModuleException("out of fds");
                }
        }
 
-       void OnConnected()
+       void OnEventHandlerWrite() CXX11_OVERRIDE
        {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnConnected()");
-               ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+               SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 
                char req[32];
 
@@ -159,34 +158,10 @@ class IdentRequestSocket : public EventHandler
                /* Send failed if we didnt write the whole ident request --
                 * might as well give up if this happens!
                 */
-               if (ServerInstance->SE->Send(this, req, req_size, 0) < req_size)
+               if (SocketEngine::Send(this, req, req_size, 0) < req_size)
                        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
@@ -195,9 +170,7 @@ class IdentRequestSocket : public EventHandler
                if (GetFd() > -1)
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Close ident socket %d", GetFd());
-                       ServerInstance->SE->DelFd(this);
-                       ServerInstance->SE->Close(GetFd());
-                       this->SetFd(-1);
+                       SocketEngine::Close(this);
                }
        }
 
@@ -206,13 +179,13 @@ 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
                 */
                char ibuf[256];
-               int recvresult = ServerInstance->SE->Recv(this, ibuf, sizeof(ibuf)-1, 0);
+               int recvresult = SocketEngine::Recv(this, ibuf, sizeof(ibuf)-1, 0);
 
                /* Close (but don't delete from memory) our socket
                 * and flag as done since the ident lookup has finished
@@ -265,14 +238,28 @@ 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
 {
        int RequestTimeout;
-       SimpleExtItem<IdentRequestSocket> ext;
+       bool NoLookupPrefix;
+       SimpleExtItem<IdentRequestSocket, stdalgo::culldeleter> ext;
  public:
-       ModuleIdent() : ext("ident_socket", this)
+       ModuleIdent()
+               : ext("ident_socket", ExtensionItem::EXT_USER, this)
        {
        }
 
@@ -283,9 +270,9 @@ class ModuleIdent : public Module
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
-               if (!RequestTimeout)
-                       RequestTimeout = 5;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("ident");
+               RequestTimeout = tag->getDuration("timeout", 5, 1);
+               NoLookupPrefix = tag->getBool("nolookupprefix", false);
        }
 
        void OnUserInit(LocalUser *user) CXX11_OVERRIDE
@@ -298,12 +285,12 @@ class ModuleIdent : public Module
 
                try
                {
-                       IdentRequestSocket *isock = new IdentRequestSocket(IS_LOCAL(user));
+                       IdentRequestSocket *isock = new IdentRequestSocket(user);
                        ext.set(user, isock);
                }
                catch (ModuleException &e)
                {
-                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Ident exception: %s", e.GetReason());
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Ident exception: " + e.GetReason());
                }
        }
 
@@ -316,7 +303,11 @@ class ModuleIdent : public Module
                /* Does user have an ident socket attached at all? */
                IdentRequestSocket *isock = ext.get(user);
                if (!isock)
+               {
+                       if ((NoLookupPrefix) && (user->ident[0] != '~'))
+                               user->ident.insert(user->ident.begin(), 1, '~');
                        return MOD_RES_PASSTHRU;
+               }
 
                time_t compare = isock->age;
                compare += RequestTimeout;
@@ -336,7 +327,7 @@ class ModuleIdent : public Module
                /* wooo, got a result (it will be good, or bad) */
                if (isock->result.empty())
                {
-                       user->ident.insert(0, 1, '~');
+                       user->ident.insert(user->ident.begin(), 1, '~');
                        user->WriteNotice("*** Could not find your ident, using " + user->ident + " instead.");
                }
                else
@@ -357,28 +348,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)