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 86601e95348d9ffc5a7eb6cc5b7e8a6f37a06f71..6df2db1dd300572d5aa8b2195a0a60eda6c82412 100644 (file)
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -2,44 +2,37 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#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 */
 
-
-
+/** A test resolver class for IPV6
+ */
 class MyV6Resolver : public Resolver
 {
        bool fw;
  public:
-       MyV6Resolver(const std::string &source, bool forward) : Resolver(ServerInstance, source, forward ? DNS_QUERY_AAAA : DNS_QUERY_PTR6)
+       MyV6Resolver(InspIRCd* Instance, Module* me, const std::string &source, bool forward, bool &cached) : Resolver(Instance, source, forward ? DNS_QUERY_AAAA : DNS_QUERY_PTR6, cached, me)
        {
                fw = forward;
        }
 
-       virtual void OnLookupComplete(const std::string &result)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
-               ServerInstance->Log(DEBUG,"*** RESOLVER COMPLETED %s LOOKUP, IP IS: '%s'",fw ? "FORWARD" : "REVERSE", result.c_str());
+               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)
@@ -48,32 +41,36 @@ class MyV6Resolver : public Resolver
        }
 };
 
-
-        
+/** Handle /WOOT
+ */
 class cmd_woot : public command_t
 {
+       Module* Creator;
  public:
- cmd_woot (InspIRCd* Instance) : command_t(Instance,"WOOT", 0, 0)
+       /* Command 'woot', takes no parameters and needs no special modes */
+       cmd_woot (InspIRCd* Instance, Module* maker) : command_t(Instance,"WOOT", 0, 0), Creator(maker)
        {
                this->source = "m_testcommand.so";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                /* We dont have to worry about deleting 'r', the core will
                 * do it for us as required.*/
-
                try
                {
-                       MyV6Resolver* r = new MyV6Resolver("shake.stacken.kth.se", true);
-                       ServerInstance->AddResolver(r);
-                       r = new MyV6Resolver("2001:6b0:1:ea:202:a5ff:fecd:13a6", false);
-                       ServerInstance->AddResolver(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)
                {
                        ServerInstance->Log(DEBUG,"Danger, will robinson! There was an exception: %s",e.GetReason());
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -82,60 +79,27 @@ class ModuleTestCommand : public Module
        cmd_woot* newcommand;
  public:
        ModuleTestCommand(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                
-               // Create a new command:
-               // command will be called /WOOT, and will
-               // call handle_woot when triggered, the
-               // 0 in the modes parameter signifies that
-               // anyone can issue the command, and the
-               // command takes only one parameter.
-               newcommand = new cmd_woot(ServerInstance);
+               // Create a new command
+               newcommand = new cmd_woot(ServerInstance, this);
                ServerInstance->AddCommand(newcommand);
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserJoin] = 1;
        }
 
-       virtual void OnUserJoin(userrec* user, chanrec* channel)
-       {
-       }
-       
        virtual ~ModuleTestCommand()
        {
+               delete newcommand;
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 0, 0, 0, VF_VENDOR);
-       }
-};
-
 
-class ModuleTestCommandFactory : public ModuleFactory
-{
- public:
-       ModuleTestCommandFactory()
-       {
-       }
-       
-       ~ModuleTestCommandFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+       virtual Version GetVersion()
        {
-               return new ModuleTestCommand(Me);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleTestCommandFactory;
-}
-
+MODULE_INIT(ModuleTestCommand)