Remove InspIRCd* parameters and fields

[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 8d21d5cc898eeb63e4cdad8e63272b9b5ee5ef04..d74873e00770d9aaeb3b8c93552f5a7babff61ff 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -75,13 +75,12 @@ class IdentRequestSocket : public EventHandler
 {
  private:
        User *user;                     /* User we are attached to */
-       InspIRCd* ServerInstance;       /* Server instance */
        bool done;                      /* True if lookup is finished */
        std::string result;             /* Holds the ident string if done */
  public:
        time_t age;
 
-       IdentRequestSocket(InspIRCd *Server, User* u) : user(u), ServerInstance(Server), result(u->ident)
+       IdentRequestSocket(User* u) : user(u), result(u->ident)
        {
                age = ServerInstance->Time();
                socklen_t size = 0;
@@ -127,21 +126,17 @@ class IdentRequestSocket : public EventHandler
                }
 
                /* Add fd to socket engine */
-               if (!ServerInstance->SE->AddFd(this))
+               if (!ServerInstance->SE->AddFd(this, FD_WANT_NO_READ | FD_WANT_POLL_WRITE))
                {
                        this->Close();
                        throw ModuleException("out of fds");
                }
-
-               /* Important: We set WantWrite immediately after connect()
-                * because a successful connection will trigger a writability event
-                */
-               ServerInstance->SE->WantWrite(this);
        }
 
        virtual void OnConnected()
        {
                ServerInstance->Logs->Log("m_ident",DEBUG,"OnConnected()");
+               ServerInstance->SE->ChangeEventMask(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
 
                char req[32];
 
@@ -280,13 +275,13 @@ class IdentRequestSocket : public EventHandler
 
 class ModuleIdent : public Module
 {
- private:
        int RequestTimeout;
        ConfigReader *Conf;
+       SimpleExtItem<IdentRequestSocket> ext;
  public:
-       ModuleIdent(InspIRCd *Me) : Module(Me)
+       ModuleIdent() : ext("ident_socket", this)
        {
-               Conf = new ConfigReader(ServerInstance);
+               Conf = new ConfigReader;
                OnRehash(NULL);
                Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect };
                ServerInstance->Modules->Attach(eventlist, this, 5);
@@ -299,20 +294,20 @@ class ModuleIdent : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides support for RFC1413 ident lookups", VF_VENDOR, API_VERSION);
        }
 
        virtual void OnRehash(User *user)
        {
                delete Conf;
-               Conf = new ConfigReader(ServerInstance);
+               Conf = new ConfigReader;
 
                RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
                if (!RequestTimeout)
                        RequestTimeout = 5;
        }
 
-       virtual int OnUserRegister(User *user)
+       virtual ModResult OnUserRegister(User *user)
        {
                for (int j = 0; j < Conf->Enumerate("connect"); j++)
                {
@@ -323,7 +318,7 @@ class ModuleIdent : public Module
                                bool useident = Conf->ReadFlag("connect", "useident", "yes", j);
 
                                if (!useident)
-                                       return 0;
+                                       return MOD_RES_PASSTHRU;
                        }
                }
 
@@ -337,29 +332,29 @@ class ModuleIdent : public Module
 
                try
                {
-                       IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user);
-                       user->Extend("ident_socket", isock);
+                       IdentRequestSocket *isock = new IdentRequestSocket(user);
+                       ext.set(user, isock);
                }
                catch (ModuleException &e)
                {
                        ServerInstance->Logs->Log("m_ident",DEBUG,"Ident exception: %s", e.GetReason());
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        /* This triggers pretty regularly, we can use it in preference to
         * creating a Timer object and especially better than creating a
         * Timer per ident lookup!
         */
-       virtual bool OnCheckReady(User *user)
+       virtual ModResult OnCheckReady(User *user)
        {
                /* Does user have an ident socket attached at all? */
-               IdentRequestSocket *isock = NULL;
-               if (!user->GetExt("ident_socket", isock))
+               IdentRequestSocket *isock = ext.get(user);
+               if (!isock)
                {
                        ServerInstance->Logs->Log("m_ident",DEBUG, "No ident socket :(");
-                       return true;
+                       return MOD_RES_PASSTHRU;
                }
 
                ServerInstance->Logs->Log("m_ident",DEBUG, "Has ident_socket");
@@ -377,14 +372,14 @@ class ModuleIdent : public Module
                         * we call this to clean up the user
                         */
                        OnUserDisconnect(user);
-                       return true;
+                       return MOD_RES_PASSTHRU;
                }
 
                /* Got a result yet? */
                if (!isock->HasResult())
                {
                        ServerInstance->Logs->Log("m_ident",DEBUG, "No result yet");
-                       return false;
+                       return MOD_RES_DENY;
                }
 
                ServerInstance->Logs->Log("m_ident",DEBUG, "Yay, result!");
@@ -400,7 +395,7 @@ class ModuleIdent : public Module
 
                /* The user isnt actually disconnecting, we call this to clean up the user */
                OnUserDisconnect(user);
-               return true;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnCleanup(int target_type, void *item)
@@ -413,12 +408,11 @@ class ModuleIdent : public Module
        virtual void OnUserDisconnect(User *user)
        {
                /* User disconnect (generic socket detatch event) */
-               IdentRequestSocket *isock = NULL;
-               if (user->GetExt("ident_socket", isock))
+               IdentRequestSocket *isock = ext.get(user);
+               if (isock)
                {
                        isock->Close();
-                       delete isock;
-                       user->Shrink("ident_socket");
+                       ext.unset(user);
                }
        }
 };