Add server ports to ServerInstance->ports, enable SSL on them using OnHookIO

[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..0ba9e6e3a6de398400c30c50dc381385bfc7d5d2 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];
 
@@ -284,12 +279,12 @@ class ModuleIdent : public Module
        ConfigReader *Conf;
        SimpleExtItem<IdentRequestSocket> ext;
  public:
-       ModuleIdent(InspIRCd *Me) : Module(Me), ext("ident_socket", this)
+       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);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnUserDisconnect };
+               ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
        ~ModuleIdent()
@@ -299,13 +294,13 @@ 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)
@@ -337,7 +332,7 @@ class ModuleIdent : public Module
 
                try
                {
-                       IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user);
+                       IdentRequestSocket *isock = new IdentRequestSocket(user);
                        ext.set(user, isock);
                }
                catch (ModuleException &e)