Merging upstream version 1:9.16.48.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 512 insertions, 509 deletions

diff --git a/bin/tests/system/dnstap/prereq.sh b/bin/tests/system/dnstap/prereq.sh
index f0748f3..747f448 100644
--- a/bin/tests/system/dnstap/prereq.sh
+++ b/bin/tests/system/dnstap/prereq.sh
@@ -14,7 +14,7 @@
 . ../conf.sh
 
 $FEATURETEST --enable-dnstap || {
-	echo_i "This test requires dnstap support." >&2
-	exit 255
+  echo_i "This test requires dnstap support." >&2
+  exit 255
 }
 exit 0
diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh
index 5ed8e73..ab44922 100644
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@@ -22,37 +22,40 @@ status=0
 # dnstap_data_ready <fstrm_capture_PID> <capture_file> <min_file_size>
 # Flushes capture_file and checks wheter its size is >= min_file_size.
 dnstap_data_ready() {
-	# Process id of running fstrm_capture.
-	fstrm_capture_pid=$1
-	# Output file provided to fstrm_capture via -w switch.
-	capture_file=$2
-	# Minimum expected file size.
-	min_size_expected=$3
-
-	kill -HUP $fstrm_capture_pid
-	file_size=`wc -c < "$capture_file" | tr -d ' '`
-	if [ $file_size -lt $min_size_expected ]; then
-		return 1
-	fi
-}
-
-
-for bad in bad-*.conf
-do
-	ret=0
-	echo_i "checking that named-checkconf detects error in $bad"
-	$CHECKCONF $bad > /dev/null 2>&1
-	if [ $? != 1 ]; then echo_i "failed"; ret=1; fi
-	status=`expr $status + $ret`
+  # Process id of running fstrm_capture.
+  fstrm_capture_pid=$1
+  # Output file provided to fstrm_capture via -w switch.
+  capture_file=$2
+  # Minimum expected file size.
+  min_size_expected=$3
+
+  kill -HUP $fstrm_capture_pid
+  file_size=$(wc -c <"$capture_file" | tr -d ' ')
+  if [ $file_size -lt $min_size_expected ]; then
+    return 1
+  fi
+}
+
+for bad in bad-*.conf; do
+  ret=0
+  echo_i "checking that named-checkconf detects error in $bad"
+  $CHECKCONF $bad >/dev/null 2>&1
+  if [ $? != 1 ]; then
+    echo_i "failed"
+    ret=1
+  fi
+  status=$(expr $status + $ret)
 done
 
-for good in good-*.conf
-do
-	ret=0
-	echo_i "checking that named-checkconf detects no error in $good"
-	$CHECKCONF $good > /dev/null 2>&1
-	if [ $? != 0 ]; then echo_i "failed"; ret=1; fi
-	status=`expr $status + $ret`
+for good in good-*.conf; do
+  ret=0
+  echo_i "checking that named-checkconf detects no error in $good"
+  $CHECKCONF $good >/dev/null 2>&1
+  if [ $? != 0 ]; then
+    echo_i "failed"
+    ret=1
+  fi
+  status=$(expr $status + $ret)
 done
 
 echo_i "wait for servers to finish loading"
@@ -62,13 +65,13 @@ 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
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 # both the 'a.example/A' lookup and the './NS' lookup to ns1
 # need tocomplete before reopening/rolling for the counts to
 # be correct.
 
-$DIG $DIGOPTS @10.53.0.3 a.example > dig.out
+$DIG $DIGOPTS @10.53.0.3 a.example >dig.out
 wait_for_log 20 "(./NS): query_reset" ns1/named.run || true
 
 # check three different dnstap reopen/roll methods:
@@ -76,15 +79,15 @@ wait_for_log 20 "(./NS): query_reset" ns1/named.run || true
 mv ns1/dnstap.out ns1/dnstap.out.save
 mv ns2/dnstap.out ns2/dnstap.out.save
 
-if [ -n "$FSTRM_CAPTURE" ] ; then
-	ret=0
-	echo_i "starting fstrm_capture"
-	$FSTRM_CAPTURE -t protobuf:dnstap.Dnstap -u ns4/dnstap.out \
-		-w dnstap.out > fstrm_capture.out.1 2>&1 &
-	fstrm_capture_pid=$!
-	wait_for_log 10 "socket path ns4/dnstap.out" fstrm_capture.out.1 || ret=1
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
+if [ -n "$FSTRM_CAPTURE" ]; then
+  ret=0
+  echo_i "starting fstrm_capture"
+  $FSTRM_CAPTURE -t protobuf:dnstap.Dnstap -u ns4/dnstap.out \
+    -w dnstap.out >fstrm_capture.out.1 2>&1 &
+  fstrm_capture_pid=$!
+  wait_for_log 10 "socket path ns4/dnstap.out" fstrm_capture.out.1 || ret=1
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
 fi
 
 $RNDCCMD -s 10.53.0.1 dnstap-reopen | sed 's/^/ns1 /' | cat_i
