Annotations

[user/henk/code/inspircd.git] / src / modules / m_cgiirc.cpp

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 32ac5726fc6c7ae1e401b57e691aa70e85f3dd9a..9d4344629cc9653af567b9248440a360487af9b9 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -23,16 +23,15 @@
 #include <arpa/inet.h>
 #include "users.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "dns.h"
 #include "inspircd.h"
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
-
-
 enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST };
 
+/** Holds a CGI site's details
+ */
 class CGIhost : public classbase
 {
 public:
@@ -47,6 +46,8 @@ public:
 
 typedef std::vector<CGIhost> CGIHostlist;
 
+/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+ */
 class CGIResolver : public Resolver
 {
        std::string typ;
@@ -60,7 +61,7 @@ class CGIResolver : public Resolver
        virtual void OnLookupComplete(const std::string &result)
        {
                /* Check the user still exists */
-               if ((them) && (them == ServerInstance->fd_ref_table[theirfd]))
+               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
                {
                        if (notify)
                                ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str());
@@ -73,7 +74,7 @@ class CGIResolver : public Resolver
 
        virtual void OnError(ResolverError e, const std::string &errormessage)
        {
-               if ((them) && (them == ServerInstance->fd_ref_table[theirfd]))
+               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
                {
                        if (notify)
                                ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str());
@@ -262,7 +263,7 @@ public:
 
                                try
                                {
-                                       CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->fd, "PASS");
+                                       CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->GetFd(), "PASS");
                                        ServerInstance->AddResolver(r);
                                }
                                catch (ModuleException& e)
@@ -317,8 +318,8 @@ public:
                                                                
                try
                {
-                       ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->fd, "IDENT");
-                       CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->fd, "IDENT");
+                       ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->GetFd(), "IDENT");
+                       CGIResolver* r = new CGIResolver(NotifyOpers, newip, false, user, user->GetFd(), "IDENT");
                        ServerInstance->AddResolver(r);
                }
                catch (ModuleException& e)