Remove some debug (im on a crusade to make debug mode useful, but at the same time...

[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..437ce319000b1ff3fc6fede27c69a4434c056fe4 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -2,13 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *               <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *               <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -23,16 +19,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 +42,8 @@ public:
 
 typedef std::vector<CGIhost> CGIHostlist;
 
+/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+ */
 class CGIResolver : public Resolver
 {
        std::string typ;
@@ -54,13 +51,13 @@ class CGIResolver : public Resolver
        userrec* them;
        bool notify;
  public:
-       CGIResolver(bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type)
-               : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+       CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)
+               : Resolver(ServerInstance, source, forward ? DNS_QUERY_FORWARD : DNS_QUERY_REVERSE, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
-       virtual void OnLookupComplete(const std::string &result)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
                /* 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 +70,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());
@@ -94,7 +91,7 @@ public:
        ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me)
        {
                
-               OnRehash("");
+               OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -108,7 +105,7 @@ public:
                return PRIORITY_FIRST;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ConfigReader Conf(ServerInstance);
                
@@ -195,7 +192,7 @@ public:
        }
        
 
-       virtual void OnUserRegister(userrec* user)
+       virtual int OnUserRegister(userrec* user)
        {
                ServerInstance->Log(DEBUG, "m_cgiirc.so: User %s registering, %s %s", user->nick,user->host,user->GetIPString());
                
@@ -226,10 +223,10 @@ public:
                                        // If the ident lookup fails, try the password.
                                        CheckPass(user);
                                }
-                               
-                               return;
+                               return 0;
                        }
                }
+               return 0;
        }
 
        bool CheckPass(userrec* user)
@@ -262,8 +259,9 @@ public:
 
                                try
                                {
-                                       CGIResolver* r = new CGIResolver(NotifyOpers, user->password, false, user, user->fd, "PASS");
-                                       ServerInstance->AddResolver(r);
+                                       bool cached;
+                                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+                                       ServerInstance->AddResolver(r, cached);
                                }
                                catch (ModuleException& e)
                                {
@@ -317,9 +315,10 @@ 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->AddResolver(r);
+                       ServerInstance->Log(DEBUG,"MAKE RESOLVER: %s %d %s",newip, user->GetFd(), "IDENT");
+                       bool cached;
+                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
+                       ServerInstance->AddResolver(r, cached);
                }
                catch (ModuleException& e)
                {
@@ -413,7 +412,7 @@ public:
         
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_VENDOR);
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
        
 };