Add extra parameter to OnUserPreNotice and OnUserPrePrivmsg, CUList &exempt_list...

[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 1f8aaac1ab6343036916511763e73a1c42bd7f20..50853d4b3ae73b3fe15ba340f1a86214e5c175e2 100644 (file)
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -20,51 +20,62 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "dns.h"
+#include "inspircd.h"
 
 /* $ModDesc: Povides a proof-of-concept test /WOOT command */
 
-class MyResolver : public Resolver
+/** A test resolver class for IPV6
+ */
+class MyV6Resolver : public Resolver
 {
+       bool fw;
  public:
-       MyResolver(const std::string &source, bool forward, const std::string &dnsserver = "") : Resolver(source, forward, dnsserver) { }
+       MyV6Resolver(Module* me, const std::string &source, bool forward) : Resolver(ServerInstance, source, forward ? DNS_QUERY_AAAA : DNS_QUERY_PTR6, me)
+       {
+               fw = forward;
+       }
 
        virtual void OnLookupComplete(const std::string &result)
        {
-               log(DEBUG,"*** RESOLVER COMPLETED LOOKUP, IP IS: '%s'",result.c_str());
+               ServerInstance->Log(DEBUG,"*** RESOLVER COMPLETED %s LOOKUP, IP IS: '%s'",fw ? "FORWARD" : "REVERSE", result.c_str());
        }
 
-       virtual void OnError(ResolverError e)
+       virtual void OnError(ResolverError e, const std::string &errormessage)
        {
-               log(DEBUG,"*** RESOLVER GOT ERROR: %d",e);
+               ServerInstance->Log(DEBUG,"*** RESOLVER GOT ERROR: %d: %s",e,errormessage.c_str());
        }
 };
 
-static Server *Srv;
-        
+/** Handle /WOOT
+ */
 class cmd_woot : public command_t
 {
+       Module* Creator;
  public:
-       cmd_woot () : command_t("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
                {
-                       MyResolver* r = new MyResolver("brainbox.ath.cx", true);
-                       Srv->AddResolver(r);
+                       MyV6Resolver* r = new MyV6Resolver(Creator, "shake.stacken.kth.se", true);
+                       ServerInstance->AddResolver(r);
+                       r = new MyV6Resolver(Creator, "2001:6b0:1:ea:202:a5ff:fecd:13a6", false);
+                       ServerInstance->AddResolver(r);
                }
                catch (ModuleException& e)
                {
-                       log(DEBUG,"Danger, will robinson! There was an exception: %s",e.GetReason());
+                       ServerInstance->Log(DEBUG,"Danger, will robinson! There was an exception: %s",e.GetReason());
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -72,18 +83,13 @@ class ModuleTestCommand : public Module
 {
        cmd_woot* newcommand;
  public:
-       ModuleTestCommand(Server* Me)
+       ModuleTestCommand(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = 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();
-               Srv->AddCommand(newcommand);
+               
+               // Create a new command
+               newcommand = new cmd_woot(ServerInstance, this);
+               ServerInstance->AddCommand(newcommand);
        }
 
        void Implements(char* List)
@@ -93,15 +99,17 @@ class ModuleTestCommand : public Module
 
        virtual void OnUserJoin(userrec* user, chanrec* channel)
        {
+               /* This is an example, we do nothing here */
        }
        
        virtual ~ModuleTestCommand()
        {
+               delete newcommand;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 };
 
@@ -117,7 +125,7 @@ class ModuleTestCommandFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleTestCommand(Me);
        }