From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 15 Jan 2016 21:47:04 +0000 (+0100)
Subject: dnsdist: Fix Lua Spoof PR not being compatible w/ the DNSQuestion one
X-Git-Tag: dnsdist-1.0.0-alpha2~73^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ca7a40a1f941fcb8559c9d0883bc5b6fc89c17c;p=pdns

dnsdist: Fix Lua Spoof PR not being compatible w/ the DNSQuestion one

PR #3241 did not take PR #3233 into account, my bad.
---

diff --git a/pdns/dnsdist-tcp.cc b/pdns/dnsdist-tcp.cc
index dd4629994..9e458926d 100644
--- a/pdns/dnsdist-tcp.cc
+++ b/pdns/dnsdist-tcp.cc
@@ -274,7 +274,7 @@ void* tcpClientThread(int pipefd)
 	  break;
 	  
 	case DNSAction::Action::Spoof:
-	  spoofResponseFromString(ci.remote, qname, qtype, dh, queryLen, querySize, ruleresult);
+	  spoofResponseFromString(dq, ruleresult);
 	  /* fall-through */;
 	case DNSAction::Action::HeaderModify:
 	  break;
diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 41d01d4a0..f380b3d50 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -482,17 +482,17 @@ int getEDNSZ(const char* packet, unsigned int len)
   return 0x100 * (*z) + *(z+1);
 }
 
-void spoofResponseFromString(const ComboAddress& remote, const DNSName& qname, uint16_t qtype, dnsheader* dh, uint16_t& len, uint16_t querySize, const string& spoofContent)
+void spoofResponseFromString(DNSQuestion& dq, const string& spoofContent)
 {
   string result;
   try {
     ComboAddress spoofAddr(spoofContent);
     SpoofAction sa(spoofAddr);
-    sa(remote, qname, qtype, dh, len, querySize, &result);
+    sa(&dq, &result);
   }
   catch(PDNSException &e) {
     SpoofAction sa(spoofContent);
-    sa(remote, qname, qtype, dh, len, querySize, &result);
+    sa(&dq, &result);
   }
 }
 
@@ -662,7 +662,7 @@ try
 	pool=ruleresult;
 	break;
       case DNSAction::Action::Spoof:
-	spoofResponseFromString(remote, qname, qtype, dh, len, querySize, ruleresult);
+	spoofResponseFromString(dq, ruleresult);
 	/* fall-through */;
       case DNSAction::Action::HeaderModify:
 	break;
diff --git a/pdns/dnsdist.hh b/pdns/dnsdist.hh
index 49fab7cd1..cfd8b854b 100644
--- a/pdns/dnsdist.hh
+++ b/pdns/dnsdist.hh
@@ -454,7 +454,7 @@ std::shared_ptr<DownstreamState> wrandom(const NumberedServerVector& servers, co
 std::shared_ptr<DownstreamState> whashed(const NumberedServerVector& servers, const DNSQuestion* dq);
 std::shared_ptr<DownstreamState> roundrobin(const NumberedServerVector& servers, const DNSQuestion* dq);
 int getEDNSZ(const char* packet, unsigned int len);
-void spoofResponseFromString(const ComboAddress& remote, const DNSName& qname, uint16_t qtype, dnsheader* dh, uint16_t& len, uint16_t querySize, const string& spoofContent);
+void spoofResponseFromString(DNSQuestion& dq, const string& spoofContent);
 uint16_t getEDNSOptionCode(const char * packet, size_t len);
 void dnsdistWebserverThread(int sock, const ComboAddress& local, const string& password);
 bool getMsgLen32(int fd, uint32_t* len);
diff --git a/regression-tests.dnsdist/test_Advanced.py b/regression-tests.dnsdist/test_Advanced.py
index 875a0a0fb..f35a2b071 100644
--- a/regression-tests.dnsdist/test_Advanced.py
+++ b/regression-tests.dnsdist/test_Advanced.py
@@ -549,18 +549,18 @@ class TestAdvancedDelay(DNSDistTest):
 class TestAdvancedLuaSpoof(DNSDistTest):
 
     _config_template = """
-    function spoof1rule(remote, qname, qtype, dh, len)
-        if(qtype==1) -- A
+    function spoof1rule(dq)
+        if(dq.qtype==1) -- A
         then
                 return DNSAction.Spoof, "192.0.2.1"
-        elseif(qtype == 28) -- AAAA
+        elseif(dq.qtype == 28) -- AAAA
         then
                 return DNSAction.Spoof, "2001:DB8::1"
         else
                 return DNSAction.None, ""
         end
     end
-    function spoof2rule(remote, qname, qtype, dh, len)
+    function spoof2rule(dq)
         return DNSAction.Spoof, "spoofedcname.tests.powerdns.com."
     end
     addLuaAction("luaspoof1.tests.powerdns.com.", spoof1rule)