@@ -92,10 +95,10 @@ $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
 
-$DIG $DIGOPTS @10.53.0.3 a.example > dig.out
+$DIG $DIGOPTS @10.53.0.3 a.example >dig.out
 
 # send an UPDATE to ns2
-$NSUPDATE <<- EOF
+$NSUPDATE <<-EOF
 server 10.53.0.2 ${PORT}
 zone example
 update add b.example 3600 in a 10.10.10.10
@@ -115,705 +118,705 @@ sleep 1
 
 echo_i "checking initial message counts"
 
-udp1=`$DNSTAPREAD ns1/dnstap.out.save | grep "UDP " | wc -l`
-tcp1=`$DNSTAPREAD ns1/dnstap.out.save | grep "TCP " | wc -l`
-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`
-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`
-ur1=`$DNSTAPREAD ns1/dnstap.out.save | grep "UR " | wc -l`
-
-udp2=`$DNSTAPREAD ns2/dnstap.out.save | grep "UDP " | wc -l`
-tcp2=`$DNSTAPREAD ns2/dnstap.out.save | grep "TCP " | wc -l`
-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`
-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`
-ur2=`$DNSTAPREAD ns2/dnstap.out.save | grep "UR " | wc -l`
+udp1=$($DNSTAPREAD ns1/dnstap.out.save | grep "UDP " | wc -l)
+tcp1=$($DNSTAPREAD ns1/dnstap.out.save | grep "TCP " | wc -l)
+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)
+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)
+ur1=$($DNSTAPREAD ns1/dnstap.out.save | grep "UR " | wc -l)
+
+udp2=$($DNSTAPREAD ns2/dnstap.out.save | grep "UDP " | wc -l)
+tcp2=$($DNSTAPREAD ns2/dnstap.out.save | grep "TCP " | wc -l)
+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)
+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)
+ur2=$($DNSTAPREAD ns2/dnstap.out.save | grep "UR " | wc -l)
 
 mv ns3/dnstap.out.0 ns3/dnstap.out.save
