Merging upstream version 1:9.16.48.

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

2 files changed, 34 insertions, 35 deletions

diff --git a/bin/tests/system/tcp/prereq.sh b/bin/tests/system/tcp/prereq.sh
index 51e8c66..107fae8 100644
--- a/bin/tests/system/tcp/prereq.sh
+++ b/bin/tests/system/tcp/prereq.sh
@@ -15,7 +15,6 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 if ! test -n "$PYTHON"; then
-	echo_i "This test requires Python."
-	exit 1
+  echo_i "This test requires Python."
+  exit 1
 fi
-
diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh
index a24a199..3a7336a 100644
--- a/bin/tests/system/tcp/tests.sh
+++ b/bin/tests/system/tcp/tests.sh
@@ -18,11 +18,11 @@ SYSTEMTESTTOP=..
 . "$SYSTEMTESTTOP/conf.sh"
 
 dig_with_opts() {
-	"${DIG}" -p "${PORT}" "$@"
+  "${DIG}" -p "${PORT}" "$@"
 }
 
 rndccmd() {
-	"${RNDC}" -p "${CONTROLPORT}" -c ../common/rndc.conf -s "$@"
+  "${RNDC}" -p "${CONTROLPORT}" -c ../common/rndc.conf -s "$@"
 }
 
 status=0
@@ -43,7 +43,7 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "checking TCP request statistics (resolver) ($n)"
 ret=0
-dig_with_opts @10.53.0.3 txt.example. > dig.out.test$n
+dig_with_opts @10.53.0.3 txt.example. >dig.out.test$n
 sleep 1
 rndccmd 10.53.0.1 stats || ret=1
 rndccmd 10.53.0.2 stats || ret=1
@@ -59,7 +59,7 @@ status=$((status + ret))
 n=$((n + 1))
 echo_i "checking TCP request statistics (forwarder) ($n)"
 ret=0
-dig_with_opts @10.53.0.4 txt.example. > dig.out.test$n
+dig_with_opts @10.53.0.4 txt.example. >dig.out.test$n
 sleep 1
 rndccmd 10.53.0.1 stats || ret=1
 rndccmd 10.53.0.2 stats || ret=1
@@ -68,36 +68,36 @@ mv ns2/named.stats ns2/named.stats.test$n
 ntcp12="$(grep "TCP requests received" ns1/named.stats.test$n | tail -1 | awk '{print $1}')"
 ntcp22="$(grep "TCP requests received" ns2/named.stats.test$n | tail -1 | awk '{print $1}')"
 if [ "$ntcp11" -ne "$ntcp12" ]; then ret=1; fi
-if [ "$ntcp21" -ge "$ntcp22" ];then ret=1; fi
+if [ "$ntcp21" -ge "$ntcp22" ]; then ret=1; fi
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
 # -------- TCP high-water tests ----------
 refresh_tcp_stats() {
-	rndccmd 10.53.0.5 status > rndc.out.$n || ret=1
-	TCP_CUR="$(sed -n "s/^tcp clients: \([0-9][0-9]*\).*/\1/p" rndc.out.$n)"
-	TCP_LIMIT="$(sed -n "s/^tcp clients: .*\/\([0-9][0-9]*\)/\1/p" rndc.out.$n)"
-	TCP_HIGH="$(sed -n "s/^TCP high-water: \([0-9][0-9]*\)/\1/p" rndc.out.$n)"
+  rndccmd 10.53.0.5 status >rndc.out.$n || ret=1
+  TCP_CUR="$(sed -n "s/^tcp clients: \([0-9][0-9]*\).*/\1/p" rndc.out.$n)"
+  TCP_LIMIT="$(sed -n "s/^tcp clients: .*\/\([0-9][0-9]*\)/\1/p" rndc.out.$n)"
+  TCP_HIGH="$(sed -n "s/^TCP high-water: \([0-9][0-9]*\)/\1/p" rndc.out.$n)"
 }
 
 # Send a command to the tool script listening on 10.53.0.6.
 send_command() {
-	nextpart ans6/ans.run > /dev/null
-	echo "$*" | "${PERL}" "${SYSTEMTESTTOP}/send.pl" 10.53.0.6 "${CONTROLPORT}"
-	wait_for_log_peek 10 "result=" ans6/ans.run || ret=1
-	if ! nextpartpeek ans6/ans.run | grep -qF "result=OK"; then
-		return 1
-	fi
+  nextpart ans6/ans.run >/dev/null
+  echo "$*" | "${PERL}" "${SYSTEMTESTTOP}/send.pl" 10.53.0.6 "${CONTROLPORT}"
+  wait_for_log_peek 10 "result=" ans6/ans.run || ret=1
+  if ! nextpartpeek ans6/ans.run | grep -qF "result=OK"; then
+    return 1
+  fi
 }
 
 # Instructs ans6 to open $1 TCP connections to 10.53.0.5.
 open_connections() {
-	send_command "open" "${1}" 10.53.0.5 "${PORT}" || return 1
+  send_command "open" "${1}" 10.53.0.5 "${PORT}" || return 1
 }
 
 # Instructs ans6 to close $1 TCP connections to 10.53.0.5.
 close_connections() {
-	send_command "close" "${1}" || return 1
+  send_command "close" "${1}" || return 1
 }
 
 # Check TCP connections are working normally before opening
