From 77278beaf3bf7d44fc6d874632dd072a39df5b42 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Tue, 17 Feb 2026 13:12:59 +1100
Subject: [PATCH 1/5] Add missed ret!=0 checks

---
 bin/tests/system/dnstap/tests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index d4bcdd30ea..c311e49ef0 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -672,6 +672,8 @@ EOF
     echo_i "ns4 $rr4 expected 0"
     ret=1
   }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
 
   echo_i "checking UPDATE_QUERY message counts"
   ret=0
@@ -794,6 +796,8 @@ EOF
     echo_i "ns4 $rr4 expected 0"
     ret=1
   }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
 
   echo_i "checking UPDATE_QUERY message counts"
   ret=0

From 38b626d58d9e7ee8075ec096861fe880e4dba73f Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 30 Jan 2026 13:45:39 +1100
Subject: [PATCH 2/5] Correctly identify forwarded queries with DNSTAP

Queries using forwarders where not being correctly identified
when using dnstap.
---
 lib/dns/resolver.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index f09b502ba6..38e4411820 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2862,7 +2862,7 @@ resquery_send(resquery_t *query) {
 	/*
 	 * Log the outgoing query via dnstap.
 	 */
-	if ((fctx->qmessage->flags & DNS_MESSAGEFLAG_RD) != 0) {
+	if (ISFORWARDER(query->addrinfo)) {
 		dtmsgtype = DNS_DTTYPE_FQ;
 	} else {
 		dtmsgtype = DNS_DTTYPE_RQ;
@@ -9421,7 +9421,13 @@ rctx_logpacket(respctx_t *rctx) {
 	}
 	dns_compress_invalidate(&cctx);
 
-	if ((fctx->qmessage->flags & DNS_MESSAGEFLAG_RD) != 0) {
+	/*
+	 * Check if the response came from a forwarder to correctly
+	 * classify as Forward Response (FR) vs Recursive Response (RR)
+	 * for DNSTAP logging. This is more accurate than using the RD
+	 * flag which only indicates the original query intent.
+	 */
+	if (ISFORWARDER(rctx->query->addrinfo)) {
 		dtmsgtype = DNS_DTTYPE_FR;
 	} else {
 		dtmsgtype = DNS_DTTYPE_RR;

From 591096f13155a6561118e0710e06ffbdb916285e Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 30 Jan 2026 13:50:11 +1100
Subject: [PATCH 3/5] Test forward query/response counts

---
 bin/tests/system/dnstap/ns5/named.conf.j2 |  44 ++++
 bin/tests/system/dnstap/tests.sh          | 257 +++++++++++++++++++++-
 2 files changed, 299 insertions(+), 2 deletions(-)
 create mode 100644 bin/tests/system/dnstap/ns5/named.conf.j2

diff --git a/bin/tests/system/dnstap/ns5/named.conf.j2 b/bin/tests/system/dnstap/ns5/named.conf.j2
new file mode 100644
index 0000000000..b353676792
--- /dev/null
+++ b/bin/tests/system/dnstap/ns5/named.conf.j2
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0.  If a copy of the MPL was not distributed with this
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+options {
+	query-source address 10.53.0.5;
+	notify-source 10.53.0.5;
+	transfer-source 10.53.0.5;
+	port @PORT@;
+	directory ".";
+	pid-file "named.pid";
+	listen-on { 10.53.0.5; };
+	listen-on-v6 { none; };
+	recursion yes;
+	notify yes;
+	dnstap-identity "ns5";
+	dnstap-version "xxx";
+	dnstap-output file "dnstap.out";
+	dnstap { all; };
+	send-cookie no;
+	require-server-cookie no;
+	dnssec-validation no;
+	qname-minimization disabled;
+	forwarders { 10.53.0.3; };
+	forward only;
+};
+
+key rndc_key {
+	secret "1234abcd8765";
+	algorithm @DEFAULT_HMAC@;
+};
+
+controls {
+	inet 10.53.0.5 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
+};
diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index c311e49ef0..b40069c46b 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -15,7 +15,7 @@ set -e
 
 . ../conf.sh
 
-DIGOPTS="+short -p ${PORT}"
+DIGOPTS="-p ${PORT}"
 RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../_common/rndc.conf"
 
 status=0
@@ -37,6 +37,13 @@ dnstap_data_ready() {
   fi
 }
 
+check_count() {
+  [ $2 -eq $3 ] || {
+    echo_i "$1 $2 expected $3"
+    ret=1
+  }
+}
+
 for bad in bad-*.conf; do
   ret=0
   echo_i "checking that named-checkconf detects error in $bad"
@@ -71,6 +78,7 @@ wait_for_log 20 "all zones loaded" ns1/named.run || ret=1
 wait_for_log 20 "all zones loaded" ns2/named.run || ret=1
 wait_for_log 20 "all zones loaded" ns3/named.run || ret=1
 wait_for_log 20 "all zones loaded" ns4/named.run || ret=1
+wait_for_log 20 "all zones loaded" ns5/named.run || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -89,6 +97,7 @@ status=$((status + ret))
 # ns1: dnstap-reopen; ns2: dnstap -reopen; ns3: dnstap -roll
 mv ns1/dnstap.out ns1/dnstap.out.save
 mv ns2/dnstap.out ns2/dnstap.out.save
+mv ns5/dnstap.out ns5/dnstap.out.save
 
 if [ -n "$FSTRM_CAPTURE" ]; then
   ret=0
@@ -107,10 +116,11 @@ $RNDCCMD -s 10.53.0.1 dnstap-reopen | sed 's/^/ns1 /' | cat_i
 $RNDCCMD -s 10.53.0.2 dnstap -reopen | sed 's/^/ns2 /' | cat_i
 $RNDCCMD -s 10.53.0.3 dnstap -roll | sed 's/^/ns3 /' | cat_i
 $RNDCCMD -s 10.53.0.4 dnstap -reopen | sed 's/^/ns4 /' | cat_i
+$RNDCCMD -s 10.53.0.5 dnstap -reopen | sed 's/^/ns5 /' | cat_i
 
 echo_i "send test traffic"
 ret=0
-$DIG $DIGOPTS @10.53.0.3 a.example >dig.out || ret=1
+$DIG $DIGOPTS @10.53.0.5 a.example >dig.out || ret=1
 
 # send an UPDATE to ns2
 $NSUPDATE <<-EOF
@@ -128,6 +138,7 @@ EOF
 $RNDCCMD -s 10.53.0.1 stop | sed 's/^/ns1 /' | cat_i
 $RNDCCMD -s 10.53.0.2 stop | sed 's/^/ns2 /' | cat_i
 $RNDCCMD -s 10.53.0.3 stop | sed 's/^/ns3 /' | cat_i
+$RNDCCMD -s 10.53.0.5 stop | sed 's/^/ns5 /' | cat_i
 
 sleep 1
 
@@ -139,6 +150,8 @@ aq1=$($DNSTAPREAD ns1/dnstap.out.save | grep "AQ " | wc -l)
 ar1=$($DNSTAPREAD ns1/dnstap.out.save | grep "AR " | wc -l)
 cq1=$($DNSTAPREAD ns1/dnstap.out.save | grep "CQ " | wc -l)
 cr1=$($DNSTAPREAD ns1/dnstap.out.save | grep "CR " | wc -l)
+fq1=$($DNSTAPREAD ns1/dnstap.out.save | grep "FQ " | wc -l)
+fr1=$($DNSTAPREAD ns1/dnstap.out.save | grep "FR " | wc -l)
 rq1=$($DNSTAPREAD ns1/dnstap.out.save | grep "RQ " | wc -l)
 rr1=$($DNSTAPREAD ns1/dnstap.out.save | grep "RR " | wc -l)
 uq1=$($DNSTAPREAD ns1/dnstap.out.save | grep "UQ " | wc -l)
@@ -150,6 +163,8 @@ aq2=$($DNSTAPREAD ns2/dnstap.out.save | grep "AQ " | wc -l)
 ar2=$($DNSTAPREAD ns2/dnstap.out.save | grep "AR " | wc -l)
 cq2=$($DNSTAPREAD ns2/dnstap.out.save | grep "CQ " | wc -l)
 cr2=$($DNSTAPREAD ns2/dnstap.out.save | grep "CR " | wc -l)
+fq2=$($DNSTAPREAD ns2/dnstap.out.save | grep "FQ " | wc -l)
+fr2=$($DNSTAPREAD ns2/dnstap.out.save | grep "FR " | wc -l)
 rq2=$($DNSTAPREAD ns2/dnstap.out.save | grep "RQ " | wc -l)
 rr2=$($DNSTAPREAD ns2/dnstap.out.save | grep "RR " | wc -l)
 uq2=$($DNSTAPREAD ns2/dnstap.out.save | grep "UQ " | wc -l)
@@ -162,11 +177,26 @@ aq3=$($DNSTAPREAD ns3/dnstap.out.save | grep "AQ " | wc -l)
 ar3=$($DNSTAPREAD ns3/dnstap.out.save | grep "AR " | wc -l)
 cq3=$($DNSTAPREAD ns3/dnstap.out.save | grep "CQ " | wc -l)
 cr3=$($DNSTAPREAD ns3/dnstap.out.save | grep "CR " | wc -l)
+fq3=$($DNSTAPREAD ns3/dnstap.out.save | grep "FQ " | wc -l)
+fr3=$($DNSTAPREAD ns3/dnstap.out.save | grep "FR " | wc -l)
 rq3=$($DNSTAPREAD ns3/dnstap.out.save | grep "RQ " | wc -l)
 rr3=$($DNSTAPREAD ns3/dnstap.out.save | grep "RR " | wc -l)
 uq3=$($DNSTAPREAD ns3/dnstap.out.save | grep "UQ " | wc -l)
 ur3=$($DNSTAPREAD ns3/dnstap.out.save | grep "UR " | wc -l)
 
+udp5=$($DNSTAPREAD ns5/dnstap.out.save | grep "UDP " | wc -l)
+tcp5=$($DNSTAPREAD ns5/dnstap.out.save | grep "TCP " | wc -l)
+aq5=$($DNSTAPREAD ns5/dnstap.out.save | grep "AQ " | wc -l)
+ar5=$($DNSTAPREAD ns5/dnstap.out.save | grep "AR " | wc -l)
+cq5=$($DNSTAPREAD ns5/dnstap.out.save | grep "CQ " | wc -l)
+cr5=$($DNSTAPREAD ns5/dnstap.out.save | grep "CR " | wc -l)
+fq5=$($DNSTAPREAD ns5/dnstap.out.save | grep "FQ " | wc -l)
+fr5=$($DNSTAPREAD ns5/dnstap.out.save | grep "FR " | wc -l)
+rq5=$($DNSTAPREAD ns5/dnstap.out.save | grep "RQ " | wc -l)
+rr5=$($DNSTAPREAD ns5/dnstap.out.save | grep "RR " | wc -l)
+uq5=$($DNSTAPREAD ns5/dnstap.out.save | grep "UQ " | wc -l)
+ur5=$($DNSTAPREAD ns5/dnstap.out.save | grep "UR " | wc -l)
+
 echo_i "checking UDP message counts"
 ret=0
 [ $udp1 -eq 0 ] || {
@@ -181,6 +211,10 @@ ret=0
   echo_i "ns3 $udp3 expected 4"
   ret=1
 }
+[ $udp5 -eq 0 ] || {
+  echo_i "ns5 $udp5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -198,6 +232,10 @@ ret=0
   echo_i "ns3 $tcp3 expected 6"
   ret=1
 }
+[ $tcp5 -eq 2 ] || {
+  echo_i "ns5 $tcp5 expected 2"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -215,6 +253,10 @@ ret=0
   echo_i "ns3 $aq3 expected 1"
   ret=1
 }
+[ $aq5 -eq 1 ] || {
+  echo_i "ns5 $aq5 expected 1"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -232,6 +274,10 @@ ret=0
   echo_i "ns3 $ar3 expected 0"
   ret=1
 }
+[ $ar5 -eq 0 ] || {
+  echo_i "ns5 $ar5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -249,6 +295,10 @@ ret=0
   echo_i "ns3 $cq3 expected 1"
   ret=1
 }
+[ $cq5 -eq 0 ] || {
+  echo_i "ns5 $cq5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -266,6 +316,10 @@ ret=0
   echo_i "ns3 $cr3 expected 2"
   ret=1
 }
+[ $cr5 -eq 1 ] || {
+  echo_i "ns5 $cr5 expected 1"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -283,6 +337,10 @@ ret=0
   echo_i "ns3 $rq3 expected 3"
   ret=1
 }
+[ $rq5 -eq 0 ] || {
+  echo_i "ns5 $rq5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -300,6 +358,52 @@ ret=0
   echo_i "ns3 $rr3 expected 3"
   ret=1
 }
+[ $rr5 -eq 0 ] || {
+  echo_i "ns5 $rr5 expected 0"
+  ret=1
+}
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status + ret))
+
+echo_i "checking FORWARD_QUERY message counts"
+ret=0
+[ $fq1 -eq 0 ] || {
+  echo_i "ns1 $fq1 expected 0"
+  ret=1
+}
+[ $fq2 -eq 0 ] || {
+  echo_i "ns2 $fq2 expected 0"
+  ret=1
+}
+[ $fq3 -eq 0 ] || {
+  echo_i "ns3 $fq3 expected 0"
+  ret=1
+}
+[ $fq5 -eq 0 ] || {
+  echo_i "ns5 $fq5 expected 0"
+  ret=1
+}
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status + ret))
+
+echo_i "checking FORWARD_RESPONSE message counts"
+ret=0
+[ $fr1 -eq 0 ] || {
+  echo_i "ns1 $fr1 expected 0"
+  ret=1
+}
+[ $fr2 -eq 0 ] || {
+  echo_i "ns2 $fr2 expected 0"
+  ret=1
+}
+[ $fr3 -eq 0 ] || {
+  echo_i "ns3 $fr3 expected 0"
+  ret=1
+}
+[ $fr5 -eq 0 ] || {
+  echo_i "ns5 $fr5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -317,6 +421,10 @@ ret=0
   echo_i "ns3 $uq3 expected 0"
   ret=1
 }
+[ $uq5 -eq 0 ] || {
+  echo_i "ns5 $uq5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -334,6 +442,10 @@ ret=0
   echo_i "ns3 $ur3 expected 0"
   ret=1
 }
+[ $ur5 -eq 0 ] || {
+  echo_i "ns5 $ur5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -345,6 +457,8 @@ aq1=$($DNSTAPREAD ns1/dnstap.out | grep "AQ " | wc -l)
 ar1=$($DNSTAPREAD ns1/dnstap.out | grep "AR " | wc -l)
 cq1=$($DNSTAPREAD ns1/dnstap.out | grep "CQ " | wc -l)
 cr1=$($DNSTAPREAD ns1/dnstap.out | grep "CR " | wc -l)
+fq1=$($DNSTAPREAD ns1/dnstap.out | grep "FQ " | wc -l)
+fr1=$($DNSTAPREAD ns1/dnstap.out | grep "FR " | wc -l)
 rq1=$($DNSTAPREAD ns1/dnstap.out | grep "RQ " | wc -l)
 rr1=$($DNSTAPREAD ns1/dnstap.out | grep "RR " | wc -l)
 uq1=$($DNSTAPREAD ns1/dnstap.out | grep "UQ " | wc -l)
@@ -356,6 +470,8 @@ aq2=$($DNSTAPREAD ns2/dnstap.out | grep "AQ " | wc -l)
 ar2=$($DNSTAPREAD ns2/dnstap.out | grep "AR " | wc -l)
 cq2=$($DNSTAPREAD ns2/dnstap.out | grep "CQ " | wc -l)
 cr2=$($DNSTAPREAD ns2/dnstap.out | grep "CR " | wc -l)
+fq2=$($DNSTAPREAD ns2/dnstap.out | grep "FQ " | wc -l)
+fr2=$($DNSTAPREAD ns2/dnstap.out | grep "FR " | wc -l)
 rq2=$($DNSTAPREAD ns2/dnstap.out | grep "RQ " | wc -l)
 rr2=$($DNSTAPREAD ns2/dnstap.out | grep "RR " | wc -l)
 uq2=$($DNSTAPREAD ns2/dnstap.out | grep "UQ " | wc -l)
@@ -367,11 +483,26 @@ aq3=$($DNSTAPREAD ns3/dnstap.out | grep "AQ " | wc -l)
 ar3=$($DNSTAPREAD ns3/dnstap.out | grep "AR " | wc -l)
 cq3=$($DNSTAPREAD ns3/dnstap.out | grep "CQ " | wc -l)
 cr3=$($DNSTAPREAD ns3/dnstap.out | grep "CR " | wc -l)
+fq3=$($DNSTAPREAD ns3/dnstap.out | grep "FQ " | wc -l)
+fr3=$($DNSTAPREAD ns3/dnstap.out | grep "FR " | wc -l)
 rq3=$($DNSTAPREAD ns3/dnstap.out | grep "RQ " | wc -l)
 rr3=$($DNSTAPREAD ns3/dnstap.out | grep "RR " | wc -l)
 uq3=$($DNSTAPREAD ns3/dnstap.out | grep "UQ " | wc -l)
 ur3=$($DNSTAPREAD ns3/dnstap.out | grep "UR " | wc -l)
 
+udp5=$($DNSTAPREAD ns5/dnstap.out | grep "UDP " | wc -l)
+tcp5=$($DNSTAPREAD ns5/dnstap.out | grep "TCP " | wc -l)
+aq5=$($DNSTAPREAD ns5/dnstap.out | grep "AQ " | wc -l)
+ar5=$($DNSTAPREAD ns5/dnstap.out | grep "AR " | wc -l)
+cq5=$($DNSTAPREAD ns5/dnstap.out | grep "CQ " | wc -l)
+cr5=$($DNSTAPREAD ns5/dnstap.out | grep "CR " | wc -l)
+fq5=$($DNSTAPREAD ns5/dnstap.out | grep "FQ " | wc -l)
+fr5=$($DNSTAPREAD ns5/dnstap.out | grep "FR " | wc -l)
+rq5=$($DNSTAPREAD ns5/dnstap.out | grep "RQ " | wc -l)
+rr5=$($DNSTAPREAD ns5/dnstap.out | grep "RR " | wc -l)
+uq5=$($DNSTAPREAD ns5/dnstap.out | grep "UQ " | wc -l)
+ur5=$($DNSTAPREAD ns5/dnstap.out | grep "UR " | wc -l)
+
 echo_i "checking UDP message counts"
 ret=0
 [ $udp1 -eq 0 ] || {
@@ -386,6 +517,10 @@ ret=0
   echo_i "ns3 $udp3 expected 2"
   ret=1
 }
+[ $udp5 -eq 4 ] || {
+  echo_i "ns5 $udp5 expected 4"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -403,6 +538,10 @@ ret=0
   echo_i "ns3 $tcp3 expected 0"
   ret=1
 }
+[ $tcp5 -eq 0 ] || {
+  echo_i "ns5 $tcp5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -420,6 +559,10 @@ ret=0
   echo_i "ns3 $aq3 expected 0"
   ret=1
 }
+[ $aq5 -eq 0 ] || {
+  echo_i "ns5 $aq5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -437,6 +580,10 @@ ret=0
   echo_i "ns3 $ar3 expected 0"
   ret=1
 }
+[ $ar5 -eq 0 ] || {
+  echo_i "ns5 $ar5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -454,6 +601,10 @@ ret=0
   echo_i "ns3 $cq3 expected 1"
   ret=1
 }
+[ $cq5 -eq 1 ] || {
+  echo_i "ns5 $cq5 expected 1"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -471,6 +622,10 @@ ret=0
   echo_i "ns3 $cr3 expected 1"
   ret=1
 }
+[ $cr5 -eq 1 ] || {
+  echo_i "ns5 $cr5 expected 1"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -488,6 +643,10 @@ ret=0
   echo_i "ns3 $rq3 expected 0"
   ret=1
 }
+[ $rq5 -eq 0 ] || {
+  echo_i "ns5 $rq5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -505,6 +664,52 @@ ret=0
   echo_i "ns3 $rr3 expected 0"
   ret=1
 }
+[ $rr5 -eq 0 ] || {
+  echo_i "ns5 $rr5 expected 0"
+  ret=1
+}
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status + ret))
+
+echo_i "checking FORWARD_QUERY message counts"
+ret=0
+[ $fq1 -eq 0 ] || {
+  echo_i "ns1 $fq1 expected 0"
+  ret=1
+}
+[ $fq2 -eq 0 ] || {
+  echo_i "ns2 $fq2 expected 0"
+  ret=1
+}
+[ $fq3 -eq 0 ] || {
+  echo_i "ns3 $fq3 expected 0"
+  ret=1
+}
+[ $fq5 -eq 1 ] || {
+  echo_i "ns5 $fq5 expected 1"
+  ret=1
+}
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=$((status + ret))
+
+echo_i "checking FORWARD_RESPONSE message counts"
+ret=0
+[ $fr1 -eq 0 ] || {
+  echo_i "ns1 $fr1 expected 0"
+  ret=1
+}
+[ $fr2 -eq 0 ] || {
+  echo_i "ns2 $fr2 expected 0"
+  ret=1
+}
+[ $fr3 -eq 0 ] || {
+  echo_i "ns3 $fr3 expected 0"
+  ret=1
+}
+[ $fr5 -eq 1 ] || {
+  echo_i "ns5 $fr5 expected 1"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -522,6 +727,10 @@ ret=0
   echo_i "ns3 $uq3 expected 0"
   ret=1
 }
