From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 29 Nov 2024 16:39:27 +0000 (+0100)
Subject: testing: Always use immediate mode for tcpdump
X-Git-Tag: 6.0.0~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8cfeeff54768a6d311a6b776e4c38f235564ede;p=thirdparty%2Fstrongswan.git

testing: Always use immediate mode for tcpdump

We don't use versions that don't support this anymore and sometimes the
detection didn't work properly and a run without it would get started.
---

diff --git a/testing/do-tests b/testing/do-tests
index 5880c958a9..986c1296ba 100755
--- a/testing/do-tests
+++ b/testing/do-tests
@@ -135,13 +135,6 @@ done
 [ -f $SHAREDDIR/.strongswan-version ] && SWANVERSION=`cat $SHAREDDIR/.strongswan-version`
 KERNELVERSION=`ssh $SSHCONF root@\$ipv4_winnetou uname -r 2>/dev/null`
 
-# check if tcpdump supports --immediate-mode
-ssh $SSHCONF root@$ipv4_winnetou tcpdump --immediate-mode -c 1 >/dev/null 2>&1
-if [ $? -eq 0 ]
-then
-	TCPDUMP_IM=--immediate-mode
-fi
-
 ##############################################################################
 # create header for the results html file
 #
@@ -355,7 +348,7 @@ do
 	    do
 		host=`echo $host_iface | awk -F ":" '{print $1}'`
 		iface=`echo $host_iface | awk -F ":" '{if ($2 != "") { print $2 } else { printf("eth0") }}'`
-		tcpdump_cmd="tcpdump -l $TCPDUMP_IM -i $iface not port ssh and not port domain >/tmp/tcpdump.log 2>/tmp/tcpdump.err.log &"
+		tcpdump_cmd="tcpdump -l --immediate-mode -i $iface not port ssh and not port domain >/tmp/tcpdump.log 2>/tmp/tcpdump.err.log &"
 		echo "$(print_time)${host}# $tcpdump_cmd" >> $CONSOLE_LOG
 		ssh $SSHCONF root@`eval echo \\\$ipv4_$host '$tcpdump_cmd'`
 		eval TDUP_${host}="true"