From nobody Tue May 21 10:11:29 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2059.outbound.protection.outlook.com [40.107.7.59]) (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 8CD0710FB for ; Fri, 30 Jun 2023 02:42:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AZiOGFih7yBn5kfDu80WjB/L3oac0yArGkzT6+f69GJMC3D166v4LVKANQfHo24ZhYmA3LGJDzkiodrYRSytVvTy1aT7F43oDywRSRRIEFD9jlnWUsn6l4niex0hZRtCEx6DeRNnAOrk4clfGNMZCWQSC76CPC3IO/lex4KLgRoiMuOVKUPV+P1viYb1e66wzNbwqae/eD9RdKG5b0onoFF3bEPyZU6XSudbXAx/uu+Y5GOOMRBVa6d+kZFScFscDfo8ghqh/ug4e7V0Fg+oYchk4vZSpIZgjdenpY6WlnGjl/kvpxTk4NxS2FyaMjkzXVYdnYIEEz0evGPOy3q1QA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e9sL/f0sbZKvMT06qbnZ9CmztkUvyrHyOLnfPR5o5vY=; b=ZAgMJElMdeiNuz25takC8hJZ5MunhluPzowu6REV24aNg5ryWGmW3TDAieJnNOp5VInCrjBKTni64e16GXKjzE4y3R5onfcEb1t3zRzfHgZyfDxacl8c7m4YA66jX32CBpoXDTDNhyy3iRasTURofMnsYE7IGf29VmgNs8BGD+wlu66g0QBzoJaLRo2WYquymqE/f39l1xnA6OWld2FaCCguhvP9Css1uvKbFVe/uVlf8vCO1oyWnRz996ygpBZe6/1bbdP0k3B9Fjfdxgj3RJwZE+AwQXQLJ3zcYbSAz9GEjxBGP/wp07PLYYC77nYjRc6y1hpDDgvnj7KYznhM6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e9sL/f0sbZKvMT06qbnZ9CmztkUvyrHyOLnfPR5o5vY=; b=3mVoJu/Cl58UeSk+5V0VRtfVbc8594RVaD5pKsYq4ngwdiyaInkGIRmAwLhGWwTau1tQxYyresNK4OdNM7C3aKpdzU4nbmzGn4b/mU31WhowH6a3eS8+F3rioObRjyBkv/EcWNyH2L4jvQ7ufOfBe4PTclBGmFs9+lMXQPH8evDVdbJguAPwB4aNxXXkEnWyQn5PNo0KVk+qkKkV9v0jO4ARfaFqjYwEY8x0DBnLFbjr0kZ/lCwkSqWIebQzqp8ahmceRFvQaLnQOEN2MbCgVl1ZmEwHrGjPBSO5P7FJBT5FdZumSeIBr+0td2MNi75yIwEFcXprSrlRgfLsd9OFWg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 02:42:45 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Fri, 30 Jun 2023 02:42:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/4] selftests: mptcp: set all env vars as local ones Date: Fri, 30 Jun 2023 10:42:31 +0800 Message-Id: <0c0c8ee5bd9c49c17565d018e4bd6985901ac7d8.1688092826.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:195::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 5fb6c693-38c4-4a98-3c01-08db7913af34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NXliX30QkCz8W0h4V5zuHVfSlNZP8OxrIk209/aNLZMVuHUoWMmpMdTHNhOh8kvzoofliskAXxVKXYYUsTTjU1QSZpXpZhG5/+6SXibvtT6F1Z4y+Tq6cpHxUEZj4Xqx11dmj1hKZi5ANoWM6wfe0N/soPuySUGY6tZYEzrA/GyhBDgmZK/VvpHbtfMsfh032uIYFIYngv3RUYG/dma2ecwW32nWspXDEAFZCwf35/6mUlKFKjQ+OiURCqjOwRv1JoPDXbXlmvMIrXaSwY18RqIuIBrZiG+0GH7DOTLljPLYESDCVy+h3WDIB/e40ZB/0dIsq+MB1c4v32HbwbFR8wztzbWtUH3dmABZWUWMXRPLBmtqO02a3gLAUDZg/ZAlGcH59Dd/RDniJJyTYMGDtNl2Ozl2TVF6iSXe06qNgw1a7sABHszzY9oYbnQltINakVdLbQuDexB7ztRwnrxqF6IxFJXrdHLWNqGh3YtaopnmKnIiFZJLihzGOmjBaJIQZjCufmvRyPmz/k6uZ6TkWG+lkpBGhLz/KhH+UNKh6HVXHXxtS6Tsr/0nZGGGURMR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(376002)(346002)(366004)(136003)(39860400002)(451199021)(86362001)(107886003)(8936002)(8676002)(5660300002)(26005)(6506007)(44832011)(6486002)(478600001)(66946007)(66556008)(66476007)(6916009)(4326008)(6512007)(41300700001)(316002)(6666004)(186003)(2616005)(2906002)(83380400001)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SE2GWi1xhhBusjcVzTL69LaJF5kF8oqXMIkPeBmMq5SLu0exy7uKOKGzlAaw?= =?us-ascii?Q?jfDRWjhbFAFutpLEwtDUGuflrnlb4f/XgX1y8ZY2DJdBvEsbbbj54jLHYeu6?= =?us-ascii?Q?jIIaQRQ+Tb5ofrZATtVpNHa7ZOOdft4x1a7zqUAVF5RpOdm+622WBUxdC+W6?= =?us-ascii?Q?AGCSq8p06gTUlf0qK9geALPy8sMuARZ5Xt1B44lAOiNokmj+FhYCWQb10wdX?= =?us-ascii?Q?Tk9N15LxnIAyWq4pMf+9JwDhTlMsaD9OnEtkVkIJfEPWQGhLOKtsS0BoJ+lT?= =?us-ascii?Q?K7CMrqYKocbpabOMRlq8Mkq7c70gOGLBLXRCviC7xYgQxncRyNRg120K9EGX?= =?us-ascii?Q?BQYBU0TDFTDV/Uw8GK+BPa+ycmbZ/VosKu4527qu6+OgzhC3YjgUTof1geh2?= =?us-ascii?Q?AnUhqPN6ljVoyBIcFmIv8da3XtNPz4nglsOzjCjatVjBWV9ALcVNv5eSNNjj?= =?us-ascii?Q?vsv1kuN8iayf83n0hgVtnHu1ubHPE4H7qjVJPkO34ps5KcWvT++tsC6uLkHw?= =?us-ascii?Q?j2nH7nDnUK5tvQcSDddP8EK5GphwpC3BAAu9oWAgHYwkJk3yxcMZ6wgMJIo2?= =?us-ascii?Q?nRaoV60lUxXXk5hWOuJsPi98aNixPJXRQvVAQRhuKwECloNpk6n7JXEvwRYm?= =?us-ascii?Q?LN1VTkG5e9wTJTZxPBSXUMtoOXD10iVz1IsFUx0veEWWaHCRmKKK6f2KciCO?= =?us-ascii?Q?N2tNckJCs2PFz/LjBJSwcWkoSOZ4MQfflOGm1MJzhhvpkgRXm1YuZhkgF082?= =?us-ascii?Q?th5HLI6s8Dus/yPLS78/1FjxYX76QSiEBnLs8JwBp0IBmi8ferPvlKapu+fL?= =?us-ascii?Q?wB5dWm9FfvoZ5F1me8IlHFuFQHSBFsk84Aazd4mVcVjK+CAhfSeoyfcpZ5Dq?= =?us-ascii?Q?oC1MYlwwxxONeLwUUZkpgB3euRy8KRCaImBvOw436uumvh62ml8jQmPm5+Ie?= =?us-ascii?Q?sew65qHF5bRvfcEwmqohCKk39lq3OiyLad3JPo/IaQNUYdgyAKCeDMVoktMZ?= =?us-ascii?Q?/3DiNksH/6qxh8iwKWCKrRnI5sxv6tEraLBXCeNsiORJ7msS9rjSfKYNFD/y?= =?us-ascii?Q?Pi+l7eSbkvyP60M/r2Cs/jHBkYv39RSXfbAo7u6vz7b4fDBKszf16oYNZDYJ?= =?us-ascii?Q?kuUE4rFIkA5ZCx6VB4at5WknhzdSFdkU+1sQBmQLd8o7VNYtk/hJTV7M8QJA?= =?us-ascii?Q?jS/FWx3QH6NiT9K/5VjghfweGWbN0wibwXi3njrCWjvlO8tjOz60M8V25+4c?= =?us-ascii?Q?fU+Cm0HoWpgwUtT6Dx1WQaiUa2X7WOfqpDLmljXd/cx+zEZvoMfS7iSPaZUQ?= =?us-ascii?Q?LxY/bsRvphrHrim8p/oGN+IC9Wi/qAXrUGUaOKYpEorFnp6wcZekca2JlamU?= =?us-ascii?Q?3I4PNILSRJ0m75M/qa8ZcDbaum+v/jCKvUu5BsXqOcA1PNiG2KbUUFIhu5vP?= =?us-ascii?Q?NUDDUx5kwLVlDtP/IQUDVcthnm7//RmkriNjeFJKdxKIUOMTr81Yy0ORLCO6?= =?us-ascii?Q?5+WGXdPB52/OlPU8sQ57GDuceMPXR9RwxupGT2kB9UVEjKbhmVTVi6eKCczV?= =?us-ascii?Q?BbyeqDJuuMzTZmUjOcip2cGZ0brW4qi7v31fu8pa?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fb6c693-38c4-4a98-3c01-08db7913af34 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 02:42:45.6762 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Q3htEt8uL6Ifw09bQ8lrKlDlS+gSAH/shedXQ58k7mDkaSvpG6kZ9qEaUAj1LQ+sQ7mHiCVtO8JtbS7ibOebLg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" It would be better to move the declaration of all the env variables to do_transfer(), run_tests(), or pm_nl_set_endpoint() as local variables, instead of exporting them globally at the beginning of the file. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e6c9d5451c5b..ad0717cb0d7e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -49,11 +49,11 @@ TEST_COUNT=3D0 TEST_NAME=3D"" nr_blank=3D40 =20 -export FAILING_LINKS=3D"" -export test_linkfail=3D0 -export addr_nr_ns1=3D0 -export addr_nr_ns2=3D0 -export sflags=3D"" +FAILING_LINKS=3D"" +test_linkfail=3D0 +addr_nr_ns1=3D0 +addr_nr_ns2=3D0 +sflags=3D"" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -100,7 +100,6 @@ init_partial() stats_dumped=3D0 check_invert=3D0 validate_checksum=3D$checksum - FAILING_LINKS=3D"" =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -828,6 +827,10 @@ pm_nl_set_endpoint() local connector_ns=3D"$2" local connect_addr=3D"$3" =20 + local addr_nr_ns1=3D${addr_nr_ns1:-0} + local addr_nr_ns2=3D${addr_nr_ns2:-0} + local sflags=3D${sflags:-""} + # let the mptcp subflow be established in background before # do endpoint manipulation if [ $addr_nr_ns1 !=3D "0" ] || [ $addr_nr_ns2 !=3D "0" ]; then @@ -979,6 +982,7 @@ do_transfer() =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid + local FAILING_LINKS=3D${FAILING_LINKS:-""} =20 :> "$cout" :> "$sout" @@ -1158,6 +1162,7 @@ run_tests() local speed=3D"${4:-fast}" =20 local size + local test_linkfail=3D${test_linkfail:-0} =20 # The values above 2 are reused to make test files # with the given sizes (KB) --=20 2.35.3 From nobody Tue May 21 10:11:29 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2074.outbound.protection.outlook.com [40.107.104.74]) (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 1C7A5EC3 for ; Fri, 30 Jun 2023 02:42:54 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hHjETA2iz0mR02XWEPNtkBJ5xgdrZpAdsKkLabLyUTO7yR/P1tL+G9I0W8qTpuq97K7lHORRfIqGOAR6nwir8Gyoa6bDZGhdt/AW6KcJfyDDjp3esh7HYAG6Urgsso/09DpV/UnKyPRZiy+FurZKyCdh3HPbS4nKMZT3VEy2/31Qf9ILOSmDAKE6aDbm77L9lzwY8l/7MI2PZm5tOw5npzmPQ7BcZWDtELji4Oc5D+IBC15yVBXj3rvktUqbzBdXGtAoeQMg9h6RLC1r2BHtytqky7tJ7FjecyC+cjmQod+aqKrd1ZmbqI+2sNtFbD4mmgHN+TiMcr/M7d8/bY1zpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zXl0pWak1x6tbzqh8MyjgRIYfHmLHaWi2nc9ECveKaY=; b=BIz4/Abx4Bi1g10nMbkXxnizeH5WlYTXtpTM3XiJ/D52HjF3CW8Cg+EGVaIPlNuqc2XVZyaoJFrpqSIVr/2VQQA6tcVhU1ZdOYJ2OK+XvxcH5Hvf4ZusarDM/nOPfjl1jaPk8zAfAAE5josxcJATGyhEGn1imBYImDB97Z5Z94z0tgAEvnnoObeJ0wT0wVrMkh6mL/tzVA/eJNAozy5cHxXJ6OZetcR48NRO6Xvm9wL84h+FWlN9hCbD81PxCwSUlGsykwR7gfIQYUNA4SYrdeW/zpNm4W9r5hXj2FYlRoUzyCHS+3Ycuadkq81HOOPvtQXPRJrttYw3KqF9Fe8fYg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zXl0pWak1x6tbzqh8MyjgRIYfHmLHaWi2nc9ECveKaY=; b=zQJRdEVJTDNRur2W11EVFsbyMB6WUIcprt4W49gZsfOMa9VujOEWAIIe7QJ1D2h6gji2dkZaQzLN5nTyJlMzwWgPH/f1wAsO2UgDdOw7oOAyPwu6ip4l/E93/9gcFp42J+p6onSAZksJoEISpOU8akIFPBANigiRoizah+g07cLwLBhQssUh+mSPZaYbSab2xY0AUF4Rno5EcwS+cgj6fq6Y1/1PBqPs94rIEq3ErIXlE9I8S/anT6V0E7hw5UfMFr5HffmB0aRG8fJFUBdeCPW9qxz5i0hF40TbXPmDP5t1QFSHqiCMzb7ggfcTrNfhlknueGwHSvbb2vkc6oL2Wg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 02:42:52 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Fri, 30 Jun 2023 02:42:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/4] selftests: mptcp: add fastclose env var Date: Fri, 30 Jun 2023 10:42:32 +0800 Message-Id: <32cdac17a13eec3b0f8ad2ee4c3b213063738f27.1688092826.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0020.apcprd02.prod.outlook.com (2603:1096:4:195::7) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 20630394-e259-4115-cf42-08db7913b34a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 69wONpJnoALD4H41AAc8i7RBYxM+GJNOxyThb5O59UL44jGRx7bf6/ysybUWAH51zvxRiSxN4GhmbCQEGP+Ux+B4x2NohmTGCrHowC0o9aAJyFeXyDVgEfJIUCmfuGf4eBqP1P6XpZUitCgDR+LCLUmdAH0tCMEbidguS0X4IW59jxKTdPVAthjQtY0jac1Tcha8PV8ux/Rqrl825aTLrmJr7gKLgcQt9yHK8gGhOFXsUDxvbRLl1ERVR7SX1z6QS1eOOQ9MEVasdcD1DJA4Gv3odubpcw5ZIP8WgpMn77zv0dmgaEHHRlgvprdWUWvqeUbvbMLwSGwSRCsL1QVQVy8nsvxx3Bs+tw4T5IqNwmkM7wgLNJMDLue5CmCFtv1leVaIsPCyvitLO9xRSz1Z6KuOSEp095205zvUg+3luqkewU+DSFk/ePAT74kEm/ROdORHAjxRPd5e0SLrlHu426bZQIci38hrQ7i4NSF+QwcmFxWTC4tjWYfGo1yDvmnbGLFXSdHeaTgiUPpvLAeFzalFfkMppBI48nUsYBG7BF+mY2lQRVNqNGJT7h51rFdk X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(376002)(346002)(366004)(136003)(39860400002)(451199021)(86362001)(107886003)(8936002)(8676002)(5660300002)(26005)(6506007)(44832011)(6486002)(478600001)(66946007)(66556008)(66476007)(6916009)(4326008)(6512007)(41300700001)(316002)(6666004)(186003)(2616005)(2906002)(83380400001)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ojfa+clS+GYW0rWwQor3RkSTARlkYWSYnGkzGbPskrjbRHSsrKfSgXcLPWWy?= =?us-ascii?Q?dqEYX+5OhDv9a+cd+vCKukiYOq17ZfVSuTdQ24IKYwTEWD1xIZFXiCKJbwDf?= =?us-ascii?Q?Uc6UVWb2j4mNq7ca5HoZF9xZDOJpiiAB+3lOdMTRAMvnahbaBiySv7DoaZ1z?= =?us-ascii?Q?mNl9Jp+1AnI/orifHpbSO2DtLHCxNluC8Va5l4WG89Gkae8fdMR6JxD/mAGB?= =?us-ascii?Q?k2JbLYE/ugVOX7+u4CuJIJDm/vf4Stvf/0vgk79PIm8bJfMKzNu4bSfPeFRN?= =?us-ascii?Q?zoNdUrAPyiI36I34QqBahPM5cjaiRgXg9Debh6tFCWp+LQrtKw/K4Osn5dNq?= =?us-ascii?Q?VQm/PLj6CW8/u45XGS53GIV8MLR8FBy/20kvBEBd+j5qE4z9MqKPW65Dj6VJ?= =?us-ascii?Q?KdoIQFUlO2j4x+QuOM7AggJYb3HI3vJKXyBcRrMp64grZd0Uzt+d3Fh3N2PO?= =?us-ascii?Q?zAL515/GXoIJ7nCd7m/su3ZvV42okGRyRCoJOpUkw7eVDzcjwz1M7oi6oCe2?= =?us-ascii?Q?um40L09D+KhvtDHnW9sI6MIvzcTI1WhZydHnmUIjbJiQOHF0NrSe9o7qG+1e?= =?us-ascii?Q?iOpOiVrJVo4I/Oy7GJTFqXyLxyhWHLXgDEuXlPEMGaRQf1S2JOBMCrfXPgAt?= =?us-ascii?Q?dbTxwxYHGTIF8KZiESWW8OV0owWCVh1Ga/22/2gJ3BV/Xzu39WAzIqVDt6uH?= =?us-ascii?Q?+ZsSDDPxz9VeWNaXSfiPhZMvl/1IyTfDfIO4imIEjbhRmNZiLaatTDxwFNF4?= =?us-ascii?Q?9UXrpy+x/NU4K/oynJnkXv7R0pZhNPDZDWtgDHsL2iN7f1b2hKXXAD6jV+Ad?= =?us-ascii?Q?yZhZ6ngyYCyFh4+Wup5WYQLN3TSLf6G6Egv0BfMxMNNk6Qd0t4t/gvo1P09y?= =?us-ascii?Q?IGyE2aI18e2IzocpuluS3NmcHSGdPsL0onTYrb/PAOjqyzd6whRPdkJCuKP9?= =?us-ascii?Q?NzqQUHSLEBLk9oQhk9b73kPl95dhfhy9+dgtq3EuuzKVNAlHPXTBgHXCNlLs?= =?us-ascii?Q?Y3OSmc+miDKpQR/kY/rtpddaWhJ6946hPdYtnlIpRpiL25aWRiAIemHO4WR+?= =?us-ascii?Q?XJDKobxuclAVoBdieKr2oVRDkhdSz9T+OjhfcpOT+VbMfTid2bKH8rKauOP2?= =?us-ascii?Q?HJ/m03bUmQT0shyAb/0wWBENXic8jXzGAGPQIy8D7J02jvjYTWIVI6jWXwbr?= =?us-ascii?Q?1ZWRTJYJhiQmy5Lg4TGSLzFNQxSLXkhupTg7M7lvlV8/yTdzhmfyJX72m0+J?= =?us-ascii?Q?vUwnbiDGKcdz0Kk7r5hZgIfVPmiN3H26l5cb/EBJ2q5OdBT8/lSlUmeAGcr+?= =?us-ascii?Q?L6z4YRXVs51JsppsS3UU2+sTNpw4xFkKDd2v5KeXIBFyi3aoIUG6z+zafVIf?= =?us-ascii?Q?XV51opxvQce8jbFymr3C+Ei7INrEKkCuBWvzdUElp3WRndKVXxG/yYJpClW5?= =?us-ascii?Q?ZcYPVYZOTLnsiCdeZVtDK1fVzWB1KOPR20kx/mlJzrjMGjuYVoJepHTSNGJx?= =?us-ascii?Q?pkF4gHBcI6oNaq+BUEIgonA2zAcDfJDOjqozWPcHs7UbDAUG0xsqiDsDBVoX?= =?us-ascii?Q?dDn15fzyoIReXec5jrEr2bcCoLYTGAZdZ7fFSW2O?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20630394-e259-4115-cf42-08db7913b34a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 02:42:52.5473 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5ayqYe7EvGXhxyOgLQgq/9RzkntL7bNuUcqgXZy3gWhuVQEAUybvH+MJS9KuRMMBScUsV+6z3dtbieW3oSeSjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Use a new env var fastclose instead of passing fastclose to addr_nr_ns2. It can be set with 'server' or 'client': addr_nr_ns2=3Dfastclose_client \ run_tests $ns1 $ns2 10.0.1.1 -> fastclose=3Dclient \ run_tests $ns1 $ns2 10.0.1.1. With this change, the fullmesh flag setting code can be moved into pm_nl_set_endpoint() from do_transfer(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ad0717cb0d7e..9b12573c55eb 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -54,6 +54,7 @@ test_linkfail=3D0 addr_nr_ns1=3D0 addr_nr_ns2=3D0 sflags=3D"" +fastclose=3D"" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -831,6 +832,12 @@ pm_nl_set_endpoint() local addr_nr_ns2=3D${addr_nr_ns2:-0} local sflags=3D${sflags:-""} =20 + local flags=3D"subflow" + if [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then + flags=3D"${flags},fullmesh" + addr_nr_ns2=3D${addr_nr_ns2:9} + fi + # let the mptcp subflow be established in background before # do endpoint manipulation if [ $addr_nr_ns1 !=3D "0" ] || [ $addr_nr_ns2 !=3D "0" ]; then @@ -983,6 +990,7 @@ do_transfer() local port=3D$((10000 + TEST_COUNT - 1)) local cappid local FAILING_LINKS=3D${FAILING_LINKS:-""} + local fastclose=3D${fastclose:-""} =20 :> "$cout" :> "$sout" @@ -1019,11 +1027,10 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 - local flags=3D"subflow" local extra_cl_args=3D"" local extra_srv_args=3D"" local trunc_size=3D"" - if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then + if [ -n "${fastclose}" ]; then if [ ${test_linkfail} -le 1 ]; then echo "fastclose tests need test_linkfail argument" fail_test @@ -1032,7 +1039,7 @@ do_transfer() =20 # disconnect trunc_size=3D${test_linkfail} - local side=3D${addr_nr_ns2:10} + local side=3D${fastclose} =20 if [ ${side} =3D "client" ]; then extra_cl_args=3D"-f ${test_linkfail}" @@ -1045,10 +1052,6 @@ do_transfer() fail_test return 1 fi - addr_nr_ns2=3D0 - elif [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then - flags=3D"${flags},fullmesh" - addr_nr_ns2=3D${addr_nr_ns2:9} fi =20 extra_srv_args=3D"$extra_args $extra_srv_args" @@ -3185,7 +3188,7 @@ fullmesh_tests() fastclose_tests() { if reset_check_counter "fastclose test" "MPTcpExtMPFastcloseTx"; then - test_linkfail=3D1024 addr_nr_ns2=3Dfastclose_client \ + test_linkfail=3D1024 fastclose=3Dclient \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 @@ -3193,7 +3196,7 @@ fastclose_tests() fi =20 if reset_check_counter "fastclose server test" "MPTcpExtMPFastcloseRx"; t= hen - test_linkfail=3D1024 addr_nr_ns2=3Dfastclose_server \ + test_linkfail=3D1024 fastclose=3Dserver \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 invert --=20 2.35.3 From nobody Tue May 21 10:11:29 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2064.outbound.protection.outlook.com [40.107.104.64]) (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 8D78E10FB for ; Fri, 30 Jun 2023 02:43:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I1T265YHTCbJ3oH9vRa9pt5vpuxTK0fRV/rC9jdoISTDSM+Ek7506NRdB0bSnVHvyr/zFA/uWK+C8BryWqrLMsNm0HzfSC0NIA43nrQ+6nFTISFKyYSUY4XVqx1AE7Kos1rFVC4Zs/QVgPNZGyHE6teoF6NY9Jt5X6YmHA+hi/bm+97XG6ml6THlTihehjzKujKXeXqAsCe0f8jPSKk1f1jbMnE2P01xiThlQbCFWG3YaoKso/K2Ttr6nPhnLwLKyK4yevdJsdFiUQrOhEQre/FBobLcQBlPNmzHAXpHQkE99PcCo1B3tdYT0oFK8FC7hejlOGVDNuCs1c9VpEKiIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=A6AF0D5ZnDYG0YqUT7AWrGN56Xel0eGKLvjbUReK2vs=; b=FLICil/rb1bP6bOI0wJx4GoU+XIItgLnxMMT7WNnIGfCZomBAv2X+zQwDJPj5Jt76ILaHqF82dHhi1vi32S2XF0ZC6PdniPhF6iSIPvp/KW6DlPEISL1DvK8QtqmTRy3Z0jS6yZ9wSz3jPj5My/3+t0/ej4SUxiTonWhYY3+O1PUTUMp2c4WJI+MLHcjx3L4XFibxKm0GpmwB8kA+MwUd/gk1OMhUWV+8i8raNvzCRla0d3aB+W6ZPjQIWZtAJHVf8GJmw1SsOHZUQywFIcCaDCcjRbyq6OrQXaQs5kIxXNEOGbvZYlrqZ+u8jiYJVDBz0iqdHM/OXZL7gUpnWApCA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=A6AF0D5ZnDYG0YqUT7AWrGN56Xel0eGKLvjbUReK2vs=; b=I3TRc3i6Of3HxW04foidHvywk7X1MIpTuY0VmKFnn0OlrTIlBx9bwbZP6mwQyZV3fHGp2xHzbUOkpxNZjK1MQ/c1kGrAGzQ0ipcu5feAodTtEQ6F8aDgzmvJX1eQbTMWHth7E/dSuTAIFXCbF0m6PiSaM78CQil2VArPbgO5o4U4uHeGT0+DnKP1RGXMbPhfZH5L7UZwUAB4uX5mkFPWztwVf2oWWQ/WjFFLeOuaBXBPfuix2O+fpXNOpEIMAhHemGvNF3D1eIUt7UMpt1V1WhraF7+rt27V8aZMNdQUIQ7Jk7b2u4A7y+zMhBcWMKcpotlOi7pDh7JC03m/hQGF0g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 02:42:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Fri, 30 Jun 2023 02:42:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/4] selftests: mptcp: add fullmesh env var Date: Fri, 30 Jun 2023 10:42:33 +0800 Message-Id: <88e33d74b07ebc7b92a4835f0aef0d9de46d947b.1688092826.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0194.apcprd01.prod.exchangelabs.com (2603:1096:4:189::22) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 835b3c2f-65d0-4705-628b-08db7913b761 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yfyGFCWv4RQkTjPnklb/m42vXseOZumP/HY1qiEc951mhP/Fmp+qE6GKzvJpODZ2e75YfpbpWWZUNd5/McrBq1pAJGh6eZzNqbbCY/BaQ9XpL/z2ag7SDuPF0s5rt4T6bTbB3XXyfMRiJD2Fu88SrfZw8PKFBVctTh4IC/Q0ltMErUQFxQeFMiFyfvtADSYL9AI7d3+O6CO2jczBvLwPoZZKPFPB00obDEPgkqfiYhO2KC4uAfw/PpeWQEjk4AkP3TT377Ryq4guA2py2BeVYPBHtDUcES2oGNnsU6SWLdJgfowpQxLU1+B48BUKYEv+tvojBouJnXh3YRVTSEdOjXWfA9IsWn/vs9C9q4jtcD5qdjPBSJnMJZGb+PAiN8BF2eLrm94njpCl39cPlm1tvGppRoYlFhOi9bb9yzakIWCRvvrb+y4cao/KO+KvHgfHHpCNPp2cqPVI/al/d92gr5lE7GMspKq3kIhtSaPVfffhB9u6Ufkj++6XT6OwJNbaL0/3ES7VOoF3NqTJMU+KJ87LCh6QUwTco4D4rUT0qC6HN5R3yzHCqYTz1nLKLfKK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(376002)(346002)(366004)(136003)(39860400002)(451199021)(86362001)(107886003)(8936002)(8676002)(5660300002)(26005)(6506007)(44832011)(6486002)(478600001)(66946007)(66556008)(66476007)(6916009)(4326008)(6512007)(41300700001)(316002)(6666004)(186003)(2616005)(2906002)(83380400001)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?U4iiNL548aixZoO23sHlygw1loQv2QrfudCrtbbhODvoiEXY8VRnfGB2p4vF?= =?us-ascii?Q?cVsgRJykRwO1sPKf/S5/wpyKNQ+Biczx+OOLtbWDbwx1JwmYMDOl9Rih/W1H?= =?us-ascii?Q?kNnnWLkqaT5wmGKJQjsSeVfQhfx8EgUGJ6gKT0tnwta0a3D63C8PSNyZjFdv?= =?us-ascii?Q?f8sg0ye72r8IvFaNVWEJfpD6l2rE6EanxoRi2ISpTuEw3rCKh0/8WJEVOkda?= =?us-ascii?Q?MVypxVX9+143PgftCKBd2geCKV5VgL41cx6Yr4/JDC++aFPPLl/yUf/w3+NM?= =?us-ascii?Q?ZwLFNZqh7A2LJG7fX+CItQIcrSscNs8Bdf3yNSySVhhnTplq+8VWNiLTkN/5?= =?us-ascii?Q?seDxAms85baZekhAJOgWNpDxt0C1qN7lR/S2sVgH4h5XHq2qdqJnItxvPe1K?= =?us-ascii?Q?atYIvuWyV+Cw6+M1Cz1CmqoITqtoi1rBdF/RakzFbvUz25tst9esFaTyuoz8?= =?us-ascii?Q?T4Yx3rxwlSFHln/tdVvG4gkdqCu8rod14lWDqWg691cP0WcQTUaXOQZuY5L+?= =?us-ascii?Q?O1c7UrWQf8FSWDbfwXoqqQuppLlySkM+NjdaL5F2eBZR0ulf9TKJMXYt2V6/?= =?us-ascii?Q?CT0spUJB3IDE1Jf6ZKT0RR7jq/ZMP+gH8FKUrBbfwet492g2Y0r03JLF+F3a?= =?us-ascii?Q?9xvQIMrpDRGIS/h+X09UP8CbG4DOdLOPR/vcGboyIq/xP8Ln22lHxqnCL0Vf?= =?us-ascii?Q?rFJ5SmmwErbk3U+SSEsi5ZivSbfyXrQw6vqLkDc2HxnBBvXzuPX2aPCAEhaT?= =?us-ascii?Q?RE9nAoRDd+1CdxuRWA9PbPL3j/PceXg8e3d+6YtHtjr1EfvlJ+V64znuLV82?= =?us-ascii?Q?zfv7w3M0vSF4JLygDVAAvLJqlaQMb3FuCSBop7zLAKP5ZPzcBgxofMpPSEFO?= =?us-ascii?Q?Zq4cms0mXXypNjstidCoUro4H2yusiFvJLh4/Q+j9GX1gdwGDbTQjtkzMM7G?= =?us-ascii?Q?GNTj4rWV1B08eX2OKqUpHdU4NDI62p6l3ChgOv+WFGME2fjnnFHfWKBETG4v?= =?us-ascii?Q?4nzOIBUsg+1iw7ndlyIuM722LPv4Urb6+hTe36hc3Jar0kKiTSeQBlwXqRgA?= =?us-ascii?Q?06rm3tFAOrxqPJXhqoKf0Tp+POSXxjpaQTia4+MiA1apo8LWGUEdvwsZoyIL?= =?us-ascii?Q?rPczWCNDsh+dXXGlz1rx52bANzQPwUx7Km9JNbS6KSdCSiW9FiImiFpH/UVk?= =?us-ascii?Q?n6lOzuSebG4om2ziq+Hukn79MMHAz3ngNsaXsHGhLycItRLu5VCaF6NkDsg4?= =?us-ascii?Q?7BTjmW6b+/og6DXO43dudLsmZM2YADRmjdWC7S4PXdYMdAU61w00Y6XzhVgT?= =?us-ascii?Q?rxzuf4yxiSfdagWDQsUMfmRmL/Fnzj/haRQQPZpnTGEkcNcQlwEd9y61jB+9?= =?us-ascii?Q?yedsmqZAPYEpI/OwSTJFvhQWuq9l9+7xcjuj3MXJOxDJNe+bG75PAmd+o5Rs?= =?us-ascii?Q?d2bpUqjjIljlzr7S7jRDvqoy0PYStBZU8zc4EXX08j6PAiKNkixGjx7y/Keo?= =?us-ascii?Q?irwuIutaCjWs5XRlQgY2I8i9bzUTSDozTE2YpjJfbLXihwp7G5O/TT7UbY2t?= =?us-ascii?Q?wqFIwtMKKPFa5gB3BeY2Xlfx832iruUAFcsMFqle?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 835b3c2f-65d0-4705-628b-08db7913b761 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 02:42:59.2929 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pTve+ZG8bxuldz28yx2j/5gHFSMOnXek2OFAVBiJDRv+M1NddoqvuVXCVnlufDQsdsRIj/qH3ZrdZC9wRNAp9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Use a new env var fullmesh instead of passing 'fullmesh_*' to addr_nr_ns2. It can be set with the actual value of addr_nr_ns2 now: addr_nr_ns2=3Dfullmesh_1 \ run_tests $ns1 $ns2 10.0.1.1 -> fullmesh=3D1 \ run_tests $ns1 $ns2 10.0.1.1. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9b12573c55eb..bda250f703ba 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -55,6 +55,7 @@ addr_nr_ns1=3D0 addr_nr_ns2=3D0 sflags=3D"" fastclose=3D"" +fullmesh=3D"" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -831,11 +832,12 @@ pm_nl_set_endpoint() local addr_nr_ns1=3D${addr_nr_ns1:-0} local addr_nr_ns2=3D${addr_nr_ns2:-0} local sflags=3D${sflags:-""} + local fullmesh=3D${fullmesh:-""} =20 local flags=3D"subflow" - if [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then + if [ -n "${fullmesh}" ]; then flags=3D"${flags},fullmesh" - addr_nr_ns2=3D${addr_nr_ns2:9} + addr_nr_ns2=3D${fullmesh} fi =20 # let the mptcp subflow be established in background before @@ -2688,7 +2690,7 @@ mixed_tests() pm_nl_set_limits $ns2 2 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - addr_nr_ns2=3Dfullmesh_1 \ + fullmesh=3D1 \ run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 4 4 4 fi @@ -3101,7 +3103,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 1 3 pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - addr_nr_ns2=3Dfullmesh_1 \ + fullmesh=3D1 \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 @@ -3114,7 +3116,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 5 pm_nl_set_limits $ns2 1 5 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - addr_nr_ns2=3Dfullmesh_2 \ + fullmesh=3D2 \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 5 5 5 chk_add_nr 1 1 @@ -3128,7 +3130,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 4 pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - addr_nr_ns2=3Dfullmesh_2 \ + fullmesh=3D2 \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 4 4 4 chk_add_nr 1 1 @@ -3152,7 +3154,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_set_limits $ns2 4 4 - addr_nr_ns2=3Dfullmesh_1 sflags=3Dnofullmesh \ + fullmesh=3D1 sflags=3Dnofullmesh \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 0 1 --=20 2.35.3 From nobody Tue May 21 10:11:29 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2050.outbound.protection.outlook.com [40.107.104.50]) (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 28B2410FB for ; Fri, 30 Jun 2023 02:43:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gtZqhb8lvzYcHWMMu5sFD3271FxJurSJDFgJjdCyP/JxklYDgt8ucZXzkNG0kHxmSXtqUf6LR3MT3N8gdncIjeF8PIaHAAO6oLMvVNc5TvyykmV+42dnqvxVhf3dWU/WVAY2W6BaHn3i6SRv9NG+/v5IUFY+BLH5Eo/OI8WIukKLb0NU6Wm3LKnYxX7n7y+QUtb0/gd5Rnp0JZpeqJMF4Vkpe+N0/leURcWjRjZSpNqD3kV9dR91svXj/LZuyJwpnZt9tnK+EtvNCA24gUZUB+pMCy8DUw9v3hKVmoOYQ/R4AVhwtTX68XvFZ2M+jasFFx67k1wB7F3h3C9RSNs+Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Vs+rvOg1oiFObN8UxTkK52rLvAPMm80Uv9/HnhSxKBw=; b=CcPwSSDrw3gNG2vkPQkcxmFmaT3G1TCU+l1lTzYSqoG5KDI7zyARCBS0R/OlPkFKKfN8bfPsSvp8JKGuudqtgjXs1AA+LyxTViAvGkBDl7ZvID6jf64XyDQ9VysBN13KsIQur5Omky3BZSPifvLC38vs35vPOsfvxyZGf/KOgbyZjpWuihrSWVkFKVpPT4C6HU1PJXxJrMdaWBVPqtfhcpJ+6amOCH9OK8Zs4nEE7DpRBONrwwufhgA+FvdJnE710kZtPA/Jo2wi5bYBSfvm734Sx6hVeIVuScQX+w7C/hoE8S/MXgfSroCU2YC335Mg3rRI8EJt8rCUH7LsHiUcHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Vs+rvOg1oiFObN8UxTkK52rLvAPMm80Uv9/HnhSxKBw=; b=peLOnTNMJ+QZpcSrsao8I++L1OZW1KORnrdvJGvBFHY1CXYKYKUoG/Mb0vxjDdayVkzMd/SSBa4vjxzf4PltMano0w7gGKgCaLQidZZHiYn4HHBdKKIc1K6sHS4lfbn6X6qjJKj2TKzxKGbD83Pxs+DXzSxm8fHp52MvNDfFobPrTUBDhWxhQYQXoAPKxY47Ng0k8kz1uadtB6jaaa6GgCMFae1Ba8mbEhOMF2WF2M92eS27w7+4F+tAggaLbpjE1aWfIx0YchsNsFOHqZ6V1OcP9cP/EIcJ/qzKmjD07hh/TrpdEtr9KcrRKuTC5YNkTzeV5yFzob4vcd7rn4U8HA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6544.19; Fri, 30 Jun 2023 02:43:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Fri, 30 Jun 2023 02:43:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 4/4] selftests: mptcp: add speed env var Date: Fri, 30 Jun 2023 10:42:34 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0186.apcprd01.prod.exchangelabs.com (2603:1096:4:189::14) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|GV1PR04MB9103:EE_ X-MS-Office365-Filtering-Correlation-Id: 80ec1b84-f3dc-482b-a7fd-08db7913bb69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: h/kQYr+gu+ANMahwrGReoHPfjpiwc90fX62C7hgc7KSa9JQDeSjcIcx9VvvgOdPFFgZz8dZJDsb2510eTRfcqhS/phKzBp4ZXam+INLax+7h0xS5KuPe34PXlsaURZdK42FWiMDStx3YsDcNnsxsaohNLRAVILyIVGThe6aZqqIn5zIgNje5faiHg3DcNVDK+2XCpf9bWrheJJ4fRLJUjJe8ei/3CpM7x9IaFPBZpT4Ibf9fgeZiBPRHAB/v8aHxvXxO8fGgZa2EvbQ31LFXGpYpSlqukI3D3boxz/0aTVbvCKFZneiCNJHHeZYhdWj0n4x7XRR775aWYEnebbn8ij61zN4cD3iPpqoF8Ft96iu9gIsiUZ6K4le142XX8qKiPHQQUFchflv/8PTzfGq88sXTULP/mlflgZtUuF0568byLtGZSPFHEMFIyrns7/rdt0vdEsn3WgF509epG7UmQ18yCWk7xGY6daVmi5150n9njhE/MpffPl2OQEIDpuc+CNtxRqmweNCQGMB9T8DAJ/7hJCEalRWpecPbiHtYTYFJPoXJPUZgCfZUMJWT4YXR X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(376002)(346002)(366004)(136003)(39860400002)(451199021)(86362001)(107886003)(8936002)(8676002)(5660300002)(26005)(6506007)(44832011)(6486002)(478600001)(66946007)(66556008)(66476007)(6916009)(4326008)(6512007)(41300700001)(316002)(6666004)(186003)(2616005)(2906002)(83380400001)(30864003)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UsuDcicWI0fB11cxIrczp/oKIPoBjr/EaNVUrmLtv5FTe5gmJgZooYGEu01U?= =?us-ascii?Q?9nqIwKi8zcia4mHnC9yZkjoPVkP7t+fPIwYBCHFxMHlksCCzGKchVEEvIrfi?= =?us-ascii?Q?BiIAUxuQMzm7nMfB1uM5zt7YJdkZTNBjdrwYHgySnJF3uyC5LHYj+GOi/UCx?= =?us-ascii?Q?hMaBZE1ff42qUrk3Drs/2b8n1Xe19Nb3Z11u1rTpyy/rqJLscxs5U7/lM14w?= =?us-ascii?Q?FRX+GWL6jb6ZMyIgevnFypTVyqmE8eNUyE47EM0mNiKlrDkYnYeheQrpAVNs?= =?us-ascii?Q?9Nz3X69l5UpI/WlRx2GP+Rk89+HxsPPVySgWgGTjqPN5DyTI71s77X8XTFVs?= =?us-ascii?Q?pnwPOK8sIPaPGabhWs0kdWCdK3FIb9+H5j24fyrxYChDVCwt4jRep5XD/8iK?= =?us-ascii?Q?TdpHd4BQzrkOvGel33FeyaYLSVSCENVqXXte5vzbVnIRHMv4mOHBb7xlj0sM?= =?us-ascii?Q?M6ytVjiQl69e0OIp1J5pgEQoBnzdLfgJQncRMltM1C9a/Cyiq3Oemt3nQ51V?= =?us-ascii?Q?QxgCkFNcRUbiL9WNywUqquEc6dNG3fA8FNRZnzUDtSBZTrxVF2AtBql5ttIm?= =?us-ascii?Q?ABhnmjHbbTBG4vtJ+vrBo47QjSu3LjkrMF6weTljE+q6u0QuLa6+z/6mbk2j?= =?us-ascii?Q?tR+w7cH9Q16k+5Q8nhSaZeuYq0DJyakqPC5Bfdh+TRO5nuyMU84sElobZhkY?= =?us-ascii?Q?e9zIeCRZKCD+TDlYQdEK4res9gSdcTC94r6eImBq2YVFbKFPMUYg1urE83Sb?= =?us-ascii?Q?Osx/PLU1MZi2YiY2Q2Cus8KX3LNe0yU07EyZFhlUG1LmT8xgPxovx8xvqD5H?= =?us-ascii?Q?PSxG2vI7wCIblvsqBWYqcLXWHvma7EBf3DHUUL0bcUfPS6ONqE1eTzCsfxzt?= =?us-ascii?Q?l4mZDugpr9F9WSuLOgLdAVBTGYHt+GJwfCf2QpMpYyX7cHezAvrL2gUxf6q6?= =?us-ascii?Q?5mXjj0PVV8dL+3DCkjmFESsTHY0eNl4wvoPACmZOg/jwHshzXRxeShgXnIe2?= =?us-ascii?Q?kRphdGsUuZzJJgeT1CoPSW/nd4nKJb57CBgJMt7fZaNGT2VBm62nP6jsyLSB?= =?us-ascii?Q?uAfqgg0r5vPcQj3dor6fbq6JCh7cYPa526J6b+JHzpZb4oaHio6yosW9zK+S?= =?us-ascii?Q?OSRMfUDKdgExzdIzm/M8T+awF37mgVdTE/pKvDH8O60yqj0fO3oiPu/MNeYr?= =?us-ascii?Q?g7v9gFecAhQu+BSu3pfZ9596VcSlPSqKraASGr/DHIFYcciJue2ITss6zeoH?= =?us-ascii?Q?efJbP6xdYvsSalc6D9IkLDK7sPzJxUcaGinZVltQQWAy7TrkkCc4iFSlZhlA?= =?us-ascii?Q?rNG3m5b3VH2bXpumbx5DtW8Nq5XV4wos9PN4s9xDnjaeswFepNv1tB++vww4?= =?us-ascii?Q?+vSXX6gkbOlKPbIacIfxgB12NJxIQCHU38X9N4d3eQF3ILuHFpKe2XZazmyx?= =?us-ascii?Q?uD1PchLak8ZvDhqOLfTtUsJt3HvudlUUzuZUBR8f9PozcshbSKN29vRlet0G?= =?us-ascii?Q?g+qRsdcJlV1WoHYOsyAbKDXgwpdFVHCnkn3tktelDkXZOBdNhSTP/ns6HDB7?= =?us-ascii?Q?NtLJF4sHYfGNMu/GAGMT0RudCgbUr9o0xjB60oYi?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80ec1b84-f3dc-482b-a7fd-08db7913bb69 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2023 02:43:06.1638 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: WcrkzNuwN9zu/li507O9mGlg70w8Y9zMgzIOu7cieD071wc9+RI6suSO45JsqwDQLTvldNzbQWWEHNZLTFjjAQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Use a new env var speed instead of using 'speed' argument of run_tests() and do_transfer(). It can be set with 'fast', 'slow', or the actual speed number: run_tests $ns1 $ns2 10.0.1.1 slow -> speed=3Dslow \ run_tests $ns1 $ns2 10.0.1.1. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 230 ++++++++++-------- 1 file changed, 125 insertions(+), 105 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index bda250f703ba..b89077510080 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -56,6 +56,7 @@ addr_nr_ns2=3D0 sflags=3D"" fastclose=3D"" fullmesh=3D"" +speed=3D"fast" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -987,12 +988,12 @@ do_transfer() local cl_proto=3D"$3" local srv_proto=3D"$4" local connect_addr=3D"$5" - local speed=3D"$6" =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid local FAILING_LINKS=3D${FAILING_LINKS:-""} local fastclose=3D${fastclose:-""} + local speed=3D${speed:-"fast"} =20 :> "$cout" :> "$sout" @@ -1025,8 +1026,8 @@ do_transfer() extra_args=3D"-j" elif [ $speed =3D "slow" ]; then extra_args=3D"-r 50" - elif [[ $speed =3D "speed_"* ]]; then - extra_args=3D"-r ${speed:6}" + elif [ $speed -gt 0 ]; then + extra_args=3D"-r ${speed}" fi =20 local extra_cl_args=3D"" @@ -1164,7 +1165,6 @@ run_tests() local listener_ns=3D"$1" local connector_ns=3D"$2" local connect_addr=3D"$3" - local speed=3D"${4:-fast}" =20 local size local test_linkfail=3D${test_linkfail:-0} @@ -1209,7 +1209,7 @@ run_tests() make_file "$sinfail" "server" $size fi =20 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${= speed} + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} } =20 dump_stats() @@ -1998,7 +1998,8 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 fi =20 @@ -2009,7 +2010,8 @@ subflows_error_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 fi =20 @@ -2020,7 +2022,8 @@ subflows_error_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 fi =20 @@ -2032,7 +2035,8 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow & + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 & =20 # mpj subflow will be in TW after the reset wait_attempt_fail $ns2 @@ -2131,7 +2135,8 @@ signal_address_tests() =20 # the peer could possibly miss some addr notification, allow retransmiss= ion ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 =20 # It is not directly linked to the commit introducing this # symbol but for the parent one which is linked anyway. @@ -2241,7 +2246,8 @@ add_addr_timeout_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_tx_nr 4 4 chk_add_nr 4 0 @@ -2252,7 +2258,8 @@ add_addr_timeout_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 chk_add_nr 4 0 fi @@ -2263,7 +2270,8 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 speed_10 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 8 0 fi @@ -2274,7 +2282,8 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.12.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 speed_10 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 8 0 fi @@ -2287,8 +2296,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_rm_tx_nr 1 chk_rm_nr 1 1 @@ -2300,8 +2309,8 @@ remove_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 2 2 fi @@ -2311,8 +2320,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2324,8 +2333,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2338,8 +2347,8 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - addr_nr_ns1=3D-1 addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + addr_nr_ns1=3D-1 addr_nr_ns2=3D-2 speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 @@ -2352,8 +2361,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - addr_nr_ns1=3D-3 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + addr_nr_ns1=3D-3 speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert @@ -2366,8 +2375,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - addr_nr_ns1=3D-3 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + addr_nr_ns1=3D-3 speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2380,8 +2389,8 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -2394,8 +2403,8 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 =20 if mptcp_lib_kversion_ge 5.18; then @@ -2413,8 +2422,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert simult @@ -2427,8 +2436,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - addr_nr_ns1=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2439,8 +2448,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - addr_nr_ns2=3D-9 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-9 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_rm_nr 1 1 fi @@ -2450,8 +2459,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - addr_nr_ns1=3D-9 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-9 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2464,8 +2473,8 @@ add_tests() if reset "add single subflow"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - addr_nr_ns2=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 fi =20 @@ -2473,8 +2482,8 @@ add_tests() if reset "add signal address"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - addr_nr_ns1=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2483,8 +2492,8 @@ add_tests() if reset "add multiple subflows"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - addr_nr_ns2=3D2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 fi =20 @@ -2492,8 +2501,8 @@ add_tests() if reset "add multiple subflows IPv6"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - addr_nr_ns2=3D2 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + addr_nr_ns2=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 2 2 2 fi =20 @@ -2501,8 +2510,8 @@ add_tests() if reset "add multiple addresses IPv6"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 - addr_nr_ns1=3D2 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + addr_nr_ns1=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 2 2 2 chk_add_nr 2 2 fi @@ -2515,14 +2524,16 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow - run_tests $ns1 $ns2 dead:beef:1::1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 fi =20 # add_address, unused IPv6 if reset "unused signal address IPv6"; then pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 0 0 0 chk_add_nr 1 1 fi @@ -2532,7 +2543,8 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 dead:beef:1::1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2542,8 +2554,8 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 1 - addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + addr_nr_ns1=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2555,8 +2567,8 @@ ipv6_tests() pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow - addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2657,7 +2669,8 @@ mixed_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 fi =20 @@ -2667,7 +2680,8 @@ mixed_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 10.0.1.1 flags signal - run_tests $ns1 $ns2 dead:beef:2::1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:2::1 chk_join_nr 1 1 1 fi =20 @@ -2678,7 +2692,8 @@ mixed_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow,fullmesh pm_nl_add_endpoint $ns1 10.0.1.1 flags signal - run_tests $ns1 $ns2 dead:beef:2::1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:2::1 chk_join_nr 1 1 1 fi =20 @@ -2690,8 +2705,8 @@ mixed_tests() pm_nl_set_limits $ns2 2 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - fullmesh=3D1 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + fullmesh=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 4 4 4 fi } @@ -2704,8 +2719,8 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup - sflags=3Dnobackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dnobackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_prio_nr 0 1 fi @@ -2716,8 +2731,8 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2729,8 +2744,8 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2739,7 +2754,8 @@ backup_tests() if reset "mpc backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2748,7 +2764,8 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2756,8 +2773,8 @@ backup_tests() if reset "mpc switch to backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2766,8 +2783,8 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2856,8 +2873,8 @@ add_addr_ports_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 1 chk_rm_nr 1 1 invert @@ -2873,8 +2890,8 @@ add_addr_ports_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 1 chk_rm_nr 1 1 @@ -2887,8 +2904,8 @@ add_addr_ports_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - addr_nr_ns1=3D-8 addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -3090,8 +3107,8 @@ fullmesh_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh - addr_nr_ns1=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3103,8 +3120,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 1 3 pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - fullmesh=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 fi @@ -3116,8 +3133,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 5 pm_nl_set_limits $ns2 1 5 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - fullmesh=3D2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 5 5 5 chk_add_nr 1 1 fi @@ -3130,8 +3147,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 4 pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - fullmesh=3D2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3142,8 +3159,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - addr_nr_ns2=3D1 sflags=3Dfullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D1 sflags=3Dfullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3154,8 +3171,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_set_limits $ns2 4 4 - fullmesh=3D1 sflags=3Dnofullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D1 sflags=3Dnofullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3166,8 +3183,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - addr_nr_ns2=3D1 sflags=3Dbackup,fullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D1 sflags=3Dbackup,fullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3179,8 +3196,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh - sflags=3Dnobackup,nofullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dnobackup,nofullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3355,8 +3372,8 @@ userspace_tests() pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 0 chk_prio_nr 0 0 fi @@ -3369,8 +3386,8 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_rm_nr 0 0 fi @@ -3380,7 +3397,8 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 speed_10 & + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr 10.0.2.1 10 @@ -3400,7 +3418,8 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1 - run_tests $ns1 $ns2 10.0.1.1 speed_10 & + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf 10.0.3.2 20 @@ -3423,7 +3442,8 @@ endpoint_tests() pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 slow 2>/dev/null & + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & =20 wait_mpj $ns1 pm_nl_check_endpoint 1 "creation" \ @@ -3446,8 +3466,8 @@ endpoint_tests() pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow - test_linkfail=3D4 \ - run_tests $ns1 $ns2 10.0.1.1 speed_20 2>/dev/null & + test_linkfail=3D4 speed=3D20 \ + run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & =20 wait_mpj $ns2 chk_subflow_nr needtitle "before delete" 2 --=20 2.35.3