Merge branch 'dnsjit-update' into 'master'

Correctly reset DNS objects in filter-dnsq

See merge request !94

NEWS

+Next
+====
+
+Incompatible changes
+--------------------
+- dnsjit 1.3.0+ is now required
+
+Bugfixes
+--------
+- pcap/filter-dnsq: fix potential data mixup between packets
+
 DNS Shotgun v20240219
 =====================
 

ci/dnsjit/Dockerfile

@@ -2,7 +2,7 @@ ARG DNSJIT_VERSION
 ARG CI_REGISTRY=registry.nic.cz
 FROM $CI_REGISTRY/knot/knot-resolver/ci/debian-12:knot-3.2
 
-ENV DNSJIT_VERSION=${DNSJIT_VERSION:-1.2.3}
+ENV DNSJIT_VERSION=${DNSJIT_VERSION:-1.3.0}
 
 RUN apt-get update && \
     apt-get install -y cmake libgnutls28-dev libpcap-dev libck-dev

docs/installation.md

@@ -55,7 +55,7 @@ When using the scripts directly, the following dependencies are needed.
 If you only wish to process shotgun JSON output (e.g. plot charts), then dnsjit
 and compiling the dnssim module isn't required.
 
-- [dnsjit 1.2+](https://github.com/DNS-OARC/dnsjit): Can be installed from [DNS-OARC
+- [dnsjit 1.3+](https://github.com/DNS-OARC/dnsjit): Can be installed from [DNS-OARC
   repositories](https://dev.dns-oarc.net/packages/).
 - libuv
 - libnghttp2

pcap/filter-dnsq.lua

@@ -211,6 +211,7 @@ local function is_dnsq(obj)
 		if matches_addresses(ip_obj.dst, len) == false then return false end
 	end
 
+	dns:reset()
 	dns.obj_prev = obj
 	dns:parse_header()
 	if dns.qr == 1 then return false end  -- ignore DNS responses