From nobody Tue Feb 10 03:39:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5168F12B167 for ; Thu, 7 Mar 2024 12:49:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815741; cv=none; b=I7/oU6PwMw83cAQY+5ay05NM+/A/FTYiUdWyFPe8XK5w2NugpXnGO20EWxW9YIj6Nlg1Stb36IGN8q/q89oHjhhNjfDS/AFg3rmEkt4WKVKZjF1n4ZiRODBY0hUw23m9U3+1ZTeI7GO3B+RcXIwMs83oPCYPLUycEy3CQEK8QRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709815741; c=relaxed/simple; bh=4eyl/dB4bwjfNf+rHDQV11kMa4aCbQG6rLZv4xB1bbA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XzHL5E0ms3yEVr09GHfzapGPrHYq4ZPCCJe3vCVOic0DQLFAZUdjzSd8HOeZrfUX6Xmw7feKXQ6JiNrLTuH7Q+VToBgbeZc0zaElca9lQY5++MDTSeMK3XYY5E0/4Zm587rEtpXfg1Z8NYgvzT5VY8rJRbdqZz8X/UfuKFwOB1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L3Ohn8xb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L3Ohn8xb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04E7AC433C7; Thu, 7 Mar 2024 12:48:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709815741; bh=4eyl/dB4bwjfNf+rHDQV11kMa4aCbQG6rLZv4xB1bbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L3Ohn8xb440Rlxe+GrxzBwKqghRD8gHqcsfGEbG9yXTOXO02Nmec4JLMpwLAXugJr 5MRKGCV2E5R/3+KbpCKNZ8kySzmXXwGNgka9mSFYHewqBeDDg61xLEAr/6dVDY5es+ /ABCAUQ1gEaMSPqsBns4pOmVeuo/1JN25XkVRq9BYXJQvHHtmTRevMZrg+EEU8iJpI aoWpbqnd3vfGdmULXBylPCTHet37Vy7IvSHuSIuF7+hb2Fcpc0l69caMqJb93xLKCk Up6HgzOB8WlScLJhTY5RNn9850D9h3CFvgCq0c9LVUoGoAcSfL2SMDPBGyMDvpJBtP n5W1t+Ms7gbYA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/5] selftests: mptcp: add mptcp_lib_verify_listener_events Date: Thu, 7 Mar 2024 20:48:41 +0800 Message-Id: <85bb025586bf9f9a185e9b1c0ec21fff16626b20.1709815545.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang To avoid duplicated code in different MPTCP selftests, we can add and use helpers defined in mptcp_lib.sh. The helper verify_listener_events() is defined both in mptcp_join.sh and userspace_pm.sh, export it into mptcp_lib.sh and rename it with mptcp_lib_ prefix. Use this new helper in both scripts. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 23 +++----------- .../testing/selftests/net/mptcp/mptcp_lib.sh | 26 ++++++++++++++++ .../selftests/net/mptcp/userspace_pm.sh | 31 +++++-------------- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index cecf09d14f46..f28b10a61268 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2792,16 +2792,12 @@ AF_INET6=3D10 =20 verify_listener_events() { - local evt=3D$1 local e_type=3D$2 local e_family=3D$3 local e_saddr=3D$4 local e_sport=3D$5 - local type - local family - local saddr - local sport local name + local rc=3D0 =20 if [ $e_type =3D $LISTENER_CREATED ]; then name=3D"LISTENER_CREATED" @@ -2818,23 +2814,12 @@ verify_listener_events() return fi =20 - type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") - family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") - sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") - else - saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") - fi - - if [ $type ] && [ $type =3D $e_type ] && - [ $family ] && [ $family =3D $e_family ] && - [ $saddr ] && [ $saddr =3D $e_saddr ] && - [ $sport ] && [ $sport =3D $e_sport ]; then + mptcp_lib_verify_listener_events "${@}" || rc=3D"${?}" + if [ "${rc}" -eq 0 ]; then print_ok return 0 fi - fail_test "$e_type:$type $e_family:$family $e_saddr:$saddr $e_sport:$spor= t" + fail_test "$e_type $e_family $e_saddr $e_sport" } =20 add_addr_ports_tests() diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing= /selftests/net/mptcp/mptcp_lib.sh index 44491f18ed17..aefe4db47656 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh @@ -468,3 +468,29 @@ mptcp_lib_check_expected() { =20 return "${rc}" } + +# shellcheck disable=3DSC2034 +mptcp_lib_verify_listener_events() { + local evt=3D$1 + local e_type=3D$2 + local e_family=3D$3 + local e_saddr=3D$4 + local e_sport=3D$5 + local type + local family + local saddr + local sport + local rc=3D0 + + type=3D$(mptcp_lib_evts_get_info type "$evt" "$e_type") + family=3D$(mptcp_lib_evts_get_info family "$evt" "$e_type") + if [ "$family" ] && [ "$family" =3D "$AF_INET6" ]; then + saddr=3D$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type") + else + saddr=3D$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type") + fi + sport=3D$(mptcp_lib_evts_get_info sport "$evt" "$e_type") + + mptcp_lib_check_expected "type" "family" "saddr" "sport" || rc=3D"${?}" + return "${rc}" +} diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 6ab9efda8627..28669e49de80 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -836,32 +836,15 @@ test_prio() =20 verify_listener_events() { - local evt=3D$1 - local e_type=3D$2 - local e_family=3D$3 - local e_saddr=3D$4 - local e_sport=3D$5 - local type - local family - local saddr - local sport - - if [ $e_type =3D $LISTENER_CREATED ]; then - print_test "CREATE_LISTENER $e_saddr:$e_sport" - elif [ $e_type =3D $LISTENER_CLOSED ]; then - print_test "CLOSE_LISTENER $e_saddr:$e_sport" - fi + local rc=3D0 =20 - type=3D$(mptcp_lib_evts_get_info type $evt $e_type) - family=3D$(mptcp_lib_evts_get_info family $evt $e_type) - sport=3D$(mptcp_lib_evts_get_info sport $evt $e_type) - if [ $family ] && [ $family =3D $AF_INET6 ]; then - saddr=3D$(mptcp_lib_evts_get_info saddr6 $evt $e_type) + mptcp_lib_verify_listener_events "${@}" || rc=3D"${?}" + if [ "${rc}" -eq 0 ]; then + test_pass else - saddr=3D$(mptcp_lib_evts_get_info saddr4 $evt $e_type) + ret=3D1 + mptcp_lib_result_fail "${test_name}" fi - - check_expected "type" "family" "saddr" "sport" } =20 test_listener() @@ -877,6 +860,7 @@ test_listener() # Capture events on the network namespace running the client :>$client_evts =20 + print_test "Listener event LISTENER_CREATED 10.0.2.2:$client4_port" # Attempt to add a listener at 10.0.2.2: ip netns exec $ns2 ./pm_nl_ctl listen 10.0.2.2\ $client4_port & @@ -895,6 +879,7 @@ test_listener() rport $client4_port token $server4_token sleep 0.5 =20 + print_test "Listener event LISTENER_CLOSED 10.0.2.2:$client4_port" # Delete the listener from the client ns, if one was created mptcp_lib_kill_wait $listener_pid =20 --=20 2.40.1