To be more specific, specify rpath() macro here

[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..a3ae7aedf825363cdc153fcf8a87a52ed074777d 100644 (file)
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -31,9 +31,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 +60,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)
                {