Commit 4080d0ad authored by Geliang Tang's avatar Geliang Tang Committed by Gang Yan
Browse files

selftests: mptcp: export ip_mptcp to mptcp_lib 

mainline inclusion
from mainline-v6.10-rc1
commit 29aa32fee7d0fdc71221158719137c1f4f5de3b4
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=29aa32fee7d0fdc71221158719137c1f4f5de3b4



--------------------------------

This patch exports ip_mptcp into mptcp_lib.sh as a public variable,
named MPTCP_LIB_IP_MPTCP. Add a helper mptcp_lib_set_ip_mptcp() to set
it, and a helper mptcp_lib_is_ip_mptcp() to test whether it is set. Use
these two helpers in mptcp_join.sh.

This patch is prepared for coming commits.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31c4fffa

tools/testing/selftests/net/mptcp/mptcp_join.sh

+8 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ timeout_poll=30 
timeout_test=$((timeout_poll * 2 + 1))

capture=false

checksum=false

ip_mptcp=0

check_invert=0

validate_checksum=false

init=0
@@ -616,7 +615,7 @@ pm_nl_set_limits() 
	local addrs=$2

	local subflows=$3



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		ip -n $ns mptcp limits set add_addr_accepted $addrs subflows $subflows

	else

		ip netns exec $ns ./pm_nl_ctl limits $addrs $subflows
@@ -656,7 +655,7 @@ pm_nl_add_endpoint() 
		nr=$((nr + 1))

	done



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		ip -n $ns mptcp endpoint add $addr ${_flags//","/" "} $dev $id $port

	else

		ip netns exec $ns ./pm_nl_ctl add $addr $flags $dev $id $port
@@ -669,7 +668,7 @@ pm_nl_del_endpoint() 
	local id=$2

	local addr=$3



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		[ $id -ne 0 ] && addr=''

		ip -n $ns mptcp endpoint delete id $id $addr

	else
@@ -681,7 +680,7 @@ pm_nl_flush_endpoint() 
{

	local ns=$1



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		ip -n $ns mptcp endpoint flush

	else

		ip netns exec $ns ./pm_nl_ctl flush
@@ -692,7 +691,7 @@ pm_nl_show_endpoints() 
{

	local ns=$1



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		ip -n $ns mptcp endpoint show

	else

		ip netns exec $ns ./pm_nl_ctl dump
@@ -705,7 +704,7 @@ pm_nl_change_endpoint() 
	local id=$2

	local flags=$3



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		ip -n $ns mptcp endpoint change id $id ${flags//","/" "}

	else

		ip netns exec $ns ./pm_nl_ctl set id $id flags $flags
@@ -755,7 +754,7 @@ pm_nl_check_endpoint() 
		return

	fi



	if [ $ip_mptcp -eq 1 ]; then

	if mptcp_lib_is_ip_mptcp; then

		# get line and trim trailing whitespace

		line=$(ip -n $ns mptcp endpoint show $id)

		line="${line% }"
@@ -3963,7 +3962,7 @@ while getopts "${all_tests_args}cCih" opt; do 
			checksum=true

			;;

		i)

			ip_mptcp=1

			mptcp_lib_set_ip_mptcp

			;;

		h)

			usage

tools/testing/selftests/net/mptcp/mptcp_lib.sh

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ MPTCP_LIB_SUBTESTS=() 
MPTCP_LIB_SUBTESTS_DUPLICATED=0

MPTCP_LIB_TEST_COUNTER=0

MPTCP_LIB_TEST_FORMAT="%02u %-50s"

MPTCP_LIB_IP_MPTCP=0



# only if supported (or forced) and not disabled, see no-color.org

if { [ -t 1 ] || [ "${SELFTESTS_MPTCP_LIB_COLOR_FORCE:-}" = "1" ]; } &&
@@ -505,3 +506,11 @@ mptcp_lib_verify_listener_events() { 
	mptcp_lib_check_expected "type" "family" "saddr" "sport" || rc="${?}"

	return "${rc}"

}



mptcp_lib_set_ip_mptcp() {

	MPTCP_LIB_IP_MPTCP=1

}



mptcp_lib_is_ip_mptcp() {

	[ "${MPTCP_LIB_IP_MPTCP}" = "1" ]

}