@@ -105,8 +105,8 @@ close_connections() {
 n=$((n + 1))
 echo_i "checking TCP query repsonse ($n)"
 ret=0
-dig_with_opts +tcp @10.53.0.5 txt.example > dig.out.test$n
-grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
+dig_with_opts +tcp @10.53.0.5 txt.example >dig.out.test$n
+grep "status: NXDOMAIN" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -133,9 +133,9 @@ OLD_TCP_CUR="${TCP_CUR}"
 TCP_ADDED=9
 open_connections "${TCP_ADDED}" || ret=1
 check_stats_added() {
-	refresh_tcp_stats
-	assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR + TCP_ADDED)) "current TCP clients count" || return 1
-	assert_int_equal "${TCP_HIGH}" $((OLD_TCP_CUR + TCP_ADDED)) "TCP high-water value" || return 1
+  refresh_tcp_stats
+  assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR + TCP_ADDED)) "current TCP clients count" || return 1
+  assert_int_equal "${TCP_HIGH}" $((OLD_TCP_CUR + TCP_ADDED)) "TCP high-water value" || return 1
 }
 retry 2 check_stats_added || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -151,9 +151,9 @@ OLD_TCP_HIGH="${TCP_HIGH}"
 TCP_REMOVED=5
 close_connections "${TCP_REMOVED}" || ret=1
 check_stats_removed() {
-	refresh_tcp_stats
-	assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR - TCP_REMOVED)) "current TCP clients count" || return 1
-	assert_int_equal "${TCP_HIGH}" "${OLD_TCP_HIGH}" "TCP high-water value" || return 1
+  refresh_tcp_stats
+  assert_int_equal "${TCP_CUR}" $((OLD_TCP_CUR - TCP_REMOVED)) "current TCP clients count" || return 1
+  assert_int_equal "${TCP_HIGH}" "${OLD_TCP_HIGH}" "TCP high-water value" || return 1
 }
 retry 2 check_stats_removed || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -166,9 +166,9 @@ echo_i "TCP high-water: ensure tcp-clients is an upper bound ($n)"
 ret=0
 open_connections $((TCP_LIMIT + 1)) || ret=1
 check_stats_limit() {
-	refresh_tcp_stats
-	assert_int_equal "${TCP_CUR}" "${TCP_LIMIT}" "current TCP clients count" || return 1
-	assert_int_equal "${TCP_HIGH}" "${TCP_LIMIT}" "TCP high-water value" || return 1
+  refresh_tcp_stats
+  assert_int_equal "${TCP_CUR}" "${TCP_LIMIT}" "current TCP clients count" || return 1
+  assert_int_equal "${TCP_HIGH}" "${TCP_LIMIT}" "TCP high-water value" || return 1
 }
 retry 2 check_stats_limit || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
@@ -181,8 +181,8 @@ echo_i "checking TCP response recovery ($n)"
 ret=0
 # "0" closes all connections
 close_connections 0 || ret=1
-dig_with_opts +tcp @10.53.0.5 txt.example > dig.out.test$n || ret=1
-grep "status: NXDOMAIN" dig.out.test$n > /dev/null || ret=1
+dig_with_opts +tcp @10.53.0.5 txt.example >dig.out.test$n || ret=1
+grep "status: NXDOMAIN" dig.out.test$n >/dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))
 
@@ -195,8 +195,8 @@ echo_i "checking that BIND 9 doesn't crash on long TCP messages ($n)"
 ret=0
 # Avoid logging useless information.
 rndccmd 10.53.0.1 trace 1 || ret=1
-{ $PERL ../packet.pl -a "10.53.0.1" -p "${PORT}" -t tcp -r 300000 1996-alloc_dnsbuf-crash-test.pkt || ret=1 ; } | cat_i
-dig_with_opts +tcp @10.53.0.1 txt.example > dig.out.test$n || ret=1
+{ $PERL ../packet.pl -a "10.53.0.1" -p "${PORT}" -t tcp -r 300000 1996-alloc_dnsbuf-crash-test.pkt || ret=1; } | cat_i
+dig_with_opts +tcp @10.53.0.1 txt.example >dig.out.test$n || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=$((status + ret))