From: Vladimír Čunát Date: Tue, 1 Aug 2017 16:35:30 +0000 (+0200) Subject: lua: remove :final from kr_query_t X-Git-Tag: v1.4.0~20^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cf91b8d6319be9321e0a588196df80ca026bf09;p=thirdparty%2Fknot-resolver.git lua: remove :final from kr_query_t --- diff --git a/daemon/lua/kres.lua.in b/daemon/lua/kres.lua.in index c42567e04..dee3efe7f 100644 --- a/daemon/lua/kres.lua.in +++ b/daemon/lua/kres.lua.in @@ -252,9 +252,6 @@ local kr_query_t = ffi.typeof('struct kr_query') ffi.metatype( kr_query_t, { __index = { name = function(qry) return ffi.string(qry.sname, knot.knot_dname_size(qry.sname)) end, - final = function(qry) - return qry.flags.RESOLVED and (qry.parent == nil) - end, nslist = function(qry, list) assert(#list <= 4, 'maximum of 4 addresses can be evaluated for each query') for i, ns in ipairs(list) do diff --git a/modules/dns64/dns64.lua b/modules/dns64/dns64.lua index 2e4266df3..d623328be 100644 --- a/modules/dns64/dns64.lua +++ b/modules/dns64/dns64.lua @@ -51,7 +51,8 @@ mod.layer = { end else -- Observe AAAA NODATA responses local is_nodata = (pkt:rcode() == kres.rcode.NOERROR) and (#answer == 0) - if pkt:qtype() == kres.type.AAAA and is_nodata and pkt:qname() == qry:name() and qry:final() then + if pkt:qtype() == kres.type.AAAA and is_nodata and pkt:qname() == qry:name() + and (qry.flags.RESOLVED and qry.parent == nil) then local extraFlags = kres.mk_qflags({}) extraFlags.DNSSEC_WANT = qry.flags.DNSSEC_WANT extraFlags.AWAIT_CUT = true