X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_testcommand.cpp;h=b38171593d34ed4c7a94a972bbaa13aea3614afc;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=55632c98e435cf9431f4c827af29c7c9e863f2ad;hpb=dac672cf303ce44dc5f877a5f9f7e5aee64b95e1;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index 55632c98e..b38171593 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,139 +11,51 @@
  * ---------------------------------------------------
  */
 
-#include <stdio.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 */
+/* $ModDesc: Provides a pointless /dalinfo command, demo module */
 
-/** A test resolver class for IPV6
+/** Handle /DALINFO
  */
-class MyV6Resolver : public Resolver
+class CommandDalinfo : public Command
 {
-	bool fw;
  public:
-	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, unsigned int ttl)
-	{
-		ServerInstance->Log(DEBUG,"*** RESOLVER COMPLETED %s LOOKUP, IP IS: '%s' TTL=%lu",fw ? "FORWARD" : "REVERSE", result.c_str(), ttl);
-	}
-
-	virtual void OnError(ResolverError e, const std::string &errormessage)
-	{
-		ServerInstance->Log(DEBUG,"*** RESOLVER GOT ERROR: %d: %s",e,errormessage.c_str());
-	}
-};
-
-/** Handle /WOOT
- */
-class cmd_woot : public command_t
-{
-	Module* Creator;
- public:
-	/* Command 'woot', takes no parameters and needs no special modes */
-	cmd_woot (InspIRCd* Instance, Module* maker) : command_t(Instance,"WOOT", 0, 0), Creator(maker)
+	/* Command 'dalinfo', takes no parameters and needs no special modes */
+	CommandDalinfo (InspIRCd* Instance) : Command(Instance,"DALINFO", 0, 0)
 	{
 		this->source = "m_testcommand.so";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		/* We dont have to worry about deleting 'r', the core will
-		 * 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;
-			}
-		}
-		catch (ModuleException& e)
-		{
-			ServerInstance->Log(DEBUG,"Danger, will robinson! There was an exception: %s",e.GetReason());
-		}
-
+		user->WriteServ("NOTICE %s :*** DALNet had nothing to do with it.", user->nick);
 		return CMD_FAILURE;
 	}
 };
 
 class ModuleTestCommand : public Module
 {
-	cmd_woot* newcommand;
+	CommandDalinfo* newcommand;
  public:
 	ModuleTestCommand(InspIRCd* Me)
-		: Module::Module(Me)
+		: Module(Me)
 	{
-		
 		// Create a new command
-		newcommand = new cmd_woot(ServerInstance, this);
+		newcommand = new CommandDalinfo(ServerInstance);
 		ServerInstance->AddCommand(newcommand);
-	}
 
-	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;
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
-	}
-};
-
-
-class ModuleTestCommandFactory : public ModuleFactory
-{
- public:
-	ModuleTestCommandFactory()
-	{
-	}
-	
-	~ModuleTestCommandFactory()
-	{
+		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
 	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleTestCommand(Me);
-	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleTestCommandFactory;
-}
+MODULE_INIT(ModuleTestCommand)