From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Fri, 6 Jan 2017 10:38:27 +0000 (+0100)
Subject: rec: Fix `dq` members alterations from Lua not being taken into account
X-Git-Tag: rec-4.1.0-alpha1~358^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c5675158d441ac95a823bce5b645a2fd5e8b14a;p=thirdparty%2Fpdns.git

rec: Fix `dq` members alterations from Lua not being taken into account

Apparently when using reference, LuaWrapper pass the object by copy
and not by reference, so for now we pass `dq` as a pointer, not a
reference.
---

diff --git a/pdns/lua-recursor4.cc b/pdns/lua-recursor4.cc
index ba7c1063d2..13b5a7f703 100644
--- a/pdns/lua-recursor4.cc
+++ b/pdns/lua-recursor4.cc
@@ -665,7 +665,7 @@ bool RecursorLua4::genhook(luacall_t& func, DNSQuestion& dq, int& ret)
   dq.udpCallback.clear();
 
   dq.rcode = ret;
-  bool handled=func(dq);
+  bool handled=func(&dq);
 
   if(handled) {
 loop:;
@@ -688,7 +688,7 @@ loop:;
           theL()<<Logger::Error<<"Attempted callback for Lua UDP Query/Response which could not be found"<<endl;
           return false;
         }
-        bool result=func(dq);
+        bool result=func(&dq);
         if(!result) {
           return false;
         }
diff --git a/pdns/lua-recursor4.hh b/pdns/lua-recursor4.hh
index fe9236027f..1502b6db43 100644
--- a/pdns/lua-recursor4.hh
+++ b/pdns/lua-recursor4.hh
@@ -120,7 +120,7 @@ public:
   gettag_t d_gettag; // public so you can query if we have this hooked
 
 private:
-  typedef std::function<bool(DNSQuestion&)> luacall_t;
+  typedef std::function<bool(DNSQuestion*)> luacall_t;
   luacall_t d_prerpz, d_preresolve, d_nxdomain, d_nodata, d_postresolve, d_preoutquery, d_postoutquery;
   bool genhook(luacall_t& func, DNSQuestion& dq, int& ret);
   typedef std::function<bool(ComboAddress,ComboAddress, struct dnsheader)> ipfilter_t;