Added some missing parameter checking in m_swhois

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

diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index 55632c98e435cf9431f4c827af29c7c9e863f2ad..6df2db1dd300572d5aa8b2195a0a60eda6c82412 100644 (file)
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -11,12 +11,11 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.h>
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
 #include "dns.h"
-#include "inspircd.h"
 
 /* $ModDesc: Povides a proof-of-concept test /WOOT command */
 
@@ -31,9 +30,9 @@ class MyV6Resolver : public Resolver
                fw = forward;
        }
 
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
-               ServerInstance->Log(DEBUG,"*** RESOLVER COMPLETED %s LOOKUP, IP IS: '%s' TTL=%lu",fw ? "FORWARD" : "REVERSE", result.c_str(), ttl);
+               ServerInstance->Log(DEBUG,"*** RESOLVER COMPLETED %s LOOKUP, IP IS: '%s' TTL=%lu CACHED=%d",fw ? "FORWARD" : "REVERSE", result.c_str(), ttl, cached);
        }
 
        virtual void OnError(ResolverError e, const std::string &errormessage)
@@ -60,24 +59,11 @@ class cmd_woot : public command_t
                 * do it for us as required.*/
                try
                {
-                       bool cached1, cached2;
-                       MyV6Resolver* r = new MyV6Resolver(ServerInstance, Creator, "shake.stacken.kth.se", true, cached1);
-                       if (!cached1)
-                               ServerInstance->AddResolver(r);
-                       else
-                       {
-                               ServerInstance->Log(DEBUG,"Result was cached, delete object");
-                               delete r;
-                       }
-
-                       r = new MyV6Resolver(ServerInstance, Creator, "2001:6b0:1:ea:202:a5ff:fecd:13a6", false, cached2);
-                       if (!cached2)
-                               ServerInstance->AddResolver(r);
-                       else
-                       {
-                               ServerInstance->Log(DEBUG,"Result was cached, delete object");
-                               delete r;
-                       }
+                       bool cached;
+                       MyV6Resolver* r = new MyV6Resolver(ServerInstance, Creator, "shake.stacken.kth.se", true, cached);
+                       ServerInstance->AddResolver(r, cached);
+                       r = new MyV6Resolver(ServerInstance, Creator, "2001:6b0:1:ea:202:a5ff:fecd:13a6", false, cached);
+                       ServerInstance->AddResolver(r, cached);
                }
                catch (ModuleException& e)
                {
@@ -93,7 +79,7 @@ class ModuleTestCommand : public Module
        cmd_woot* newcommand;
  public:
        ModuleTestCommand(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
                // Create a new command
@@ -103,14 +89,8 @@ class ModuleTestCommand : public Module
 
        void Implements(char* List)
        {
-               List[I_OnUserJoin] = 1;
        }
 
-       virtual void OnUserJoin(userrec* user, chanrec* channel)
-       {
-               /* This is an example, we do nothing here */
-       }
-       
        virtual ~ModuleTestCommand()
        {
                delete newcommand;
@@ -122,28 +102,4 @@ class ModuleTestCommand : public Module
        }
 };
 
-
-class ModuleTestCommandFactory : public ModuleFactory
-{
- public:
-       ModuleTestCommandFactory()
-       {
-       }
-       
-       ~ModuleTestCommandFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleTestCommand(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTestCommandFactory;
-}
-
+MODULE_INIT(ModuleTestCommand)