tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests: mptcp: join: change capture/checksum as bool

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2097575

commit 8c6f6b4bb53a904f922dfb90d566391d3feee32c upstream.

To maintain consistency with other scripts, this patch changes vars
'capture' and 'checksum' as bool vars in mptcp_join.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240223-upstream-net-next-20240223-misc-improvements-v1-7-b6c8a10396bd@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Stable-dep-of: 5afca7e996c4 ("selftests: mptcp: join: test for prohibited MPC to port-based endp")
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Geliang Tang
2024-10-18 17:57:37 +02:00
committed by Stefan Bader
parent afa6359d2a
commit 13dd7c74cb
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/testing/selftests/net/mptcp/mptcp_join.sh
+11 -11
View File
@@ -30,11 +30,11 @@ iptables="iptables"
ip6tables="ip6tables"
timeout_poll=30
timeout_test=$((timeout_poll * 2 + 1))
capture=0
checksum=0
capture=false
checksum=false
ip_mptcp=0
check_invert=0
validate_checksum=0
validate_checksum=false
init=0
evts_ns1=""
evts_ns2=""
@@ -101,7 +101,7 @@ init_partial()
ip netns exec $netns sysctl -q net.mptcp.pm_type=0 2>/dev/null || true
ip netns exec $netns sysctl -q net.ipv4.conf.all.rp_filter=0
ip netns exec $netns sysctl -q net.ipv4.conf.default.rp_filter=0
if [ $checksum -eq 1 ]; then
if $checksum; then
ip netns exec $netns sysctl -q net.mptcp.checksum_enabled=1
fi
done
@@ -390,7 +390,7 @@ reset_with_checksum()
ip netns exec $ns1 sysctl -q net.mptcp.checksum_enabled=$ns1_enable
ip netns exec $ns2 sysctl -q net.mptcp.checksum_enabled=$ns2_enable
validate_checksum=1
validate_checksum=true
}
reset_with_allow_join_id0()
@@ -423,7 +423,7 @@ reset_with_allow_join_id0()
setup_fail_rules()
{
check_invert=1
validate_checksum=1
validate_checksum=true
local i="$1"
local ip="${2:-4}"
local tables
@@ -1035,7 +1035,7 @@ do_transfer()
:> "$sout"
:> "$capout"
if [ $capture -eq 1 ]; then
if $capture; then
local capuser
if [ -z $SUDO_USER ] ; then
capuser=""
@@ -1137,7 +1137,7 @@ do_transfer()
wait $spid
local rets=$?
if [ $capture -eq 1 ]; then
if $capture; then
sleep 1
kill $cappid
fi
@@ -1525,7 +1525,7 @@ chk_join_nr()
else
print_ok
fi
if [ $validate_checksum -eq 1 ]; then
if $validate_checksum; then
chk_csum_nr $csum_ns1 $csum_ns2
chk_fail_nr $fail_nr $fail_nr
chk_rst_nr $rst_nr $rst_nr
@@ -4047,10 +4047,10 @@ while getopts "${all_tests_args}cCih" opt; do
tests+=("${all_tests[${opt}]}")
;;
c)
capture=1
capture=true
;;
C)
checksum=1
checksum=true
;;
i)
ip_mptcp=1