Extra stuff for forcing a v4 or v6 lookup

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4679 e03df62e-2008-0410-955e-edbf42e46eb7

2 files changed, 68 insertions, 15 deletions

diff --git a/src/dns.cpp b/src/dns.cpp
index fac10d98e..2c4cd807b 100644
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -423,6 +423,51 @@ int DNS::GetName(const insp_inaddr *ip)
 	return id;
 }
 
+/* Start lookup of an IP address to a hostname */
+int DNS::GetNameForce(const char *ip, ForceProtocol fp)
+{
+	char query[128];
+	DNSHeader h;
+	int id;
+	int length;
+
+	if (fp == PROTOCOL_IPV6)
+	{
+		in6_addr i;
+		if (inet_pton(AF_INET6, ip, &i) > 0)
+		{
+			DNS::MakeIP6Int(query, &i);
+		}
+		else
+			/* Invalid IP address */
+			return -1;
+	}
+	else
+	{
+		in_addr i;
+		if (inet_aton(ip, &i))
+		{
+			unsigned char* c = (unsigned char*)&i.s_addr;
+			sprintf(query,"%d.%d.%d.%d.in-addr.arpa",c[3],c[2],c[1],c[0]);
+		}
+		else
+			/* Invalid IP address */
+			return -1;
+	}
+
+	log(DEBUG,"DNS::GetNameForce: %s %d",query, fp);
+
+	if ((length = this->MakePayload(query, DNS_QUERY_PTR, 1, (unsigned char*)&h.payload)) == -1)
+		return -1;
+
+	DNSRequest* req = this->AddQuery(&h, id);
+
+	if ((!req) || (req->SendRequests(&h, length, DNS_QUERY_PTR) == -1))
+		return -1;
+
+	return id;
+}
+
 void DNS::MakeIP6Int(char* query, const in6_addr *ip)
 {
 	const char* hex = "0123456789abcdef";
@@ -568,6 +613,10 @@ DNSResult DNS::GetResult()
 				/* Reverse lookups just come back as char* */
 				resultstr = std::string((const char*)data.first);
 			break;
+
+			default:
+				log(DEBUG,"WARNING: Somehow we made a request for a DNS_QUERY_PTR4 or DNS_QUERY_PTR6, but these arent real rr types!");
+			break;
 			
 		}
 
@@ -748,6 +797,16 @@ Resolver::Resolver(const std::string &source, QueryType qt) : input(source), que
 			}
 		break;
 
+		case DNS_QUERY_PTR4:
+			querytype = DNS_QUERY_PTR;
+			this->myid = ServerInstance->Res->GetNameForce(source.c_str(), PROTOCOL_IPV4);
+		break;
+
+		case DNS_QUERY_PTR6:
+			querytype = DNS_QUERY_PTR;
+			this->myid = ServerInstance->Res->GetNameForce(source.c_str(), PROTOCOL_IPV6);
+		break;
+
 		case DNS_QUERY_AAAA:
 			this->myid = ServerInstance->Res->GetIP6(source.c_str());
 		break;
diff --git a/src/modules/m_testcommand.cpp b/src/modules/m_testcommand.cpp
index cca30de5d..6f517e8ce 100644
--- a/src/modules/m_testcommand.cpp
+++ b/src/modules/m_testcommand.cpp
@@ -27,24 +27,16 @@ using namespace std;
 
 class MyV6Resolver : public Resolver
 {
+	bool fw;
  public:
-	MyV6Resolver(const std::string &source) : Resolver(source, DNS_QUERY_AAAA) { }
+	MyV6Resolver(const std::string &source, bool forward) : Resolver(source, forward ? DNS_QUERY_AAAA : DNS_QUERY_PTR6)
+	{
+		fw = forward;
+	}
 
 	virtual void OnLookupComplete(const std::string &result)
 	{
-		log(DEBUG,"*** RESOLVER COMPLETED LOOKUP, IP IS: '%s'",result.c_str());
-
-		char query[128];
-		in6_addr n;
-		if (inet_pton(AF_INET6, result.c_str(), &n) > 0)
-		{
-			DNS::MakeIP6Int(query, &n);
-			log(DEBUG,"Translation: %s",query);
-		}
-		else
-		{
-			log(DEBUG,"Bad IPV6 IP: %s",result.c_str());
-		}
+		log(DEBUG,"*** RESOLVER COMPLETED %s LOOKUP, IP IS: '%s'",fw ? "FORWARD" : "REVERSE", result.c_str());
 	}
 
 	virtual void OnError(ResolverError e, const std::string &errormessage)
@@ -70,7 +62,9 @@ class cmd_woot : public command_t
 
 		try
 		{
-			MyV6Resolver* r = new MyV6Resolver("shake.stacken.kth.se");
+			MyV6Resolver* r = new MyV6Resolver("shake.stacken.kth.se", true);
+			Srv->AddResolver(r);
+			r = new MyV6Resolver("2001:6b0:1:ea:202:a5ff:fecd:13a6", false);
 			Srv->AddResolver(r);
 		}
 		catch (ModuleException& e)