Make irc::sockets::* parameters consistent, add irc::sockets::mask

[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 e5c8940ec29041fe1b4861f18689670c927e9b0f..fbd7706fe7efd2a802887b0b456b0ade555e2e53 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -74,14 +74,13 @@
 class IdentRequestSocket : public EventHandler
 {
  private:
-       User *user;                     /* User we are attached to */
-       InspIRCd* ServerInstance;       /* Server instance */
+       LocalUser *user;                        /* User we are attached to */
        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(LocalUser* 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];
 
@@ -281,51 +276,38 @@ class IdentRequestSocket : public EventHandler
 class ModuleIdent : public Module
 {
        int RequestTimeout;
-       ConfigReader *Conf;
        SimpleExtItem<IdentRequestSocket> ext;
  public:
-       ModuleIdent(InspIRCd *Me) : Module(Me), ext("ident_socket", this)
+       ModuleIdent() : ext("ident_socket", this)
        {
-               Conf = new ConfigReader(ServerInstance);
                OnRehash(NULL);
-               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
        ~ModuleIdent()
        {
-               delete Conf;
        }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides support for RFC1413 ident lookups", VF_VENDOR);
        }
 
        virtual void OnRehash(User *user)
        {
-               delete Conf;
-               Conf = new ConfigReader(ServerInstance);
+               ConfigReader Conf;
 
-               RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
+               RequestTimeout = Conf.ReadInteger("ident", "timeout", 0, true);
                if (!RequestTimeout)
                        RequestTimeout = 5;
        }
 
-       virtual ModResult OnUserRegister(User *user)
+       virtual ModResult OnUserRegister(LocalUser *user)
        {
-               for (int j = 0; j < Conf->Enumerate("connect"); j++)
-               {
-                       std::string hostn = Conf->ReadValue("connect","allow",j);
-                       /* XXX: Fixme: does not respect port, limit, etc */
-                       if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
-                       {
-                               bool useident = Conf->ReadFlag("connect", "useident", "yes", j);
-
-                               if (!useident)
-                                       return MOD_RES_PASSTHRU;
-                       }
-               }
+               ConfigTag* tag = user->MyClass->config;
+               if (!tag->getBool("useident", true))
+                       return MOD_RES_PASSTHRU;
 
                /* User::ident is currently the username field from USER; with m_ident loaded, that
                 * should be preceded by a ~. The field is actually IdentMax+2 characters wide. */
@@ -337,7 +319,7 @@ class ModuleIdent : public Module
 
                try
                {
-                       IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user);
+                       IdentRequestSocket *isock = new IdentRequestSocket(IS_LOCAL(user));
                        ext.set(user, isock);
                }
                catch (ModuleException &e)
@@ -352,7 +334,7 @@ class ModuleIdent : public Module
         * creating a Timer object and especially better than creating a
         * Timer per ident lookup!
         */
-       virtual ModResult OnCheckReady(User *user)
+       virtual ModResult OnCheckReady(LocalUser *user)
        {
                /* Does user have an ident socket attached at all? */
                IdentRequestSocket *isock = ext.get(user);
@@ -407,10 +389,10 @@ class ModuleIdent : public Module
        {
                /* Module unloading, tidy up users */
                if (target_type == TYPE_USER)
-                       OnUserDisconnect((User*)item);
+                       OnUserDisconnect((LocalUser*)item);
        }
 
-       virtual void OnUserDisconnect(User *user)
+       virtual void OnUserDisconnect(LocalUser *user)
        {
                /* User disconnect (generic socket detatch event) */
                IdentRequestSocket *isock = ext.get(user);