-udp3=`$DNSTAPREAD ns3/dnstap.out.save | grep "UDP " | wc -l`
-tcp3=`$DNSTAPREAD ns3/dnstap.out.save | grep "TCP " | wc -l`
-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`
-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`
+udp3=$($DNSTAPREAD ns3/dnstap.out.save | grep "UDP " | wc -l)
+tcp3=$($DNSTAPREAD ns3/dnstap.out.save | grep "TCP " | wc -l)
+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)
+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)
 
 echo_i "checking UDP message counts"
 ret=0
 [ $udp1 -eq 0 ] || {
-	echo_i "ns1 $udp1 expected 0"
-	ret=1
+  echo_i "ns1 $udp1 expected 0"
+  ret=1
 }
 [ $udp2 -eq 2 ] || {
-	echo_i "ns2 $udp2 expected 2"
-	ret=1
+  echo_i "ns2 $udp2 expected 2"
+  ret=1
 }
 [ $udp3 -eq 4 ] || {
-	echo_i "ns3 $udp3 expected 4"
-	ret=1
+  echo_i "ns3 $udp3 expected 4"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking TCP message counts"
 ret=0
 [ $tcp1 -eq 6 ] || {
-	echo_i "ns1 $tcp1 expected 6"
-	ret=1
+  echo_i "ns1 $tcp1 expected 6"
+  ret=1
 }
 [ $tcp2 -eq 2 ] || {
-	echo_i "ns2 $tcp2 expected 2"
-	ret=1
+  echo_i "ns2 $tcp2 expected 2"
+  ret=1
 }
 [ $tcp3 -eq 6 ] || {
-	echo_i "ns3 $tcp3 expected 6"
-	ret=1
+  echo_i "ns3 $tcp3 expected 6"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking AUTH_QUERY message counts"
 ret=0
 [ $aq1 -eq 3 ] || {
-	echo_i "ns1 $aq1 exepcted 3"
-	ret=1
+  echo_i "ns1 $aq1 exepcted 3"
+  ret=1
 }
 [ $aq2 -eq 2 ] || {
-	echo_i "ns2 $aq2 expected 2"
-	ret=1
+  echo_i "ns2 $aq2 expected 2"
+  ret=1
 }
 [ $aq3 -eq 1 ] || {
-	echo_i "ns3 $aq3 expected 1"
-	ret=1
+  echo_i "ns3 $aq3 expected 1"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking AUTH_RESPONSE message counts"
 ret=0
 [ $ar1 -eq 2 ] || {
-	echo_i "ns1 $ar1 expected 2"
-	ret=1
+  echo_i "ns1 $ar1 expected 2"
+  ret=1
 }
 [ $ar2 -eq 1 ] || {
-	echo_i "ns2 $ar2 expected 1"
-	ret=1
+  echo_i "ns2 $ar2 expected 1"
+  ret=1
 }
 [ $ar3 -eq 0 ] || {
-	echo_i "ns3 $ar3 expected 0"
-	ret=1
+  echo_i "ns3 $ar3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking CLIENT_QUERY message counts"
 ret=0
 [ $cq1 -eq 0 ] || {
-	echo_i "ns1 $cq1 expected 0"
-	ret=1
+  echo_i "ns1 $cq1 expected 0"
+  ret=1
 }
 [ $cq2 -eq 0 ] || {
-	echo_i "ns2 $cq2 expected 0"
-	ret=1
+  echo_i "ns2 $cq2 expected 0"
+  ret=1
 }
 [ $cq3 -eq 1 ] || {
-	echo_i "ns3 $cq3 expected 1"
-	ret=1
+  echo_i "ns3 $cq3 expected 1"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking CLIENT_RESPONSE message counts"
 ret=0
 [ $cr1 -eq 1 ] || {
-	echo_i "ns1 $cr1 expected 1"
-	ret=1
+  echo_i "ns1 $cr1 expected 1"
+  ret=1
 }
 [ $cr2 -eq 1 ] || {
-	echo_i "ns2 $cr2 expected 1"
-	ret=1
+  echo_i "ns2 $cr2 expected 1"
+  ret=1
 }
 [ $cr3 -eq 2 ] || {
-	echo_i "ns3 $cr3 expected 2"
-	ret=1
+  echo_i "ns3 $cr3 expected 2"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking RESOLVER_QUERY message counts"
 ret=0
 [ $rq1 -eq 0 ] || {
-	echo_i "ns1 $rq1 expected 0"
-	ret=1
+  echo_i "ns1 $rq1 expected 0"
+  ret=1
 }
 [ $rq2 -eq 0 ] || {
-	echo_i "ns2 $rq2 expected 0"
-	ret=1
+  echo_i "ns2 $rq2 expected 0"
+  ret=1
 }
 [ $rq3 -eq 3 ] || {
-	echo_i "ns3 $rq3 expected 3"
-	ret=1
+  echo_i "ns3 $rq3 expected 3"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking RESOLVER_RESPONSE message counts"
 ret=0
 [ $rr1 -eq 0 ] || {
-	echo_i "ns1 $rr1 expected 0"
-	ret=1
+  echo_i "ns1 $rr1 expected 0"
+  ret=1
 }
 [ $rr2 -eq 0 ] || {
-	echo_i "ns2 $rr2 expected 0"
-	ret=1
+  echo_i "ns2 $rr2 expected 0"
+  ret=1
 }
 [ $rr3 -eq 3 ] || {
-	echo_i "ns3 $rr3 expected 3"
-	ret=1
+  echo_i "ns3 $rr3 expected 3"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking UPDATE_QUERY message counts"
 ret=0
 [ $uq1 -eq 0 ] || {
-	echo_i "ns1 $uq1 expected 0"
-	ret=1
+  echo_i "ns1 $uq1 expected 0"
+  ret=1
 }
 [ $uq2 -eq 0 ] || {
-	echo_i "ns2 $uq2 expected 0"
-	ret=1
+  echo_i "ns2 $uq2 expected 0"
+  ret=1
 }
 [ $uq3 -eq 0 ] || {
-	echo_i "ns3 $uq3 expected 0"
-	ret=1
+  echo_i "ns3 $uq3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking UPDATE_RESPONSE message counts"
 ret=0
 [ $ur1 -eq 0 ] || {
-	echo_i "ns1 $ur1 expected 0"
-	ret=1
+  echo_i "ns1 $ur1 expected 0"
+  ret=1
 }
 [ $ur2 -eq 0 ] || {
-	echo_i "ns2 $ur2 expected 0"
-	ret=1
+  echo_i "ns2 $ur2 expected 0"
+  ret=1
 }
 [ $ur3 -eq 0 ] || {
-	echo_i "ns3 $ur3 expected 0"
-	ret=1
+  echo_i "ns3 $ur3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking reopened message counts"
 
-udp1=`$DNSTAPREAD ns1/dnstap.out | grep "UDP " | wc -l`
-tcp1=`$DNSTAPREAD ns1/dnstap.out | grep "TCP " | wc -l`
-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`
-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`
-ur1=`$DNSTAPREAD ns1/dnstap.out | grep "UR " | wc -l`
-
-udp2=`$DNSTAPREAD ns2/dnstap.out | grep "UDP " | wc -l`
-tcp2=`$DNSTAPREAD ns2/dnstap.out | grep "TCP " | wc -l`
-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`
-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`
-ur2=`$DNSTAPREAD ns2/dnstap.out | grep "UR " | wc -l`
-
-udp3=`$DNSTAPREAD ns3/dnstap.out | grep "UDP " | wc -l`
-tcp3=`$DNSTAPREAD ns3/dnstap.out | grep "TCP " | wc -l`
-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`
-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`
+udp1=$($DNSTAPREAD ns1/dnstap.out | grep "UDP " | wc -l)
+tcp1=$($DNSTAPREAD ns1/dnstap.out | grep "TCP " | wc -l)
+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)
+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)
+ur1=$($DNSTAPREAD ns1/dnstap.out | grep "UR " | wc -l)
+
+udp2=$($DNSTAPREAD ns2/dnstap.out | grep "UDP " | wc -l)
+tcp2=$($DNSTAPREAD ns2/dnstap.out | grep "TCP " | wc -l)
+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)
+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)
+ur2=$($DNSTAPREAD ns2/dnstap.out | grep "UR " | wc -l)
+
+udp3=$($DNSTAPREAD ns3/dnstap.out | grep "UDP " | wc -l)
+tcp3=$($DNSTAPREAD ns3/dnstap.out | grep "TCP " | wc -l)
+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)
+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)
 
 echo_i "checking UDP message counts"
 ret=0
 [ $udp1 -eq 0 ] || {
-	echo_i "ns1 $udp1 expected 0"
-	ret=1
+  echo_i "ns1 $udp1 expected 0"
+  ret=1
 }
 [ $udp2 -eq 2 ] || {
-	echo_i "ns2 $udp2 expected 2"
-	ret=1
+  echo_i "ns2 $udp2 expected 2"
+  ret=1
 }
 [ $udp3 -eq 2 ] || {
-	echo_i "ns3 $udp3 expected 2"
-	ret=1
+  echo_i "ns3 $udp3 expected 2"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking TCP message counts"
 ret=0
 [ $tcp1 -eq 0 ] || {
-	echo_i "ns1 $tcp1 expected 0"
-	ret=1
+  echo_i "ns1 $tcp1 expected 0"
+  ret=1
 }
 [ $tcp2 -eq 0 ] || {
-	echo_i "ns2 $tcp2 expected 0"
-	ret=1
+  echo_i "ns2 $tcp2 expected 0"
+  ret=1
 }
 [ $tcp3 -eq 0 ] || {
-	echo_i "ns3 $tcp3 expected 0"
-	ret=1
+  echo_i "ns3 $tcp3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking AUTH_QUERY message counts"
 ret=0
 [ $aq1 -eq 0 ] || {
-	echo_i "ns1 $aq1 exepcted 0"
-	ret=1
+  echo_i "ns1 $aq1 exepcted 0"
+  ret=1
 }
 [ $aq2 -eq 0 ] || {
-	echo_i "ns2 $aq2 expected 0"
-	ret=1
+  echo_i "ns2 $aq2 expected 0"
+  ret=1
 }
 [ $aq3 -eq 0 ] || {
-	echo_i "ns3 $aq3 expected 0"
-	ret=1
+  echo_i "ns3 $aq3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking AUTH_RESPONSE message counts"
 ret=0
 [ $ar1 -eq 0 ] || {
-	echo_i "ns1 $ar1 expected 0"
-	ret=1
+  echo_i "ns1 $ar1 expected 0"
+  ret=1
 }
 [ $ar2 -eq 0 ] || {
-	echo_i "ns2 $ar2 expected 0"
-	ret=1
+  echo_i "ns2 $ar2 expected 0"
+  ret=1
 }
 [ $ar3 -eq 0 ] || {
-	echo_i "ns3 $ar3 expected 0"
-	ret=1
+  echo_i "ns3 $ar3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking CLIENT_QUERY message counts"
 ret=0
 [ $cq1 -eq 0 ] || {
-	echo_i "ns1 $cq1 expected 0"
-	ret=1
+  echo_i "ns1 $cq1 expected 0"
+  ret=1
 }
 [ $cq2 -eq 0 ] || {
-	echo_i "ns2 $cq2 expected 0"
-	ret=1
+  echo_i "ns2 $cq2 expected 0"
+  ret=1
 }
 [ $cq3 -eq 1 ] || {
-	echo_i "ns3 $cq3 expected 1"
-	ret=1
+  echo_i "ns3 $cq3 expected 1"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking CLIENT_RESPONSE message counts"
 ret=0
 [ $cr1 -eq 0 ] || {
-	echo_i "ns1 $cr1 expected 0"
-	ret=1
+  echo_i "ns1 $cr1 expected 0"
+  ret=1
 }
 [ $cr2 -eq 0 ] || {
-	echo_i "ns2 $cr2 expected 0"
-	ret=1
+  echo_i "ns2 $cr2 expected 0"
+  ret=1
 }
 [ $cr3 -eq 1 ] || {
-	echo_i "ns3 $cr3 expected 1"
-	ret=1
+  echo_i "ns3 $cr3 expected 1"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking RESOLVER_QUERY message counts"
 ret=0
 [ $rq1 -eq 0 ] || {
-	echo_i "ns1 $rq1 expected 0"
-	ret=1
+  echo_i "ns1 $rq1 expected 0"
+  ret=1
 }
 [ $rq2 -eq 0 ] || {
-	echo_i "ns2 $rq2 expected 0"
-	ret=1
+  echo_i "ns2 $rq2 expected 0"
+  ret=1
 }
 [ $rq3 -eq 0 ] || {
-	echo_i "ns3 $rq3 expected 0"
-	ret=1
+  echo_i "ns3 $rq3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking RESOLVER_RESPONSE message counts"
 ret=0
 [ $rr1 -eq 0 ] || {
-	echo_i "ns1 $rr1 expected 0"
-	ret=1
+  echo_i "ns1 $rr1 expected 0"
+  ret=1
 }
 [ $rr2 -eq 0 ] || {
-	echo_i "ns2 $rr2 expected 0"
-	ret=1
+  echo_i "ns2 $rr2 expected 0"
+  ret=1
 }
 [ $rr3 -eq 0 ] || {
-	echo_i "ns3 $rr3 expected 0"
-	ret=1
+  echo_i "ns3 $rr3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking UPDATE_QUERY message counts"
 ret=0
 [ $uq1 -eq 0 ] || {
-	echo_i "ns1 $uq1 expected 0"
-	ret=1
+  echo_i "ns1 $uq1 expected 0"
+  ret=1
 }
 [ $uq2 -eq 1 ] || {
-	echo_i "ns2 $uq2 expected 1"
-	ret=1
+  echo_i "ns2 $uq2 expected 1"
+  ret=1
 }
 [ $uq3 -eq 0 ] || {
-	echo_i "ns3 $uq3 expected 0"
-	ret=1
+  echo_i "ns3 $uq3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking UPDATE_RESPONSE message counts"
 ret=0
 [ $ur1 -eq 0 ] || {
-	echo_i "ns1 $ur1 expected 0"
-	ret=1
+  echo_i "ns1 $ur1 expected 0"
+  ret=1
 }
 [ $ur2 -eq 1 ] || {
-	echo_i "ns2 $ur2 expected 1"
-	ret=1
+  echo_i "ns2 $ur2 expected 1"
+  ret=1
 }
 [ $ur3 -eq 0 ] || {
-	echo_i "ns3 $ur3 expected 0"
-	ret=1
+  echo_i "ns3 $ur3 expected 0"
+  ret=1
 }
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking whether destination UDP port is logged for client queries"
 ret=0
 $DNSTAPREAD ns3/dnstap.out.save | grep -Eq "CQ [0-9:.]+ -> 10.53.0.3:${PORT} UDP" || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 HAS_PYYAML=0
-if [ -n "$PYTHON" ] ; then
-	$PYTHON -c "import yaml" 2> /dev/null && HAS_PYYAML=1
+if [ -n "$PYTHON" ]; then
+  $PYTHON -c "import yaml" 2>/dev/null && HAS_PYYAML=1
 fi
 
-if [ $HAS_PYYAML -ne 0 ] ; then
-	echo_i "checking dnstap-read YAML output"
-	ret=0
-        {
-	  $PYTHON ydump.py "$DNSTAPREAD" "ns3/dnstap.out.save" > ydump.out || ret=1
-        } | cat_i
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
+if [ $HAS_PYYAML -ne 0 ]; then
+  echo_i "checking dnstap-read YAML output"
+  ret=0
+  {
+    $PYTHON ydump.py "$DNSTAPREAD" "ns3/dnstap.out.save" >ydump.out || ret=1
+  } | cat_i
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
 fi
 
 echo_i "checking dnstap-read hex output"
 ret=0
-hex=`$DNSTAPREAD -x ns3/dnstap.out | tail -1`
-echo $hex | $WIRETEST > dnstap.hex
-grep 'status: NOERROR' dnstap.hex > /dev/null 2>&1 || ret=1
-grep 'ANSWER: 3, AUTHORITY: 1' dnstap.hex > /dev/null 2>&1 || ret=1
+hex=$($DNSTAPREAD -x ns3/dnstap.out | tail -1)
+echo $hex | $WIRETEST >dnstap.hex
+grep 'status: NOERROR' dnstap.hex >/dev/null 2>&1 || ret=1
+grep 'ANSWER: 3, AUTHORITY: 1' dnstap.hex >/dev/null 2>&1 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
-if [ -n "$FSTRM_CAPTURE" ] ; then
-	$DIG $DIGOPTS @10.53.0.4 a.example > dig.out
+if [ -n "$FSTRM_CAPTURE" ]; then
+  $DIG $DIGOPTS @10.53.0.4 a.example >dig.out
 
-	# send an UPDATE to ns4
-	$NSUPDATE <<- EOF > nsupdate.out 2>&1
+  # send an UPDATE to ns4
+  $NSUPDATE <<-EOF >nsupdate.out 2>&1
 	server 10.53.0.4 ${PORT}
 	zone example
 	update add b.example 3600 in a 10.10.10.10
 	send
 EOF
-	grep "update failed: NOTAUTH" nsupdate.out > /dev/null || ret=1
-
-	echo_i "checking unix socket message counts"
-	sleep 2
-	retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 450 || {
-		echo_i "dnstap output file smaller than expected"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-	kill $fstrm_capture_pid
-	wait
-	udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`
-	tcp4=`$DNSTAPREAD dnstap.out | grep "TCP " | wc -l`
-	aq4=`$DNSTAPREAD dnstap.out | grep "AQ " | wc -l`
-	ar4=`$DNSTAPREAD dnstap.out | grep "AR " | wc -l`
-	cq4=`$DNSTAPREAD dnstap.out | grep "CQ " | wc -l`
-	cr4=`$DNSTAPREAD dnstap.out | grep "CR " | 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`
-	ur4=`$DNSTAPREAD dnstap.out | grep "UR " | wc -l`
-
-	echo_i "checking UDP message counts"
-	ret=0
-	[ $udp4 -eq 4 ] || {
-		echo_i "ns4 $udp4 expected 4"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking TCP message counts"
-	ret=0
-	[ $tcp4 -eq 0 ] || {
-		echo_i "ns4 $tcp4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking AUTH_QUERY message counts"
-	ret=0
-	[ $aq4 -eq 0 ] || {
-		echo_i "ns4 $aq4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking AUTH_RESPONSE message counts"
-	ret=0
-	[ $ar4 -eq 0 ] || {
-		echo_i "ns4 $ar4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking CLIENT_QUERY message counts"
-	ret=0
-	[ $cq4 -eq 1 ] || {
-		echo_i "ns4 $cq4 expected 1"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking CLIENT_RESPONSE message counts"
-	ret=0
-	[ $cr4 -eq 1 ] || {
-		echo_i "ns4 $cr4 expected 1"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking RESOLVER_QUERY message counts"
-	ret=0
-	[ $rq4 -eq 0 ] || {
-		echo_i "ns4 $rq4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking RESOLVER_RESPONSE message counts"
-	ret=0
-	[ $rr4 -eq 0 ] || {
-		echo_i "ns4 $rr4 expected 0"
-		ret=1
-	}
-
-	echo_i "checking UPDATE_QUERY message counts"
-	ret=0
-	[ $uq4 -eq 1 ] || {
-		echo_i "ns4 $uq4 expected 1"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking UPDATE_RESPONSE message counts"
-	ret=0
-	[ $ur4 -eq 1 ] || {
-		echo_i "ns4 $ur4 expected 1"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	mv dnstap.out dnstap.out.save
-
-	echo_i "restarting fstrm_capture"
-	$FSTRM_CAPTURE -t protobuf:dnstap.Dnstap -u ns4/dnstap.out \
-		-w dnstap.out > fstrm_capture.out.2 2>&1 &
-	fstrm_capture_pid=$!
-	wait_for_log 10 "socket path ns4/dnstap.out" fstrm_capture.out.2 || {
-		echo_i "failed"
-		ret=1
-	}
-	$RNDCCMD -s 10.53.0.4 dnstap -reopen | sed 's/^/ns4 /' | cat_i
-	$DIG $DIGOPTS @10.53.0.4 a.example > dig.out
-
-	echo_i "checking reopened unix socket message counts"
-	sleep 2
-	retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 270 || {
-		echo_i "dnstap output file smaller than expected"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=$((status + ret))
-	kill $fstrm_capture_pid
-	wait
-	udp4=`$DNSTAPREAD dnstap.out | grep "UDP " | wc -l`
-	tcp4=`$DNSTAPREAD dnstap.out | grep "TCP " | wc -l`
-	aq4=`$DNSTAPREAD dnstap.out | grep "AQ " | wc -l`
-	ar4=`$DNSTAPREAD dnstap.out | grep "AR " | wc -l`
-	cq4=`$DNSTAPREAD dnstap.out | grep "CQ " | wc -l`
-	cr4=`$DNSTAPREAD dnstap.out | grep "CR " | 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`
-	ur4=`$DNSTAPREAD dnstap.out | grep "UR " | wc -l`
-
-	echo_i "checking UDP message counts"
-	ret=0
-	[ $udp4 -eq 2 ] || {
-		echo_i "ns4 $udp4 expected 2"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking TCP message counts"
-	ret=0
-	[ $tcp4 -eq 0 ] || {
-		echo_i "ns4 $tcp4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking AUTH_QUERY message counts"
-	ret=0
-	[ $aq4 -eq 0 ] || {
-		echo_i "ns4 $aq4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking AUTH_RESPONSE message counts"
-	ret=0
-	[ $ar4 -eq 0 ] || {
-		echo_i "ns4 $ar4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking CLIENT_QUERY message counts"
-	ret=0
-	[ $cq4 -eq 1 ] || {
-		echo_i "ns4 $cq4 expected 1"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking CLIENT_RESPONSE message counts"
-	ret=0
-	[ $cr4 -eq 1 ] || {
-		echo_i "ns4 $cr4 expected 1"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking RESOLVER_QUERY message counts"
-	ret=0
-	[ $rq4 -eq 0 ] || {
-		echo_i "ns4 $rq4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking RESOLVER_RESPONSE message counts"
-	ret=0
-	[ $rr4 -eq 0 ] || {
-		echo_i "ns4 $rr4 expected 0"
-		ret=1
-	}
-
-	echo_i "checking UPDATE_QUERY message counts"
-	ret=0
-	[ $uq4 -eq 0 ] || {
-		echo_i "ns4 $uq4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
-
-	echo_i "checking UPDATE_RESPONSE message counts"
-	ret=0
-	[ $ur4 -eq 0 ] || {
-		echo_i "ns4 $ur4 expected 0"
-		ret=1
-	}
-	if [ $ret != 0 ]; then echo_i "failed"; fi
-	status=`expr $status + $ret`
+  grep "update failed: NOTAUTH" nsupdate.out >/dev/null || ret=1
+
+  echo_i "checking unix socket message counts"
+  sleep 2
+  retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 450 || {
+    echo_i "dnstap output file smaller than expected"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+  kill $fstrm_capture_pid
+  wait
+  udp4=$($DNSTAPREAD dnstap.out | grep "UDP " | wc -l)
+  tcp4=$($DNSTAPREAD dnstap.out | grep "TCP " | wc -l)
+  aq4=$($DNSTAPREAD dnstap.out | grep "AQ " | wc -l)
+  ar4=$($DNSTAPREAD dnstap.out | grep "AR " | wc -l)
+  cq4=$($DNSTAPREAD dnstap.out | grep "CQ " | wc -l)
+  cr4=$($DNSTAPREAD dnstap.out | grep "CR " | 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)
+  ur4=$($DNSTAPREAD dnstap.out | grep "UR " | wc -l)
+
+  echo_i "checking UDP message counts"
+  ret=0
+  [ $udp4 -eq 4 ] || {
+    echo_i "ns4 $udp4 expected 4"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking TCP message counts"
+  ret=0
+  [ $tcp4 -eq 0 ] || {
+    echo_i "ns4 $tcp4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking AUTH_QUERY message counts"
+  ret=0
+  [ $aq4 -eq 0 ] || {
+    echo_i "ns4 $aq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking AUTH_RESPONSE message counts"
+  ret=0
+  [ $ar4 -eq 0 ] || {
+    echo_i "ns4 $ar4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking CLIENT_QUERY message counts"
+  ret=0
+  [ $cq4 -eq 1 ] || {
+    echo_i "ns4 $cq4 expected 1"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking CLIENT_RESPONSE message counts"
+  ret=0
+  [ $cr4 -eq 1 ] || {
+    echo_i "ns4 $cr4 expected 1"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking RESOLVER_QUERY message counts"
+  ret=0
+  [ $rq4 -eq 0 ] || {
+    echo_i "ns4 $rq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking RESOLVER_RESPONSE message counts"
+  ret=0
+  [ $rr4 -eq 0 ] || {
+    echo_i "ns4 $rr4 expected 0"
+    ret=1
+  }
+
+  echo_i "checking UPDATE_QUERY message counts"
+  ret=0
+  [ $uq4 -eq 1 ] || {
+    echo_i "ns4 $uq4 expected 1"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking UPDATE_RESPONSE message counts"
+  ret=0
+  [ $ur4 -eq 1 ] || {
+    echo_i "ns4 $ur4 expected 1"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  mv dnstap.out dnstap.out.save
+
+  echo_i "restarting fstrm_capture"
+  $FSTRM_CAPTURE -t protobuf:dnstap.Dnstap -u ns4/dnstap.out \
+    -w dnstap.out >fstrm_capture.out.2 2>&1 &
+  fstrm_capture_pid=$!
+  wait_for_log 10 "socket path ns4/dnstap.out" fstrm_capture.out.2 || {
+    echo_i "failed"
+    ret=1
+  }
+  $RNDCCMD -s 10.53.0.4 dnstap -reopen | sed 's/^/ns4 /' | cat_i
+  $DIG $DIGOPTS @10.53.0.4 a.example >dig.out
+
+  echo_i "checking reopened unix socket message counts"
+  sleep 2
+  retry_quiet 5 dnstap_data_ready $fstrm_capture_pid dnstap.out 270 || {
+    echo_i "dnstap output file smaller than expected"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$((status + ret))
+  kill $fstrm_capture_pid
+  wait
+  udp4=$($DNSTAPREAD dnstap.out | grep "UDP " | wc -l)
+  tcp4=$($DNSTAPREAD dnstap.out | grep "TCP " | wc -l)
+  aq4=$($DNSTAPREAD dnstap.out | grep "AQ " | wc -l)
+  ar4=$($DNSTAPREAD dnstap.out | grep "AR " | wc -l)
+  cq4=$($DNSTAPREAD dnstap.out | grep "CQ " | wc -l)
+  cr4=$($DNSTAPREAD dnstap.out | grep "CR " | 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)
+  ur4=$($DNSTAPREAD dnstap.out | grep "UR " | wc -l)
+
+  echo_i "checking UDP message counts"
+  ret=0
+  [ $udp4 -eq 2 ] || {
+    echo_i "ns4 $udp4 expected 2"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking TCP message counts"
+  ret=0
+  [ $tcp4 -eq 0 ] || {
+    echo_i "ns4 $tcp4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking AUTH_QUERY message counts"
+  ret=0
+  [ $aq4 -eq 0 ] || {
+    echo_i "ns4 $aq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking AUTH_RESPONSE message counts"
+  ret=0
+  [ $ar4 -eq 0 ] || {
+    echo_i "ns4 $ar4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking CLIENT_QUERY message counts"
+  ret=0
+  [ $cq4 -eq 1 ] || {
+    echo_i "ns4 $cq4 expected 1"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking CLIENT_RESPONSE message counts"
+  ret=0
+  [ $cr4 -eq 1 ] || {
+    echo_i "ns4 $cr4 expected 1"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking RESOLVER_QUERY message counts"
+  ret=0
+  [ $rq4 -eq 0 ] || {
+    echo_i "ns4 $rq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking RESOLVER_RESPONSE message counts"
+  ret=0
+  [ $rr4 -eq 0 ] || {
+    echo_i "ns4 $rr4 expected 0"
+    ret=1
+  }
+
+  echo_i "checking UPDATE_QUERY message counts"
+  ret=0
+  [ $uq4 -eq 0 ] || {
+    echo_i "ns4 $uq4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
+
+  echo_i "checking UPDATE_RESPONSE message counts"
+  ret=0
+  [ $ur4 -eq 0 ] || {
+    echo_i "ns4 $ur4 expected 0"
+    ret=1
+  }
+  if [ $ret != 0 ]; then echo_i "failed"; fi
+  status=$(expr $status + $ret)
 fi
 
 echo_i "checking large packet printing"
 ret=0
 # Expect one occurrence of "opcode: QUERY" below "reponse_message_data" and
 # another one below "response_message".
-lines=`$DNSTAPREAD -y large-answer.fstrm | grep -c "opcode: QUERY"`
+lines=$($DNSTAPREAD -y large-answer.fstrm | grep -c "opcode: QUERY")
 [ $lines -eq 2 ] || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 test_dnstap_roll() (
-    ip="$1"
-    ns="$2"
-    n="$3"
-    $RNDCCMD -s "${ip}" dnstap -roll "${n}" | sed "s/^/${ns} /" | cat_i &&
-    files=$(find "$ns" -name "dnstap.out.[0-9]" | wc -l) &&
-    test "$files" -le "${n}" && test "$files" -ge "1"
+  ip="$1"
+  ns="$2"
+  n="$3"
+  $RNDCCMD -s "${ip}" dnstap -roll "${n}" | sed "s/^/${ns} /" | cat_i \
+    && files=$(find "$ns" -name "dnstap.out.[0-9]" | wc -l) \
+    && test "$files" -le "${n}" && test "$files" -ge "1"
 )
 
 echo_i "checking 'rndc -roll <value>' (no versions)"
@@ -821,14 +824,14 @@ ret=0
 start_server --noclean --restart --port "${PORT}" ns3
 _repeat 5 test_dnstap_roll 10.53.0.3 ns3 3 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
 echo_i "checking 'rndc -roll <value>' (versions)"
 ret=0
 start_server --noclean --restart --port "${PORT}" ns2
 _repeat 5 test_dnstap_roll 10.53.0.2 ns2 3 || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=$((status+ret))
+status=$((status + ret))
 
 echo_i "exit status: $status"
 [ "$status" -eq 0 ] || exit 1