mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-11 13:04:03 +08:00
selftests: mptcp: join: change capture/checksum as bool
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>
This commit is contained in:
parent
fccf7c9224
commit
8c6f6b4bb5
@ -29,11 +29,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=""
|
||||
@ -100,7 +100,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
|
||||
@ -380,7 +380,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()
|
||||
@ -413,7 +413,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
|
||||
@ -1017,7 +1017,7 @@ do_transfer()
|
||||
:> "$sout"
|
||||
:> "$capout"
|
||||
|
||||
if [ $capture -eq 1 ]; then
|
||||
if $capture; then
|
||||
local capuser
|
||||
if [ -z $SUDO_USER ] ; then
|
||||
capuser=""
|
||||
@ -1119,7 +1119,7 @@ do_transfer()
|
||||
wait $spid
|
||||
local rets=$?
|
||||
|
||||
if [ $capture -eq 1 ]; then
|
||||
if $capture; then
|
||||
sleep 1
|
||||
kill $cappid
|
||||
fi
|
||||
@ -1507,7 +1507,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
|
||||
@ -3664,10 +3664,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
|
||||
|
Loading…
Reference in New Issue
Block a user