From nobody Tue May 14 11:34:25 2024 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 388BD46AF for ; Thu, 7 Mar 2024 01:14:24 +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=1709774065; cv=none; b=kTStFt8IOBdaMBAKOH+/TlAFVX/X0AhUszanzAi7PzY9YELUHFeDRrVRgUEb5Rbh2/8hZSTe16sQX6qpAYCg26j3AVd6DwaFAx7iKqG3LQ4J90qgXgUaoSsypw2D5KEtexhGRVnHmHdsPYihMHn2W3TU3UTCol0EQld1r/Q4o3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774065; c=relaxed/simple; bh=VVWmC214Oce0NYU+QGtxHZPqqb+WA5wGGr0i/rqFWLk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=D2G1L4rStepAO2fVjyvJKuzYSV+Jm7PfHUM9oNJFEzEcQZExM0mf1okJhGZ9MxKyMWrWxlpGbR49kfk+I8DS0Oq+tmDjS6XiG0aBZUQv4c8WuD6EC+phxkcd36V6V02P2rrircEutOvxa5T9DBmAn291Ak/Fpxj9jxq9/daQ5fI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B5p1V62/; 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="B5p1V62/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D40EC433F1; Thu, 7 Mar 2024 01:14:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709774064; bh=VVWmC214Oce0NYU+QGtxHZPqqb+WA5wGGr0i/rqFWLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B5p1V62/TGBLJjj5Xj+jdKoHAkSZYoIRA4k316tL9Dl5bDl+Bn4RvQ1G7ikFZ/uWp hMDPCHMvLbvfatUn9VJfmyjiCbBWEL4E2b6Zzyao9MeRHho8SpQZTJ7xLDPixrpS2g CfPzAbxfMBRJnFqee0uZh0Bd+W7Bx7XkyXeAI5vVXkz9A9DX7rObjomCFZAcGfbokr R7+hLJclWLP97rr4do/96/4Ih4CPfwY1tfraIelKNlmFXvxfFsGxALH8VQLxezLeUH KkFQPg0POhYslDBzao676WgjN+JsncBNLWnpxW2z53qgyI/cElbXpPqP2Skx8dGDKC pcAt5x01bFt9Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: connect: add dedicated port counter" Date: Thu, 7 Mar 2024 09:14:11 +0800 Message-Id: <17e1c8e1f7e8a30585c3b8d2b0711f3d8f4e460d.1709773913.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 Move port++ from the beginning of do_transfer to the end of it, then 9999 can be set to 10000, the same as 19999. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 5942256857a5..8feb4eef0931 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -33,7 +33,7 @@ do_tcp=3D0 checksum=3Dfalse filesize=3D0 connect_per_transfer=3D1 -port=3D$((10000 - 1)) +port=3D10000 =20 if [ $tc_loss -eq 100 ];then tc_loss=3D1% @@ -320,8 +320,6 @@ do_transfer() local local_addr=3D"$6" local extra_args=3D"$7" =20 - port=3D$((port + 1)) - if [ "$rcvbuf" -gt 0 ]; then extra_args+=3D" -R $rcvbuf" fi @@ -446,6 +444,8 @@ do_transfer() return 1 fi =20 + port=3D$((port+1)) + mptcp_lib_check_transfer $sin $cout "file received by client" retc=3D$? mptcp_lib_check_transfer $cin $sout "file received by server" @@ -719,7 +719,7 @@ EOF =20 mptcp_lib_pr_info "test $msg" =20 - port=3D$((20000 - 1)) + port=3D20000 local extra_args=3D"-o TRANSPARENT" do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP \ ${connect_addr} ${local_addr} "${extra_args}" --=20 2.40.1 From nobody Tue May 14 11:34:25 2024 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 EDDD74C83 for ; Thu, 7 Mar 2024 01:14:26 +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=1709774067; cv=none; b=lNByxvquaHhmRINWQW4Y74oB0+BY7dr3D3dPtqHSsiplvc1ZOLXedDMiYXme11UravYvwomB5fD5wFXH5ir312eHlx9aMvNRxK4E9qmE4z3s7gZ/2tskkNJww03S6Ho6Cn3zc2JfvTNMhmJJDE/wG9wS4BAwkc8GqvVp/lLHf8o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709774067; c=relaxed/simple; bh=tmwQFjGUw/JRfhIdHLV/tkT1enNtx4y3g24jcrM03nA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=htXQVj03VQ1Ehg//RzE2rzjfmUZdtzOHGgAVBEoN/A51tzzSPWeoN4wrYLp1d3BewZKK5vw9qAACceKwrePmgdQ2K0aouSsQnCRj0yOMDuJ5jmkGE4/diPsU6FPKxa+xG+kKY3ucbUJOBSD2uZZFLmDbl8uJ8D9QRm8Qd0RjZdc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LTZX2v3R; 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="LTZX2v3R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 531BEC433C7; Thu, 7 Mar 2024 01:14:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709774066; bh=tmwQFjGUw/JRfhIdHLV/tkT1enNtx4y3g24jcrM03nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LTZX2v3RjWJXilz/f/4su56YD+WsyKsPjc4gl+i1YvvGXPln8+JhoyMmFBKW3KmMe N9HtgRg1ksgMZPW3aWjDCaru2YxyQQq4RojO7aQ8/D2Xttdox0Q6EIVvoE+fwk3b4l YzJrJE7dKqekd4GGleSKbxVJprSZfRbwtuKqyb7Ti/ul9FDBWaMLeGoJLEDhJp5mJF If4ugusGUgv2qpE1vbBVUwTu2a/ygKJqIbhhY+1UbAqJu1Ih2JNNBrywCKkiAwbKNL MZCbs7W55SpuZ4d2YR1j7PBnIZ9vsmTVURMN6Dq5SHjFNaf4TKptr7CH8Ft4AXyyYF Use0990qcQMYw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/2] Squash to "selftests: mptcp: connect: use += operator to append strings" Date: Thu, 7 Mar 2024 09:14:12 +0800 Message-Id: <06f55d6d6a1f37da444bbaae9262079d300efe0d.1709773913.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 Append the fallback note into 'extra' string too. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_connect.sh index 8feb4eef0931..c1733c38a2de 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh @@ -451,6 +451,7 @@ do_transfer() mptcp_lib_check_transfer $cin $sout "file received by server" rets=3D$? =20 + local extra=3D"" local stat_synrx_now_l local stat_ackrx_now_l local stat_cookietx_now @@ -484,7 +485,7 @@ do_transfer() "than expected (${expect_ackrx})" rets=3D1 else - printf "[ Note ] fallback due to TCP OoO" + extra+=3D" [ Note ] fallback due to TCP OoO" fi fi =20 @@ -507,8 +508,6 @@ do_transfer() fi fi =20 - local extra=3D"" - if [ $cookies -eq 2 ];then if [ $stat_cookietx_last -ge $stat_cookietx_now ] ;then extra+=3D" WARN: CookieSent: did not advance" --=20 2.40.1