Wait for the manager bind to come back before sending search in LDAP modules

[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 9f67a62423907e73bd3fe6ea6724fefd4102f846..67065bd6226c8c5ea12a4638a62a832a278609f0 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -24,8 +24,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for RFC1413 ident lookups */
-
 /* --------------------------------------------------------------
  * Note that this is the third incarnation of m_ident. The first
  * two attempts were pretty crashy, mainly due to the fact we tried
@@ -119,23 +117,23 @@ 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");
@@ -144,8 +142,8 @@ class IdentRequestSocket : public EventHandler
 
        void OnConnected()
        {
-               ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "OnConnected()");
-               ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "OnConnected()");
+               SocketEngine::ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 
                char req[32];
 
@@ -161,7 +159,7 @@ 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;
        }
 
@@ -179,7 +177,7 @@ class IdentRequestSocket : public EventHandler
                        break;
                        case EVENT_ERROR:
                                /* fd error event, ohshi- */
-                               ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "EVENT_ERROR");
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "EVENT_ERROR");
                                /* We *must* Close() here immediately or we get a
                                 * huge storm of EVENT_ERROR events!
                                 */
@@ -196,10 +194,8 @@ class IdentRequestSocket : public EventHandler
                 */
                if (GetFd() > -1)
                {
-                       ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Close ident socket %d", GetFd());
-                       ServerInstance->SE->DelFd(this);
-                       ServerInstance->SE->Close(GetFd());
-                       this->SetFd(-1);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Close ident socket %d", GetFd());
+                       SocketEngine::Close(this);
                }
        }
 
@@ -214,7 +210,7 @@ class IdentRequestSocket : public EventHandler
                 * 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
@@ -228,7 +224,7 @@ class IdentRequestSocket : public EventHandler
                if (recvresult < 3)
                        return;
 
-               ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "ReadResponse()");
+               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "ReadResponse()");
 
                /* Truncate at the first null character, but first make sure
                 * there is at least one null char (at the end of the buffer).
@@ -260,7 +256,7 @@ class IdentRequestSocket : public EventHandler
                         * we're done.
                         */
                        result += *i;
-                       if (!ServerInstance->IsIdent(result.c_str()))
+                       if (!ServerInstance->IsIdent(result))
                        {
                                result.erase(result.end()-1);
                                break;
@@ -278,23 +274,12 @@ class ModuleIdent : public Module
        {
        }
 
-       void init() CXX11_OVERRIDE
-       {
-               ServerInstance->Modules->AddService(ext);
-               OnRehash(NULL);
-               Implementation eventlist[] = {
-                       I_OnRehash, I_OnUserInit, I_OnCheckReady,
-                       I_OnUserDisconnect, I_OnSetConnectClass
-               };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-       }
-
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
        }
 
-       void OnRehash(User *user) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
                if (!RequestTimeout)
@@ -316,7 +301,7 @@ class ModuleIdent : public Module
                }
                catch (ModuleException &e)
                {
-                       ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Ident exception: %s", e.GetReason());
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Ident exception: " + e.GetReason());
                }
        }
 
@@ -329,12 +314,7 @@ class ModuleIdent : public Module
                /* Does user have an ident socket attached at all? */
                IdentRequestSocket *isock = ext.get(user);
                if (!isock)
-               {
-                       ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "No ident socket :(");
                        return MOD_RES_PASSTHRU;
-               }
-
-               ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Has ident_socket");
 
                time_t compare = isock->age;
                compare += RequestTimeout;
@@ -344,21 +324,17 @@ class ModuleIdent : public Module
                {
                        /* Ident timeout */
                        user->WriteNotice("*** Ident request timed out.");
-                       ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Timeout");
                }
                else if (!isock->HasResult())
                {
                        // time still good, no result yet... hold the registration
-                       ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "No result yet");
                        return MOD_RES_DENY;
                }
 
-               ServerInstance->Logs->Log("m_ident", LOG_DEBUG, "Yay, result!");
-
                /* 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