+[ $uq5 -eq 0 ] || {
+  echo_i "ns5 $uq5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -539,6 +748,10 @@ ret=0
   echo_i "ns3 $ur3 expected 0"
   ret=1
 }
+[ $ur5 -eq 0 ] || {
+  echo_i "ns5 $ur5 expected 0"
+  ret=1
+}
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -598,6 +811,8 @@ EOF
   ar4=$($DNSTAPREAD dnstap.out | grep "AR " | wc -l)
   cq4=$($DNSTAPREAD dnstap.out | grep "CQ " | wc -l)
   cr4=$($DNSTAPREAD dnstap.out | grep "CR " | wc -l)
+  fq4=$($DNSTAPREAD dnstap.out | grep "FQ " | wc -l)
+  fr4=$($DNSTAPREAD dnstap.out | grep "FR " | wc -l)
   rq4=$($DNSTAPREAD dnstap.out | grep "RQ " | wc -l)
   rr4=$($DNSTAPREAD dnstap.out | grep "RR " | wc -l)
   uq4=$($DNSTAPREAD dnstap.out | grep "UQ " | wc -l)
@@ -675,6 +890,24 @@ EOF
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
+  echo_i "checking FORWARDER_QUERY message counts"
+  ret=0
+  [ $fq4 -eq 0 ] || {
+    echo_i "ns4 $fq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "checking FORWARDER_RESPONSE message counts"
+  ret=0
+  [ $fr4 -eq 0 ] || {
+    echo_i "ns4 $fr4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
   echo_i "checking UPDATE_QUERY message counts"
   ret=0
   [ $uq4 -eq 1 ] || {
@@ -722,6 +955,8 @@ EOF
   ar4=$($DNSTAPREAD dnstap.out | grep "AR " | wc -l)
   cq4=$($DNSTAPREAD dnstap.out | grep "CQ " | wc -l)
   cr4=$($DNSTAPREAD dnstap.out | grep "CR " | wc -l)
+  fq4=$($DNSTAPREAD dnstap.out | grep "FQ " | wc -l)
+  fr4=$($DNSTAPREAD dnstap.out | grep "FR " | wc -l)
   rq4=$($DNSTAPREAD dnstap.out | grep "RQ " | wc -l)
   rr4=$($DNSTAPREAD dnstap.out | grep "RR " | wc -l)
   uq4=$($DNSTAPREAD dnstap.out | grep "UQ " | wc -l)
@@ -799,6 +1034,24 @@ EOF
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
+  echo_i "checking FORWARDER_QUERY message counts"
+  ret=0
+  [ $fq4 -eq 0 ] || {
+    echo_i "ns4 $fq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
+  echo_i "checking FORWARDER_RESPONSE message counts"
+  ret=0
+  [ $fr4 -eq 0 ] || {
+    echo_i "ns4 $fr4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+
   echo_i "checking UPDATE_QUERY message counts"
   ret=0
   [ $uq4 -eq 0 ] || {

From 24f85bc3f39a42b57b5d69288c248f529abd3e09 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Thu, 5 Feb 2026 11:37:34 +1100
Subject: [PATCH 4/5] Document UPDATE QUERY and UPDATE RESPONSE

---
 lib/dns/include/dns/dnstap.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/dns/include/dns/dnstap.h b/lib/dns/include/dns/dnstap.h
index aa80cbba78..3f83e96d22 100644
--- a/lib/dns/include/dns/dnstap.h
+++ b/lib/dns/include/dns/dnstap.h
@@ -55,6 +55,8 @@ struct fstrm_iothr_options;
  * RESOLVER RESPONSE: RR
  * FORWARDER QUERY: FQ
  * FORWARDER RESPONSE: FR
+ * UPDATE QUERY: UQ
+ * UPDATE RESPONSE: UR
  */
 
 #define DNS_DTTYPE_SQ 0x0001

From ea32141e489513c276fb357a73af1af5988c8409 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Mon, 16 Feb 2026 11:18:01 +1100
Subject: [PATCH 5/5] Use shell function 'check_count' to check counts

---
 bin/tests/system/dnstap/tests.sh | 600 +++++++------------------------
 1 file changed, 120 insertions(+), 480 deletions(-)

diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index b40069c46b..0f5587f806 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -199,253 +199,109 @@ ur5=$($DNSTAPREAD ns5/dnstap.out.save | grep "UR " | wc -l)
 
 echo_i "checking UDP message counts"
 ret=0
-[ $udp1 -eq 0 ] || {
-  echo_i "ns1 $udp1 expected 0"
-  ret=1
-}
-[ $udp2 -eq 2 ] || {
-  echo_i "ns2 $udp2 expected 2"
-  ret=1
-}
-[ $udp3 -eq 4 ] || {
-  echo_i "ns3 $udp3 expected 4"
-  ret=1
-}
-[ $udp5 -eq 0 ] || {
-  echo_i "ns5 $udp5 expected 0"
-  ret=1
-}
+check_count ns1 $udp1 0
+check_count ns2 $udp2 2
+check_count ns3 $udp3 4
+check_count ns5 $udp5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking TCP message counts"
 ret=0
-[ $tcp1 -eq 6 ] || {
-  echo_i "ns1 $tcp1 expected 6"
-  ret=1
-}
-[ $tcp2 -eq 2 ] || {
-  echo_i "ns2 $tcp2 expected 2"
-  ret=1
-}
-[ $tcp3 -eq 6 ] || {
-  echo_i "ns3 $tcp3 expected 6"
-  ret=1
-}
-[ $tcp5 -eq 2 ] || {
-  echo_i "ns5 $tcp5 expected 2"
-  ret=1
-}
+check_count ns1 $tcp1 6
+check_count ns2 $tcp2 2
+check_count ns3 $tcp3 6
+check_count ns5 $tcp5 2
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking AUTH_QUERY message counts"
 ret=0
-[ $aq1 -eq 3 ] || {
-  echo_i "ns1 $aq1 exepcted 3"
-  ret=1
-}
-[ $aq2 -eq 2 ] || {
-  echo_i "ns2 $aq2 expected 2"
-  ret=1
-}
-[ $aq3 -eq 1 ] || {
-  echo_i "ns3 $aq3 expected 1"
-  ret=1
-}
-[ $aq5 -eq 1 ] || {
-  echo_i "ns5 $aq5 expected 1"
-  ret=1
-}
+check_count ns1 $aq1 3
+check_count ns2 $aq2 2
+check_count ns3 $aq3 1
+check_count ns5 $aq5 1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking AUTH_RESPONSE message counts"
 ret=0
-[ $ar1 -eq 2 ] || {
-  echo_i "ns1 $ar1 expected 2"
-  ret=1
-}
-[ $ar2 -eq 1 ] || {
-  echo_i "ns2 $ar2 expected 1"
-  ret=1
-}
-[ $ar3 -eq 0 ] || {
-  echo_i "ns3 $ar3 expected 0"
-  ret=1
-}
-[ $ar5 -eq 0 ] || {
-  echo_i "ns5 $ar5 expected 0"
-  ret=1
-}
+check_count ns1 $ar1 2
+check_count ns2 $ar2 1
+check_count ns3 $ar3 0
+check_count ns5 $ar5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking CLIENT_QUERY message counts"
 ret=0
-[ $cq1 -eq 0 ] || {
-  echo_i "ns1 $cq1 expected 0"
-  ret=1
-}
-[ $cq2 -eq 0 ] || {
-  echo_i "ns2 $cq2 expected 0"
-  ret=1
-}
-[ $cq3 -eq 1 ] || {
-  echo_i "ns3 $cq3 expected 1"
-  ret=1
-}
-[ $cq5 -eq 0 ] || {
-  echo_i "ns5 $cq5 expected 0"
-  ret=1
-}
+check_count ns1 $cq1 0
+check_count ns2 $cq2 0
+check_count ns3 $cq3 1
+check_count ns5 $cq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking CLIENT_RESPONSE message counts"
 ret=0
-[ $cr1 -eq 1 ] || {
-  echo_i "ns1 $cr1 expected 1"
-  ret=1
-}
-[ $cr2 -eq 1 ] || {
-  echo_i "ns2 $cr2 expected 1"
-  ret=1
-}
-[ $cr3 -eq 2 ] || {
-  echo_i "ns3 $cr3 expected 2"
-  ret=1
-}
-[ $cr5 -eq 1 ] || {
-  echo_i "ns5 $cr5 expected 1"
-  ret=1
-}
+check_count ns1 $cr1 1
+check_count ns2 $cr2 1
+check_count ns3 $cr3 2
+check_count ns5 $cr5 1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking RESOLVER_QUERY message counts"
 ret=0
-[ $rq1 -eq 0 ] || {
-  echo_i "ns1 $rq1 expected 0"
-  ret=1
-}
-[ $rq2 -eq 0 ] || {
-  echo_i "ns2 $rq2 expected 0"
-  ret=1
-}
-[ $rq3 -eq 3 ] || {
-  echo_i "ns3 $rq3 expected 3"
-  ret=1
-}
-[ $rq5 -eq 0 ] || {
-  echo_i "ns5 $rq5 expected 0"
-  ret=1
-}
+check_count ns1 $rq1 0
+check_count ns2 $rq2 0
+check_count ns3 $rq3 3
+check_count ns5 $rq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking RESOLVER_RESPONSE message counts"
 ret=0
-[ $rr1 -eq 0 ] || {
-  echo_i "ns1 $rr1 expected 0"
-  ret=1
-}
-[ $rr2 -eq 0 ] || {
-  echo_i "ns2 $rr2 expected 0"
-  ret=1
-}
-[ $rr3 -eq 3 ] || {
-  echo_i "ns3 $rr3 expected 3"
-  ret=1
-}
-[ $rr5 -eq 0 ] || {
-  echo_i "ns5 $rr5 expected 0"
-  ret=1
-}
+check_count ns1 $rr1 0
+check_count ns2 $rr2 0
+check_count ns3 $rr3 3
+check_count ns5 $rr5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking FORWARD_QUERY message counts"
 ret=0
-[ $fq1 -eq 0 ] || {
-  echo_i "ns1 $fq1 expected 0"
-  ret=1
-}
-[ $fq2 -eq 0 ] || {
-  echo_i "ns2 $fq2 expected 0"
-  ret=1
-}
-[ $fq3 -eq 0 ] || {
-  echo_i "ns3 $fq3 expected 0"
-  ret=1
-}
-[ $fq5 -eq 0 ] || {
-  echo_i "ns5 $fq5 expected 0"
-  ret=1
-}
+check_count ns1 $fq1 0
+check_count ns2 $fq2 0
+check_count ns3 $fq3 0
+check_count ns5 $fq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking FORWARD_RESPONSE message counts"
 ret=0
-[ $fr1 -eq 0 ] || {
-  echo_i "ns1 $fr1 expected 0"
-  ret=1
-}
-[ $fr2 -eq 0 ] || {
-  echo_i "ns2 $fr2 expected 0"
-  ret=1
-}
-[ $fr3 -eq 0 ] || {
-  echo_i "ns3 $fr3 expected 0"
-  ret=1
-}
-[ $fr5 -eq 0 ] || {
-  echo_i "ns5 $fr5 expected 0"
-  ret=1
-}
+check_count ns1 $fr1 0
+check_count ns2 $fr2 0
+check_count ns3 $fr3 0
+check_count ns5 $fr5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking UPDATE_QUERY message counts"
 ret=0
-[ $uq1 -eq 0 ] || {
-  echo_i "ns1 $uq1 expected 0"
-  ret=1
-}
-[ $uq2 -eq 0 ] || {
-  echo_i "ns2 $uq2 expected 0"
-  ret=1
-}
-[ $uq3 -eq 0 ] || {
-  echo_i "ns3 $uq3 expected 0"
-  ret=1
-}
-[ $uq5 -eq 0 ] || {
-  echo_i "ns5 $uq5 expected 0"
-  ret=1
-}
+check_count ns1 $uq1 0
+check_count ns2 $uq2 0
+check_count ns3 $uq3 0
+check_count ns5 $uq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking UPDATE_RESPONSE message counts"
 ret=0
-[ $ur1 -eq 0 ] || {
-  echo_i "ns1 $ur1 expected 0"
-  ret=1
-}
-[ $ur2 -eq 0 ] || {
-  echo_i "ns2 $ur2 expected 0"
-  ret=1
-}
-[ $ur3 -eq 0 ] || {
-  echo_i "ns3 $ur3 expected 0"
-  ret=1
-}
-[ $ur5 -eq 0 ] || {
-  echo_i "ns5 $ur5 expected 0"
-  ret=1
-}
+check_count ns1 $ur1 0
+check_count ns2 $ur2 0
+check_count ns3 $ur3 0
+check_count ns5 $ur5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -505,253 +361,109 @@ ur5=$($DNSTAPREAD ns5/dnstap.out | grep "UR " | wc -l)
 
 echo_i "checking UDP message counts"
 ret=0
-[ $udp1 -eq 0 ] || {
-  echo_i "ns1 $udp1 expected 0"
-  ret=1
-}
-[ $udp2 -eq 2 ] || {
-  echo_i "ns2 $udp2 expected 2"
-  ret=1
-}
-[ $udp3 -eq 2 ] || {
-  echo_i "ns3 $udp3 expected 2"
-  ret=1
-}
-[ $udp5 -eq 4 ] || {
-  echo_i "ns5 $udp5 expected 4"
-  ret=1
-}
+check_count ns1 $udp1 0
+check_count ns2 $udp2 2
+check_count ns3 $udp3 2
+check_count ns5 $udp5 4
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking TCP message counts"
 ret=0
-[ $tcp1 -eq 0 ] || {
-  echo_i "ns1 $tcp1 expected 0"
-  ret=1
-}
-[ $tcp2 -eq 0 ] || {
-  echo_i "ns2 $tcp2 expected 0"
-  ret=1
-}
-[ $tcp3 -eq 0 ] || {
-  echo_i "ns3 $tcp3 expected 0"
-  ret=1
-}
-[ $tcp5 -eq 0 ] || {
-  echo_i "ns5 $tcp5 expected 0"
-  ret=1
-}
+check_count ns1 $tcp1 0
+check_count ns2 $tcp2 0
+check_count ns3 $tcp3 0
+check_count ns5 $tcp5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking AUTH_QUERY message counts"
 ret=0
-[ $aq1 -eq 0 ] || {
-  echo_i "ns1 $aq1 exepcted 0"
-  ret=1
-}
-[ $aq2 -eq 0 ] || {
-  echo_i "ns2 $aq2 expected 0"
-  ret=1
-}
-[ $aq3 -eq 0 ] || {
-  echo_i "ns3 $aq3 expected 0"
-  ret=1
-}
-[ $aq5 -eq 0 ] || {
-  echo_i "ns5 $aq5 expected 0"
-  ret=1
-}
+check_count ns1 $aq1 0
+check_count ns2 $aq2 0
+check_count ns3 $aq3 0
+check_count ns5 $aq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking AUTH_RESPONSE message counts"
 ret=0
-[ $ar1 -eq 0 ] || {
-  echo_i "ns1 $ar1 expected 0"
-  ret=1
-}
-[ $ar2 -eq 0 ] || {
-  echo_i "ns2 $ar2 expected 0"
-  ret=1
-}
-[ $ar3 -eq 0 ] || {
-  echo_i "ns3 $ar3 expected 0"
-  ret=1
-}
-[ $ar5 -eq 0 ] || {
-  echo_i "ns5 $ar5 expected 0"
-  ret=1
-}
+check_count ns1 $ar1 0
+check_count ns2 $ar2 0
+check_count ns3 $ar3 0
+check_count ns5 $ar5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking CLIENT_QUERY message counts"
 ret=0
-[ $cq1 -eq 0 ] || {
-  echo_i "ns1 $cq1 expected 0"
-  ret=1
-}
-[ $cq2 -eq 0 ] || {
-  echo_i "ns2 $cq2 expected 0"
-  ret=1
-}
-[ $cq3 -eq 1 ] || {
-  echo_i "ns3 $cq3 expected 1"
-  ret=1
-}
-[ $cq5 -eq 1 ] || {
-  echo_i "ns5 $cq5 expected 1"
-  ret=1
-}
+check_count ns1 $cq1 0
+check_count ns2 $cq2 0
+check_count ns3 $cq3 1
+check_count ns5 $cq5 1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking CLIENT_RESPONSE message counts"
 ret=0
-[ $cr1 -eq 0 ] || {
-  echo_i "ns1 $cr1 expected 0"
-  ret=1
-}
-[ $cr2 -eq 0 ] || {
-  echo_i "ns2 $cr2 expected 0"
-  ret=1
-}
-[ $cr3 -eq 1 ] || {
-  echo_i "ns3 $cr3 expected 1"
-  ret=1
-}
-[ $cr5 -eq 1 ] || {
-  echo_i "ns5 $cr5 expected 1"
-  ret=1
-}
+check_count ns1 $cr1 0
+check_count ns2 $cr2 0
+check_count ns3 $cr3 1
+check_count ns5 $cr5 1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking RESOLVER_QUERY message counts"
 ret=0
-[ $rq1 -eq 0 ] || {
-  echo_i "ns1 $rq1 expected 0"
-  ret=1
-}
-[ $rq2 -eq 0 ] || {
-  echo_i "ns2 $rq2 expected 0"
-  ret=1
-}
-[ $rq3 -eq 0 ] || {
-  echo_i "ns3 $rq3 expected 0"
-  ret=1
-}
-[ $rq5 -eq 0 ] || {
-  echo_i "ns5 $rq5 expected 0"
-  ret=1
-}
+check_count ns1 $rq1 0
+check_count ns2 $rq2 0
+check_count ns3 $rq3 0
+check_count ns5 $rq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking RESOLVER_RESPONSE message counts"
 ret=0
-[ $rr1 -eq 0 ] || {
-  echo_i "ns1 $rr1 expected 0"
-  ret=1
-}
-[ $rr2 -eq 0 ] || {
-  echo_i "ns2 $rr2 expected 0"
-  ret=1
-}
-[ $rr3 -eq 0 ] || {
-  echo_i "ns3 $rr3 expected 0"
-  ret=1
-}
-[ $rr5 -eq 0 ] || {
-  echo_i "ns5 $rr5 expected 0"
-  ret=1
-}
+check_count ns1 $rr1 0
+check_count ns2 $rr2 0
+check_count ns3 $rr3 0
+check_count ns5 $rr5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking FORWARD_QUERY message counts"
 ret=0
-[ $fq1 -eq 0 ] || {
-  echo_i "ns1 $fq1 expected 0"
-  ret=1
-}
-[ $fq2 -eq 0 ] || {
-  echo_i "ns2 $fq2 expected 0"
-  ret=1
-}
-[ $fq3 -eq 0 ] || {
-  echo_i "ns3 $fq3 expected 0"
-  ret=1
-}
-[ $fq5 -eq 1 ] || {
-  echo_i "ns5 $fq5 expected 1"
-  ret=1
-}
+check_count ns1 $fq1 0
+check_count ns2 $fq2 0
+check_count ns3 $fq3 0
+check_count ns5 $fq5 1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking FORWARD_RESPONSE message counts"
 ret=0
-[ $fr1 -eq 0 ] || {
-  echo_i "ns1 $fr1 expected 0"
-  ret=1
-}
-[ $fr2 -eq 0 ] || {
-  echo_i "ns2 $fr2 expected 0"
-  ret=1
-}
-[ $fr3 -eq 0 ] || {
-  echo_i "ns3 $fr3 expected 0"
-  ret=1
-}
-[ $fr5 -eq 1 ] || {
-  echo_i "ns5 $fr5 expected 1"
-  ret=1
-}
+check_count ns1 $fr1 0
+check_count ns2 $fr2 0
+check_count ns3 $fr3 0
+check_count ns5 $fr5 1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking UPDATE_QUERY message counts"
 ret=0
-[ $uq1 -eq 0 ] || {
-  echo_i "ns1 $uq1 expected 0"
-  ret=1
-}
-[ $uq2 -eq 1 ] || {
-  echo_i "ns2 $uq2 expected 1"
-  ret=1
-}
-[ $uq3 -eq 0 ] || {
-  echo_i "ns3 $uq3 expected 0"
-  ret=1
-}
-[ $uq5 -eq 0 ] || {
-  echo_i "ns5 $uq5 expected 0"
-  ret=1
-}
+check_count ns1 $uq1 0
+check_count ns2 $uq2 1
+check_count ns3 $uq3 0
+check_count ns5 $uq5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 echo_i "checking UPDATE_RESPONSE message counts"
 ret=0
-[ $ur1 -eq 0 ] || {
-  echo_i "ns1 $ur1 expected 0"
-  ret=1
-}
-[ $ur2 -eq 1 ] || {
-  echo_i "ns2 $ur2 expected 1"
-  ret=1
-}
-[ $ur3 -eq 0 ] || {
-  echo_i "ns3 $ur3 expected 0"
-  ret=1
-}
-[ $ur5 -eq 0 ] || {
-  echo_i "ns5 $ur5 expected 0"
-  ret=1
-}
+check_count ns1 $ur1 0
+check_count ns2 $ur2 1
+check_count ns3 $ur3 0
+check_count ns5 $ur5 0
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -820,109 +532,73 @@ EOF
 
   echo_i "checking UDP message counts"
   ret=0
-  [ $udp4 -eq 4 ] || {
-    echo_i "ns4 $udp4 expected 4"
-    ret=1
-  }
+  check_count ns4 $udp4 4
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking TCP message counts"
   ret=0
-  [ $tcp4 -eq 0 ] || {
-    echo_i "ns4 $tcp4 expected 0"
-    ret=1
-  }
+  check_count ns4 $tcp4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking AUTH_QUERY message counts"
   ret=0
-  [ $aq4 -eq 0 ] || {
-    echo_i "ns4 $aq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $aq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking AUTH_RESPONSE message counts"
   ret=0
-  [ $ar4 -eq 0 ] || {
-    echo_i "ns4 $ar4 expected 0"
-    ret=1
-  }
+  check_count ns4 $ar4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking CLIENT_QUERY message counts"
   ret=0
-  [ $cq4 -eq 1 ] || {
-    echo_i "ns4 $cq4 expected 1"
-    ret=1
-  }
+  check_count ns4 $cq4 1
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking CLIENT_RESPONSE message counts"
   ret=0
-  [ $cr4 -eq 1 ] || {
-    echo_i "ns4 $cr4 expected 1"
-    ret=1
-  }
+  check_count ns4 $cr4 1
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking RESOLVER_QUERY message counts"
   ret=0
-  [ $rq4 -eq 0 ] || {
-    echo_i "ns4 $rq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $rq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking RESOLVER_RESPONSE message counts"
   ret=0
-  [ $rr4 -eq 0 ] || {
-    echo_i "ns4 $rr4 expected 0"
-    ret=1
-  }
+  check_count ns4 $rr4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking FORWARDER_QUERY message counts"
   ret=0
-  [ $fq4 -eq 0 ] || {
-    echo_i "ns4 $fq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $fq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking FORWARDER_RESPONSE message counts"
   ret=0
-  [ $fr4 -eq 0 ] || {
-    echo_i "ns4 $fr4 expected 0"
-    ret=1
-  }
+  check_count ns4 $fr4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking UPDATE_QUERY message counts"
   ret=0
-  [ $uq4 -eq 1 ] || {
-    echo_i "ns4 $uq4 expected 1"
-    ret=1
-  }
+  check_count ns4 $uq4 1
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking UPDATE_RESPONSE message counts"
   ret=0
-  [ $ur4 -eq 1 ] || {
-    echo_i "ns4 $ur4 expected 1"
-    ret=1
-  }
+  check_count ns4 $ur4 1
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
@@ -964,109 +640,73 @@ EOF
 
   echo_i "checking UDP message counts"
   ret=0
-  [ $udp4 -eq 2 ] || {
-    echo_i "ns4 $udp4 expected 2"
-    ret=1
-  }
+  check_count ns4 $udp4 2
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking TCP message counts"
   ret=0
-  [ $tcp4 -eq 0 ] || {
-    echo_i "ns4 $tcp4 expected 0"
-    ret=1
-  }
+  check_count ns4 $tcp4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking AUTH_QUERY message counts"
   ret=0
-  [ $aq4 -eq 0 ] || {
-    echo_i "ns4 $aq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $aq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking AUTH_RESPONSE message counts"
   ret=0
-  [ $ar4 -eq 0 ] || {
-    echo_i "ns4 $ar4 expected 0"
-    ret=1
-  }
+  check_count ns4 $ar4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking CLIENT_QUERY message counts"
   ret=0
-  [ $cq4 -eq 1 ] || {
-    echo_i "ns4 $cq4 expected 1"
-    ret=1
-  }
+  check_count ns4 $cq4 1
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking CLIENT_RESPONSE message counts"
   ret=0
-  [ $cr4 -eq 1 ] || {
-    echo_i "ns4 $cr4 expected 1"
-    ret=1
-  }
+  check_count ns4 $cr4 1
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking RESOLVER_QUERY message counts"
   ret=0
-  [ $rq4 -eq 0 ] || {
-    echo_i "ns4 $rq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $rq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking RESOLVER_RESPONSE message counts"
   ret=0
-  [ $rr4 -eq 0 ] || {
-    echo_i "ns4 $rr4 expected 0"
-    ret=1
-  }
+  check_count ns4 $rr4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking FORWARDER_QUERY message counts"
   ret=0
-  [ $fq4 -eq 0 ] || {
-    echo_i "ns4 $fq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $fq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking FORWARDER_RESPONSE message counts"
   ret=0
-  [ $fr4 -eq 0 ] || {
-    echo_i "ns4 $fr4 expected 0"
-    ret=1
-  }
+  check_count ns4 $fr4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking UPDATE_QUERY message counts"
   ret=0
-  [ $uq4 -eq 0 ] || {
-    echo_i "ns4 $uq4 expected 0"
-    ret=1
-  }
+  check_count ns4 $uq4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 
   echo_i "checking UPDATE_RESPONSE message counts"
   ret=0
-  [ $ur4 -eq 0 ] || {
-    echo_i "ns4 $ur4 expected 0"
-    ret=1
-  }
+  check_count ns4 $ur4 0
   if [ $ret != 0 ]; then echo_i "failed"; fi
   status=$((status + ret))
 fi