From: Tom Krizek <tkrizek@isc.org>
Date: Fri, 5 Jan 2024 14:06:56 +0000 (+0100)
Subject: Handle dig timing out gracefully in keepalive
X-Git-Tag: v9.19.22~94^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6b267ce4d8dbd53005a29955a7583e46cf25dcd;p=thirdparty%2Fbind9.git

Handle dig timing out gracefully in keepalive
---

diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh
index c8b379de925..84c3b3a3fc2 100644
--- a/bin/tests/system/keepalive/tests.sh
+++ b/bin/tests/system/keepalive/tests.sh
@@ -24,7 +24,7 @@ status=0
 echo_i "checking that dig handles TCP keepalive ($n)"
 ret=0
 n=$((n + 1))
-$DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 >dig.out.test$n
+$DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
 grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -40,7 +40,7 @@ status=$((status + ret))
 echo_i "checking that TCP keepalive is added for TCP responses ($n)"
 ret=0
 n=$((n + 1))
-$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n
+$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
 grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -48,7 +48,7 @@ status=$((status + ret))
 echo_i "checking that TCP keepalive requires TCP ($n)"
 ret=0
 n=$((n + 1))
-$DIG $DIGOPTS +keepalive foo.example @10.53.0.2 >dig.out.test$n
+$DIG $DIGOPTS +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
 grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null && ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -56,7 +56,7 @@ status=$((status + ret))
 echo_i "checking default value ($n)"
 ret=0
 n=$((n + 1))
-$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 >dig.out.test$n
+$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 >dig.out.test$n || ret=1
 grep "; TCP KEEPALIVE: 30.0 secs" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -64,7 +64,7 @@ status=$((status + ret))
 echo_i "checking configured value ($n)"
 ret=0
 n=$((n + 1))
-$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n
+$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
 grep "; TCP KEEPALIVE: 15.0 secs" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -74,7 +74,7 @@ ret=0
 n=$((n + 1))
 $RNDCCMD tcp-timeouts 300 300 300 200 >output
 diff -b output expected || ret=1
-$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n
+$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
 grep "; TCP KEEPALIVE: 20.0 secs" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
@@ -85,7 +85,7 @@ n=$((n + 1))
 $RNDCCMD stats
 oka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \
   | tail -1 | awk '{ print $1}')
-$DIG $DIGOPTS bar.example @10.53.0.3 >dig.out.test$n
+$DIG $DIGOPTS bar.example @10.53.0.3 >dig.out.test$n || ret=1
 $RNDCCMD stats
 nka=$(grep "EDNS TCP keepalive option received" ns2/named.stats \
   | tail -1 | awk '{ print $1}')