From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101139jap; Thu, 6 Jan 2022 22:17:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJx65KeU2mjns7mfQZtCN+yAxkpBIDOXqCl4ja5Q8MBuiCBqL9j+NkSJrIGGo4Vm/eNDrNin X-Received: by 2002:a17:902:ce8c:b0:149:15c8:308d with SMTP id f12-20020a170902ce8c00b0014915c8308dmr63966197plg.120.1641536242712; Thu, 06 Jan 2022 22:17:22 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id e8si4493399plh.52.2022.01.06.22.17.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:17:22 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2970-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=dDROkYL6; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2970-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2970-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 36B4A1C0C58 for ; Fri, 7 Jan 2022 06:17:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CFDD52CA1; Fri, 7 Jan 2022 06:17:19 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 A03732C9C for ; Fri, 7 Jan 2022 06:17:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=alThrNifp/OSjxHl/4li6lFqZXGq0WSvAO1M4Q05kR8=; b=dDROkYL6nqTt1j7g0doMBoHbCALfNbvSb2P7Z/bzl0nDyM8jjAlItCuPeHe9INKVavhjU4 uul9OJOn4iPQM9ywQ9KGo+rrgB/l0aAo+cSLenu2f6gCeo4Ganb625zcquwLc6xB2hiraG CjQ34AZIB5bISZ3mkaIeVGSB/Sw7vaA= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-22-U6Kyw0NzO4yZhZ04WHxFdA-1; Fri, 07 Jan 2022 07:17:16 +0100 X-MC-Unique: U6Kyw0NzO4yZhZ04WHxFdA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VX++23/KY4eEKkbJAXJ8eo+pESOo2eBKh/b2krrVgj0ABuJgCNFJ6R0h2YlANDSUDPMSobhrrn7RYTknlRQHmUg/ayZvcQoHQhsIjv/As4krOkUbYt7mL6GYRk8nnk+8udx/GReCHmoMXxnber8L1rv3Hwr8AaIC6FYZDv+RtNP8ZcjK3Fa6qg4cwFUF8zaICuZ/Se7qyU9jnKpR7pfHJXYIIGK0B/3V7mxZEFsBtnDj3J3JrDW1FPiBPlsSflbsw30TeYBGGBE7P6IPiQp8WJxw2W7A3UmhEtHWaGUEJj4FmwvG820gX58/uhOblvPMe/VE460SGasix+NmeTQYjw== 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=6oe/690Jw0b2v/upReELVvbs4JwlgUM0q6esPjYVUlc=; b=g4i2LdaN6tSizYsuWRkiow0DAT737caTr44ALg1Lx40s1SMy/Ye+IiQBqV/TEbsxhQNjGq6OgMps6UmZtq3ZMpYt95xH9FsrNeWGiGd3MgYFlAtlZQEKc9z8Duvqq78SSjAzKDfQivJBLptt55CbdkSQp/RqXP/nm3RqhaDZwhWQRZM1SQ86jW526Me1fbX5M1bBE6SFBMyuW6o2lj1u+K7Hf4z75xq3CeQtotHDbGVX+yiGVLo8py69jWtJ8G+5x0H4pcE+OcllB8vBvV9WakSLt7vvEkGQ17v9WYWamqhptXp75Gybrory0A6syOzuLL7/VIXpAmRUjiEomTLPhw== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:15 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 1/9] selftests: mptcp: rewrite removing tests Date: Fri, 7 Jan 2022 14:16:53 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0006.apcprd06.prod.outlook.com (2603:1096:202:2e::18) 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-Office365-Filtering-Correlation-Id: 80c09aaa-d15d-4792-ea56-08d9d1a55951 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9tuo2NsG7ewmQwufFQfNvf4LI6nhhw0yjWKsW3yhgXDXtk24AGx60A542LccKLks8MNXQ/Lw30S14dhRxYOeK5A8fLe5+a/lQ19Niq6bbXzLTOn3IHd8bKhX/stIzOPWMEiY8ZJhYmauMQVso+jogjJC1etJJj1LWqdZsTI/MopnOvay1SW/CGIOfBrV5LS1gcjqhbnqHDWn7EGR74PMEZMWpLi+01YRTLFtZi1uiVtKADPD8As4/JIH6VnzRbmlFHw0to90d9gwbUQOjm8tP/C883mwLhwMkapoUhs88LGJ0w6B0ks+dnvnFZ/Hh+LwDN77YdbViMxfT29Cq55hRLND9TA5PQ3EjZJN6Hx3zV5Nua8vKQx03la8Ys2ZzS19ekq2pPc2VFrgqM4MMKMDOXzf7zpuKTiqjuUpQQNSTOD8LxUmAxHsfXdUNa0pSIcRKN9QqPTr2qshRjvx3oeomGvlcGvM5VNZ7IDD/EfQDeFKrcwhqtQj9fI03N1zdiEmk9sMatmIsJqOsKxBqqEMiI0ASUvzdN9EdXnZfL87r2kqgTlXN2HS4M4/+5r4gzax4DGPRdJDKtelTH/N1ObPJOuMKkJIPqiovfgv0MtC403q45f4zQNZZxPVHYZ5m4j5OzSi9lK5mkudETB6dtVLYw== 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6666004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?W2kweVOrMqHDsMTjI031oyDUa3SGZAXJZKR03HVkMDabhPOUFPtwkd63VZQl?= =?us-ascii?Q?Cq/TrkBocz9ByiIKRa26S9iW2Pfd2I49Q3GHtSWJYyfS/zjGLD5YycBGWHXr?= =?us-ascii?Q?I6uAidSfqEeC997Iiff1fghbbedvYZcBB6w2OxsDn+R/Q+0BUErjOHOfLM44?= =?us-ascii?Q?Bz/UxFZzDDV9MjT7UrCHxzzqwRJAN92FH57cyX2xMf+uYcnrOsZc9JY4kCfL?= =?us-ascii?Q?A6vGHgHBnh0Srg/4WaRRCDbJz0cfBeaKhhwYyIK3O2FtVHnji0BDWF57UlZB?= =?us-ascii?Q?Mea64WLVNx8vHhKjGi8MwUhOt3Gw5CbFFL+7Zg2/AcsFXfdf1npYeMrwEa4q?= =?us-ascii?Q?h6IMW5OOV4H78t88E9x7B7nzPHDueJdGELKOahX404B4B+fxYKnXNtJw1knV?= =?us-ascii?Q?2H9eCf9Sz4w9H66wCWcJt7rfHewvjO1KNGszk8EZLiXwwd4ii+HlvhZnqTwv?= =?us-ascii?Q?WhMAsmwDUfNq6DrO0eLT5NSRLf6WlSS3i0D7NE/m8jEPXWhFAsFenzYLd9Mt?= =?us-ascii?Q?/AD0uhD6QIjBMt3uV5j8HV7vmOVtB3dAVG8XFF6trC+qYYDsR/uiEdB0nVLC?= =?us-ascii?Q?IbO2tiCUs042AuM6jWtjX2iqgrVN2B/ydzy1zfkbABmt/vlNOKV/IfiUhwdH?= =?us-ascii?Q?txcgQfk6GeMQdYBp33sGYbYENnHow8WGs6mooWa2HUmHR8VSVpIutzFYftEI?= =?us-ascii?Q?QBKtDVyvUHVtTu59WRr96JNSxpY16nvzFnc7uzeWbcAaAUIqvmWaBKzEbDhb?= =?us-ascii?Q?xwqFhs7don/I0Qg0t9PU3Y7wyvYcKOCKQFhOfckurK14vQ/NnqIiXUujB7ox?= =?us-ascii?Q?/gOMLNmFnJcHvZ2CEu3sSylO/jD6+zbkXj/l4s+84mWEholzSCCd6BhkDX5q?= =?us-ascii?Q?H+qLXC2KRYobsFBXKjWUU3Ow7RQnRFRjDVcrEHkvZrKsnfsM6o5tI8sJc5iP?= =?us-ascii?Q?eH2TpAdJSw3CB1V3PkyYKg8NAslzt5QUOJLGCCHYkGVn+Fu6anZkhMSp337r?= =?us-ascii?Q?vKYsLWkB+pAFer2AEtNMJiS9gShh4WKqOCu3+Q2BkrIV7T6ihcdAGSP8iAy5?= =?us-ascii?Q?ZoWzMNAwfB7HVgXHPCOmsbjIwBnjFI6B2XaqNJikxeM0mKerN1Kslf0SoJr0?= =?us-ascii?Q?nZquximsuq8JTLNFjITFcImZdyD+A1j/8R5ApEQ6t5ZQ1z3RkFEfFfFQvrCc?= =?us-ascii?Q?nMSRhNVhdbIdt+HqTPjrPloOOI1eRZDwFApE2DPVfTdpKUIzz00+9JUVKD98?= =?us-ascii?Q?xs9lIz8AboT+knSpKaldFwo7J3iKTZ9AG4/VjZK8Lm4OMg5x/j5oi7uXv0VN?= =?us-ascii?Q?WUB+Wq9UFmsb59D/rYYGJHMasjH8J+axSZfHbjY4WbUbALm2NH9MtPZBFfsd?= =?us-ascii?Q?RPH7foa8UgrJ9SGdZpvJ+lMCbvea2d+pp9GfFTLS52VN2/sJSF0dAwU6OFqr?= =?us-ascii?Q?6vN1ksJMAHQcIEBYUeFvR5KvIdmxAJwNINcEVlgYIWmixK9x32Vp3RepbHtw?= =?us-ascii?Q?auM6KjfFjWUZARmu2ahpuO9hly4PYASZTa1kkcUMlYB0HVDNB3ArPTY4vZK/?= =?us-ascii?Q?pHioHb0TS6NIhba+2NKfQWhQApUgnc1HeWHUmJncb/tb9SVMz/MkGctOC+DM?= =?us-ascii?Q?GE3L22Gm4JZ9MfDij6HEdn4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80c09aaa-d15d-4792-ea56-08d9d1a55951 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:15.0954 (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: sx47jA39i7dF0Dfbj9M3t1AmtgQVRtb5vPmXtscWR8pnMsBRlvPA5hyaNMPc2uFZNoAoeKPzQ4lASr3i47O2eA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" 'pos+=3D5' in the remoing tests only works for the simple case of 'pm_nl_ctl show': id 1 flags subflow 10.0.1.1 It dosen't work for the outputs with dev or port: id 1 flags signal 10.0.2.1 10100 id 1 flags subflow dev ns2eth3 10.0.3.2 This patch rewrites it to fit for more cases and the output of 'ip mptcp'. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 65 +++++++++++-------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e48ce23d2386..b41126d4b1c6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -385,20 +385,25 @@ do_transfer() elif [ $addr_nr_ns1 -lt 0 ]; then let rm_nr_ns1=3D-addr_nr_ns1 if [ $rm_nr_ns1 -lt 8 ]; then - counter=3D1 - pos=3D1 - dump=3D(`ip netns exec ${listener_ns} ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - while [ $counter -le $rm_nr_ns1 ] - do - id=3D${dump[$pos]} - rm_addr=3D$(rm_addr_count ${connector_ns}) - ip netns exec ${listener_ns} ./pm_nl_ctl del $id - wait_rm_addr ${connector_ns} ${rm_addr} - let counter+=3D1 - let pos+=3D5 + counter=3D0 + ip netns exec ${listener_ns} ./pm_nl_ctl dump | while read line; do + local arr=3D($line) + local nr=3D0 + + for i in ${arr[@]}; do + if [ $i =3D "id" ]; then + if [ $counter -eq $rm_nr_ns1 ]; then + break + fi + id=3D${arr[$nr+1]} + rm_addr=3D$(rm_addr_count ${connector_ns}) + ip netns exec ${listener_ns} ./pm_nl_ctl del $id + wait_rm_addr ${connector_ns} ${rm_addr} + let counter+=3D1 + fi + let nr+=3D1 done - fi + done elif [ $rm_nr_ns1 -eq 8 ]; then ip netns exec ${listener_ns} ./pm_nl_ctl flush elif [ $rm_nr_ns1 -eq 9 ]; then @@ -433,21 +438,27 @@ do_transfer() elif [ $addr_nr_ns2 -lt 0 ]; then let rm_nr_ns2=3D-addr_nr_ns2 if [ $rm_nr_ns2 -lt 8 ]; then - counter=3D1 - pos=3D1 - dump=3D(`ip netns exec ${connector_ns} ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - while [ $counter -le $rm_nr_ns2 ] - do - # rm_addr are serialized, allow the previous one to complete - id=3D${dump[$pos]} - rm_addr=3D$(rm_addr_count ${listener_ns}) - ip netns exec ${connector_ns} ./pm_nl_ctl del $id - wait_rm_addr ${listener_ns} ${rm_addr} - let counter+=3D1 - let pos+=3D5 + counter=3D0 + ip netns exec ${connector_ns} ./pm_nl_ctl dump | while read line; do + local arr=3D($line) + local nr=3D0 + + for i in ${arr[@]}; do + if [ $i =3D "id" ]; then + if [ $counter -eq $rm_nr_ns2 ]; then + break + fi + # rm_addr are serialized, allow the previous one to + # complete + id=3D${arr[$nr+1]} + rm_addr=3D$(rm_addr_count ${listener_ns}) + ip netns exec ${connector_ns} ./pm_nl_ctl del $id + wait_rm_addr ${listener_ns} ${rm_addr} + let counter+=3D1 + fi + let nr+=3D1 done - fi + done elif [ $rm_nr_ns2 -eq 8 ]; then ip netns exec ${connector_ns} ./pm_nl_ctl flush elif [ $rm_nr_ns2 -eq 9 ]; then --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101227jap; Thu, 6 Jan 2022 22:17:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyHKxtbHDTNFZBUKWXTPerulTPg6W7WGEiewMre5DaI8KsIWW4IQnhINOn1hK0Uw1NwmlXq X-Received: by 2002:a17:903:22c1:b0:148:c3cc:54c6 with SMTP id y1-20020a17090322c100b00148c3cc54c6mr64238991plg.98.1641536249712; Thu, 06 Jan 2022 22:17:29 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id d2si4700891plh.157.2022.01.06.22.17.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:17:29 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2971-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=UfW4bqHx; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2971-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2971-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id F0A533E0F29 for ; Fri, 7 Jan 2022 06:17:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1EC132CA1; Fri, 7 Jan 2022 06:17:28 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 ABDA32C9C for ; Fri, 7 Jan 2022 06:17:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=olvEEIC5B7xVu88/Lto6Nw+PpWRppOp7IhyjIlwxE/g=; b=UfW4bqHx3TjqboGMTayG/owrjTy9Rld3ARziC9nyPu7TFWsuM5ZMKHgujMGUPr2DN43dcI IkK4vUHRm3QV4hi1qp9ElTnSKhjJx27O/CBPqFZlBhzKTd6M71eavm6Pap4Lwb+5bb69aP y9Uqx0qGwSH3l52YqBGuIe5FRVf6O4Y= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2105.outbound.protection.outlook.com [104.47.17.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-15-EXzZxOL-NvmdFUWKhvIYaQ-1; Fri, 07 Jan 2022 07:17:24 +0100 X-MC-Unique: EXzZxOL-NvmdFUWKhvIYaQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZK0jlUXt/ojOx8u3x9i7NRG6eG7My30aUuCqZg4UwmAomcffQ0Lyroqj4o+QzV1Sv2zFX4yGJFHmf75z0SVuV8ShEg2hI78O66XBV9PoXc2y3g+JSyiOktUiMxrakLfhHOEmaEWpVRTLjuFaJFBhhBYJC4UUpj7v02Z/be/ecGfQ3OWMugmFTnJMmZHOdxyTYzhOR0sqUlbHe/VKBKE+9JBDumVfWQknZJNRymV/r0JjAaw9o9NKwM/ujpmhsWC2tRjBvrIvPF8VgJdSn1TRDRjZP2iaqxC7CpiDMmsp00kdwW2/zpUXDi3Qj1sE+t67u+dvu3ivuvEyGsj0kf9Uzg== 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=PTx6xDH6Ocst8cFyX2cKNnMdFxhDaa3cE63AZo8bj7k=; b=hhzh5c0YVVWF3vKbeHs3/jGHXXiMFGqp48ttc/aLl62LFND+gnulTewqn5QScIyhKu/ofdCtWWcJC0GcrJr/uSEEMxkiUIaXyLN54E9ZT+bY5YQt+8+4q0Os0IkZGlBPtbw8CAoDIy5Bd/4sqHMWVz2C2KV3t7me/Fp4l/3dExpRvpyqHDdTwuk3AC3rAl1VlEDJ3sMSm8FONuKVqhPbPgXuwPxw9ECpvBFJvhuGWPJ8FuiFB6lrfPRs5m1UZ9psjF4ELRyiUayGQndO3rC0M27jxnlQh7J5eMk9L6JQU3q+PpYlxMRWb6QkadjAXzyE1EaBD0eEV34FeNG5X9ge0w== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 2/9] selftests: mptcp: rewrite backup tests Date: Fri, 7 Jan 2022 14:16:54 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0019.apcprd06.prod.outlook.com (2603:1096:202:2e::31) 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-Office365-Filtering-Correlation-Id: 80ca755d-49d4-42a1-d55e-08d9d1a55e05 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WEwmiU6EQX52kJZfCDFkPElOWgawR8I9NHZ7cGOKGMXByitDW4Rk8Z1FYcrGPog0yaX5vWhefFIKBB3/yBl/pubBHqeBRT+NtXCnmO8ughib/0OlfjzHvhIBk5h2+GbwF2d/jc9XbqYunknd9LzdPOfFbKapVZVIGTHwXc3rfRrtwsm6/1JT27lrbnPVMSpaJmVTFzR7t8NZFropT7mAstPGF3vnBSi9MRkrrpY6qKJ1dw/M1L8hmstpx2aRcmg4WrHMVHIu9rfB7C6FBbE1LTnAXgaBE75AnlrguGvPibTWkpX8hw+HlwjboXf61IKz5K4gdGimgSJbrma6YdOqdhE3j5J0bU/pfQX7kq7y+Jc6RK2rV+wAHm81tXuutE5EosZfhfk16PBY6ltDuVGwYBlAT5ulTAoC9XswQ6iaeqhg3ragNtjKfTf8iV3irPUiZZ7+ECeOpeIw5tr7lZoJ46k1EYsQKe9/HNh9JHjhrUQpfYSRBPkzZYIDt2g98muaLowovgGxVoZgKmzRMMeW+MUnIcROjRMEWmoP05Do5HMsfNe+biCqV+2lHnz0M8FH1qs7KZVDCDZjoDv1qe4tUIHcG6XTXAkslt4aZqSOBg+3/KsItAlW5fnlJPl0zzrJR+GeSrLzggSaJAuevoePdg== 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6666004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eYKvnMvX0RAvZ91nuKjbzQPn1uTOXsMP26EIaTCCpcx1n9qJdN8pttoh3Shq?= =?us-ascii?Q?bxrY+pQjb2Bykt+CdFQ+pwDGqdU8ZpjmpuleKvhQAEDhPCbg0PfwjVJmNzdL?= =?us-ascii?Q?EdNt3SODAn5fn9EqwetI+anvuKzbDp4JvX99X7nClbsV491pNKmDvxYa8dm4?= =?us-ascii?Q?ADU3zVSMea9GdrBl0gT+v0Mfx9aIUsoJzdZDvgS4uZki2Fu2bgbiVqt06xvQ?= =?us-ascii?Q?zAQgw4HnrxROwwqvKsOrarMEYVF5ZjMaaqdM9cOvnWGOaD0XKc3vGqngAMFc?= =?us-ascii?Q?sDGzufLwjky+iCXQfELgJLlnAJG6ORIjo24h/tgdraFJSggsfzAxIhmkUWMa?= =?us-ascii?Q?CZJCQdX1POVarXz2l2aRzSn1c18DZpUkON2dC6xkN2zyOIL2nlLUaGmlx1+U?= =?us-ascii?Q?mjWBQk2ebX56p0OzlPgY3+nzPOm0UnrsC7X3KyL1TV6r1bcd6gbJIMf2mlAl?= =?us-ascii?Q?1lR9CWTLU6awFXSk6rYwZ047Od1GZ/65eF4ibbKTJrEsYfuPSG5MaEnvzyCw?= =?us-ascii?Q?g59Woiy6+DiQ2KFXHsc1DzXItjcpFVntBoJEbjgr53GxHMxQVDHdbzZqDnhP?= =?us-ascii?Q?Lex5AnQIVOurNyGy8BzyHIaNs0/bSr4n8OGc8v0YeqZG8+nGb7aDJkNRAw2w?= =?us-ascii?Q?d0xNJr83kaRrhrarbMhYGStlYPdKwTKb/3Z2roNWv+5LNga1FagRPO8VlfR1?= =?us-ascii?Q?B7GQaAGRadN5fu/G6T/U3JjGKbBedJ9c/5PAXwFbXOiQ3lcCSSzGECxsy4zG?= =?us-ascii?Q?rgOEj1pMGf048+xk5ptnecMlKlOungzPoZybqklfjEmcX/ejUBDCAawmaMn0?= =?us-ascii?Q?vVRp/JPKPyrBRrckzbELXVZ5Zjzm/pAmsOG8CBHb8EsnHxAJXQRcv17t6Rbx?= =?us-ascii?Q?m99+l6zCgSM2yNlKHsh4lK5A5btiUzTpY4vFvSwBX1N5ozyd8rCxt+xjVpO0?= =?us-ascii?Q?042OMte+X88CyNuNXCPqfR71YJk0OWZ+4VvfnbS4xxfbwan+lMVpJCu2FYSo?= =?us-ascii?Q?hqvzhimyWO6tcmvAia3WnYCFXh44XzGy0yuemCbbgLgVM+JcFxZh24qyR1M/?= =?us-ascii?Q?y3poWd60CZW7UfL6ZWrZd8I4PReli06v1q2DdEnYYmll79p3ZQUPb5Fg8X4b?= =?us-ascii?Q?XzpEzKZaB0GCJNY9YicDm8INnpX8aUWJhXVLCzxB16Xlkwl54hg6DZk+ljHD?= =?us-ascii?Q?nK7s+2e5WPDh0ZShECPZz6SZSdxcYzHRPmVIX8NK3ZbHYQEgVemftL2kSiZB?= =?us-ascii?Q?cLALEUk7CNl29jJJ0GTomN4lq4TGO/Pa5OpNX6RE0n03Ti8Gz8c3BUdYEGuJ?= =?us-ascii?Q?n/HR3M4JupIxJD8wi8hKHly2ajzg7nCNijAfIaOix4DC2qLmj5e+U58wag9/?= =?us-ascii?Q?aWEnPMxrpZlsEmPfMjpRMLeOofg+Di06I85gviGn1edTG70cU8tcZotTdKU8?= =?us-ascii?Q?xAlGRlSDw6yf91hclQJZdU0FNkQgovYoWTSkfrLhFgCCleNlthz747gS2W3f?= =?us-ascii?Q?qh1PUkibHuYMwrMWO8g+LzGL4nsmhm+0j3maBQ0qq/jXVdQZyZV6eae3BdG1?= =?us-ascii?Q?DSJU3mLxMta8HMLPKFMFDjswx+DqUyGS5Gh/bEWi//pf19Q7Ql9B7oOcxI/4?= =?us-ascii?Q?0u3G/OeWjwZ9m5XRc8I97cU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80ca755d-49d4-42a1-d55e-08d9d1a55e05 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:22.9853 (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: KecNMA84c6+aCTjy7/e7vgjbFCRU+pTxuAbf1Z8nPi7usWiUmkEP4SRlbFFjHi3wKAZlo8nJtQuCx6du3Yvccg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" The original code in the backup tests only works for the output of 'pm_nl_ctl dump'. It chooses the last item in the endpoints dump table to parse the address in it, and the address is always showed at the end of the item. But it dosen't work for the output of 'ip mptcp endpoint show', the address is always showed at the front of the item. This patch rewrites the backup tests to fit for the 'ip mptcp' output. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 14 ++++++++------ 1 file changed, 8 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 b41126d4b1c6..b8c21d0b8919 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -475,12 +475,14 @@ do_transfer() if [ ! -z $bkup ]; then sleep 1 for netns in "$ns1" "$ns2"; do - dump=3D(`ip netns exec $netns ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - addr=3D${dump[${#dump[@]} - 1]} - backup=3D"ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup" - $backup - fi + ip netns exec $netns ./pm_nl_ctl dump | while read line; do + local arr=3D($line) + # 'pm_nl_ctl' shows the address at the end + let pos=3D${#arr[@]}-1 + + addr=3D${arr[$pos]} + ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup + done done fi =20 --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101318jap; Thu, 6 Jan 2022 22:17:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzVGn7EDMJmFjAsbE03JzCTJ3+dB4QMo4Cf+xsuBTsKhxUfFSbAyoYszLKLFCJG7seWDXcP X-Received: by 2002:a63:794d:: with SMTP id u74mr23895253pgc.326.1641536261124; Thu, 06 Jan 2022 22:17:41 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id i17si7053265pjl.100.2022.01.06.22.17.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:17:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2972-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=d7QCKvWd; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2972-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2972-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 2B4B31C0D42 for ; Fri, 7 Jan 2022 06:17:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 804A52CA1; Fri, 7 Jan 2022 06:17:37 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 C81A82C9C for ; Fri, 7 Jan 2022 06:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r0mEc5GVs34TUzZgPFjuKVt8i+LB/310wSHE4XqJM/U=; b=d7QCKvWd9pYltoqHF6+38aJRneCxWGDcHrmzTrJAI+uCFmSfXhV7JG0rCN3Uf9wUCSbe4r qz9kIR+lEAwM98oz1eByJiNf5UQ/1y7KejDMquiDVgWI5+1IWUvi4mCr6wkGEg53N62H0+ sUXuuwnrEOBMqcldEeVfpcW7sD2w888= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2105.outbound.protection.outlook.com [104.47.17.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-29-Ol-c_9_8OWWBFl1QDymJPA-1; Fri, 07 Jan 2022 07:17:32 +0100 X-MC-Unique: Ol-c_9_8OWWBFl1QDymJPA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPXSNtVOvPinDf5RuC4FsBjB00M4P/AD6Stg1lyrDaDSZJ5kQAM2bpAjZE/5sDsiLRAu6cWquaYQezbwXDgBONeLZR0VwxHq8MJEhgQmYUIPMw0+y+VaFR0CFbg0mj60d8EdAua0CMmzMiRB0Pb6fL68oRbY7Sq0MpTScmFop6+sJsJVI+1ndXzUJ54TCXa/2ohdBlMyt/v1fHWcr2Yyv/E7j9oiLgeXGP9Pek30SVvFjpa38GZLlYJfqf7ZNe+X5Hzo7uIZlT/o2B5vSPTTJNbuc5pdR3Fr0gxLPhWvvSa+JQIEdInft0jfhYHJLaH1eLkWlDYgHTggHbz80Nc+RA== 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=sPCFqO0LKGJFd98z5194yHoDS2C9hEGxGLps4Wt0MsE=; b=lf0YtBchNYN5uvnLuDEHzNEKsaY3TjDZ/ZI6URhl3yuv/tR26tkEgyZzOyZ6HSl+7mzvQygm9XusE8BwlPCns1WT7p1fM6Bi55AvMnq2wtXJ3Jv/0qVXsxZOMqq5xbz4PYUC3F320p9kWskCKQrpagoYyct9x/gQeJqGisfVmF1qvF7APsKnFsMpGgv8h62BiMxRaCEZ5PyR/VTw8y1N7YWoUl2HYsKQlDaHOsuoOy0RrwcvyAp+Z6HejbAECGymt5QRnFlKKKBizcdBjpuCwF0tXoKKZTXmSSrS1NwBzrB7iG/Zw4yj+2KQyCkkDfqWJsT6MQ30GNVH3/wlgEnHoA== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 3/9] selftests: mptcp: implement pm_nl_set_limits Date: Fri, 7 Jan 2022 14:16:55 +0800 Message-ID: <519b852a686e5d347d5ef8c4f386b2152b8b0113.1641535880.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0178.apcprd02.prod.outlook.com (2603:1096:201:21::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-Office365-Filtering-Correlation-Id: 30f621c7-876f-4a40-7ee2-08d9d1a561f1 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1265; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJ4rLd0RVoW5QN+d55NcJ2uNGJ2wcHkQtZDi9ym8julEcLhvgCbbA7cNZcOY0hsfnFoRBUUmbkf5Ho8/2DTz4+c1ukqE2ACmKQbz8dhYyeMUipfTazErJD63bYeVg01miDdQrSDG12Bs6SpTtoyD0raLO/I/AHZ1qpoRteUpfu6rhBXrlSktTcRJiZqpIxSlYza0mM6WCWUPfPCSbZakUVc5xHHpURL+J2NBTGWMwJ0muU1QtvnSbEHlMffb3HH5JrAIQ8p5PdM1ZSB5AD4/YyLHCt0W+5gdrx30LEWRTey98ogy0DD7SVIC+46rWFmGdcfLf8yVukDs6QRn+X6u7CBXEx74zNIeFP3lduqoUqzV/OpjtWQcs1aPf5lbNiwhfTjnPYj5ifTj5PyvUsF/lBEQOurIbnpA7+GwQTPovYigKGV/ZKYyHZH+UXASTeq+OaEz2d2O0pvyyTj0WsCj8DACmRJS5T822DuBpHqWziuuNvVyXgHXnc92WMbLsyjLTLLGuYHKt8+WPVxaGdDFZx9J4azumDwDQTqmt89veARCHaLo+yb2aM3Ip1OmgjulDtdQX55KkvX+HZAiy5WmeGvj2rOGXAarDjXZT0FvMyiJDyLeenZvF/TFNObHMG6W 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6666004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(30864003)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7DjIuo5j8NOwJnxDD2MyMh4SHA2cHQo4j4U2erphrHbKQ4JxbD9eEjoJqr5p?= =?us-ascii?Q?BayZIy6M77URR27g1TFBTWS4+LmIrZRZFLRW//SycnRDLcjwvaaAHlz9G3zh?= =?us-ascii?Q?0BXGfyVE/Si6d6WWcymj3zRmSsQnB8Y2M3dmY1xfcsuCPUGJZpqQvYJjnbXj?= =?us-ascii?Q?UN1mfv32PptVryck9/h9w5ODVdW0ZUS+dDFw8aukRn51d9J9fJL/hldeqJQe?= =?us-ascii?Q?Ve7P8VrtIOpWElbbzSvWJm8XRTVJZg3H2jAwbQxKoijkA+xkqWcvmN6Y/pdF?= =?us-ascii?Q?5BkxhgFaiksXRSnzrcwZBwSC7iP1RReN6cJbFoA8/P+W0CN3teNDlG2wTVTP?= =?us-ascii?Q?X0VAzGAHJlm0lQ6hGWz/rOEN/9zsDjfm9a8d8KwSqR7h5exu0R//5ZE8VtzL?= =?us-ascii?Q?6cNY7TZzgkNi++sAA2O1CgzaBQa9bdBuiMRxf6grw7NwvnIFaHo4LDxS8SW2?= =?us-ascii?Q?p98IaAHK8NV+1V7ST27azQ3uq+HqKst/ZejfWp15mv06Ui6CSei1LZsd/QRC?= =?us-ascii?Q?THp3O954A3tWdKyeY8oFdFn8qp/aHyHIf/09V1bsiLBxwtWZ4l6s33o0XmjC?= =?us-ascii?Q?C13/Wg2jGTlLwRFeXrNmze4J61yMKc5lKordJXzTm0C8yadd62B1qUp7IlVc?= =?us-ascii?Q?YIIhS/LulkoaCI1GJhWkfpsR0C2can2AQH94dOF/GHUcDP3RNfDN77ivIkib?= =?us-ascii?Q?iVU6ZeunL26Nb7PY8xgr7vHCrWQzAZkXUm4bOSVAgyIUGx7QZDEVVsULWx7u?= =?us-ascii?Q?VK8uxnCO4HvX1obTFtI+3ivMVZwTG7y7EwZGGpReoEvJmXIUnxuTZexAGIPR?= =?us-ascii?Q?HvYp3vyeigB9F1r9FbdP9tR7Oyob5/snRzJ57olsqRj09ATiJuFFhWmWYOwA?= =?us-ascii?Q?HwVpEcOKiJNmZVrMbWJma3zzOoiEpN7uUo8KdUWmEFXCWum0NTZ4Us4bUdFY?= =?us-ascii?Q?aMsPUttMJvHmj6CWAgK0Jji00DSCwd7Azvzz+v+FMiYw4VQgFkI7YWG48zKI?= =?us-ascii?Q?6rQ72SZab0mRJQGeLvhYHb78NuQ8RgVGc7uroGiO3vm2csgfhStbazmKpVv6?= =?us-ascii?Q?3NUqXwmSCeIArkhHteXlz5DUfttl586S/RK10FGJgRd/f5Dbuf+FboBry6h3?= =?us-ascii?Q?RZEI38KCdVge7h4/ZCQu4caBWIAMgxhts5Rr86y9RBUPuxQNX2TUlhxcgZwz?= =?us-ascii?Q?hJZnmzMLsWwrMYFFLNwdHGu79gLLt2AvODs2B2tmyQs4AseTK1AQHnTe7B3a?= =?us-ascii?Q?JhheBHb3TCM5OnlP5HgL4fV7YihQH71aUgb7u4pdh1hAJBQO5MPVIWxRQKd3?= =?us-ascii?Q?dE8JNfDOH8lYbeDqnJPF+qAGwP8zknCDh0/Al8y++FeEBMwrgSDxrxoA5FNd?= =?us-ascii?Q?U4bYVNX5IegCbCrkt8+TlS3Ag8V1JfWAUKovSCYxoEC5Xdp98Z+dDFM5ixEi?= =?us-ascii?Q?PFF7wGMIuass/Jpy1zPdHfhtJEXghXoXTflUAIIdCtmCg4bbQtWvzyu56nYr?= =?us-ascii?Q?zgYAyffTbcnwg42uBukw47wXeXYKjWgbju9SoOQnwdJa4UWQZbpeSZ2j8P2Y?= =?us-ascii?Q?oy49suwB5EojEwNdTUhssDhBoQbZ8yBhV57ma1FC1BarTiY3pvfhOaLZylvv?= =?us-ascii?Q?J8GaPYp875RNo2liv1xsQHo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30f621c7-876f-4a40-7ee2-08d9d1a561f1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:29.6567 (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: urGY6wh9/nLRc2oGKV/MhjC06e5ItjBhaZLjVrKiYOXIUfJnr/x0wRoW8AW+KQCkeu64+CIrPiGwyLIa6FzYyQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_set_limits(), wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in it, and used a new argument 'ip_mptcp' to choose which one to use for the PM limits setting. Used this wrapper in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 378 +++++++++--------- 1 file changed, 196 insertions(+), 182 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b8c21d0b8919..d9142ad820e4 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -15,6 +15,7 @@ timeout_test=3D$((timeout_poll * 2 + 1)) mptcp_connect=3D"" capture=3D0 checksum=3D0 +ip_mptcp=3D0 do_all_tests=3D1 =20 TEST_COUNT=3D0 @@ -278,6 +279,19 @@ wait_rm_addr() done } =20 +pm_nl_set_limits() +{ + local ns=3D$1 + local nr_addrs=3D$2 + local nr_subflows=3D$3 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp limits set add_addr_accepted $nr_addrs subflows $nr_subf= lows + else + ip netns exec $ns ./pm_nl_ctl limits $nr_addrs $nr_subflows + fi +} + do_transfer() { listener_ns=3D"$1" @@ -1024,32 +1038,32 @@ subflows_tests() =20 # subflow limited by client reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 0 - ip netns exec $ns2 ./pm_nl_ctl limits 0 0 + pm_nl_set_limits $ns1 0 0 + pm_nl_set_limits $ns2 0 0 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, limited by client" 0 0 0 =20 # subflow limited by server reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 0 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 0 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, limited by server" 1 1 0 =20 # subflow reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow" 1 1 1 =20 # multiple subflows reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1057,8 +1071,8 @@ subflows_tests() =20 # multiple subflows limited by server reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1066,8 +1080,8 @@ subflows_tests() =20 # single subflow, dev reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow dev ns2eth3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, dev" 1 1 1 @@ -1078,16 +1092,16 @@ subflows_error_tests() # If a single subflow is configured, and matches the MPC src # address, no additional subflow should be created reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "no MPC reuse with single endpoint" 0 0 0 =20 # multiple subflows, with subflow creation error reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT @@ -1096,8 +1110,8 @@ subflows_error_tests() =20 # multiple subflows, with subflow timeout on MPJ reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP @@ -1108,8 +1122,8 @@ subflows_error_tests() # closed subflow (due to reset) is not reused if additional # subflows are added later reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow & @@ -1139,8 +1153,8 @@ signal_address_tests() =20 # accept and use add_addr reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address" 1 1 1 @@ -1152,8 +1166,8 @@ signal_address_tests() # used for 'add_addr' subflow reset ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal" 2 2 2 @@ -1161,9 +1175,9 @@ signal_address_tests() =20 # accept and use add_addr with additional subflows reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1172,30 +1186,30 @@ signal_address_tests() =20 # signal addresses reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal addresses" 3 3 3 chk_add_nr 3 3 =20 # signal invalid addresses reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.14.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal invalid addresses" 1 1 1 chk_add_nr 3 3 =20 # signal addresses race test reset - ip netns exec $ns1 ./pm_nl_ctl limits 4 4 - ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + pm_nl_set_limits $ns1 4 4 + pm_nl_set_limits $ns2 4 4 ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal @@ -1223,9 +1237,9 @@ link_failure_tests() # active backup and link switch-over. # Let's set some arbitrary (low) virtual link limits. init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 dev ns2eth4 flags subflow run_tests $ns1 $ns2 10.0.1.1 1 @@ -1237,9 +1251,9 @@ link_failure_tests() # for bidirectional transfer reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 dev ns2eth4 flags subflow run_tests $ns1 $ns2 10.0.1.1 2 @@ -1251,9 +1265,9 @@ link_failure_tests() # will never be used reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns2 1 2 export FAILING_LINKS=3D"1" ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup run_tests $ns1 $ns2 10.0.1.1 1 @@ -1265,9 +1279,9 @@ link_failure_tests() # the traffic reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup export FAILING_LINKS=3D"1 2" run_tests $ns1 $ns2 10.0.1.1 1 @@ -1280,9 +1294,9 @@ link_failure_tests() # for bidirectional transfer reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr "backup flow used, bidi, link failure" 2 2 2 @@ -1295,8 +1309,8 @@ add_addr_timeout_tests() { # add_addr timeout reset_with_add_addr_timeout - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1 @@ -1304,8 +1318,8 @@ add_addr_timeout_tests() =20 # add_addr timeout IPv6 reset_with_add_addr_timeout 6 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1 @@ -1313,20 +1327,20 @@ add_addr_timeout_tests() =20 # signal addresses timeout reset_with_add_addr_timeout - ip netns exec $ns1 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 2 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 0 0 0 least chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2 chk_add_nr 8 0 =20 # signal invalid addresses timeout reset_with_add_addr_timeout - ip netns exec $ns1 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 2 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 0 0 0 least chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1 chk_add_nr 8 0 @@ -1336,8 +1350,8 @@ remove_tests() { # single subflow, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr "remove single subflow" 1 1 1 @@ -1345,8 +1359,8 @@ remove_tests() =20 # multiple subflows, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow @@ -1355,9 +1369,9 @@ remove_tests() =20 # single address, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow chk_join_nr "remove single address" 1 1 1 chk_add_nr 1 1 @@ -1365,9 +1379,9 @@ remove_tests() =20 # subflow and signal, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow chk_join_nr "remove subflow and signal" 2 2 2 @@ -1376,9 +1390,9 @@ remove_tests() =20 # subflows and signal, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow @@ -1388,11 +1402,11 @@ remove_tests() =20 # addresses remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal id 250 ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow chk_join_nr "remove addresses" 3 3 3 chk_add_nr 3 3 @@ -1400,11 +1414,11 @@ remove_tests() =20 # invalid addresses remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.14.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow chk_join_nr "remove invalid addresses" 1 1 1 chk_add_nr 3 3 @@ -1412,9 +1426,9 @@ remove_tests() =20 # subflows and signal, flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow @@ -1424,8 +1438,8 @@ remove_tests() =20 # subflows flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 + pm_nl_set_limits $ns2 3 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow id 150 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow @@ -1435,11 +1449,11 @@ remove_tests() =20 # addresses flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal id 250 ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush addresses" 3 3 3 chk_add_nr 3 3 @@ -1447,11 +1461,11 @@ remove_tests() =20 # invalid addresses flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns1 3 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal ip netns exec $ns1 ./pm_nl_ctl add 10.0.14.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 3 3 + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow chk_join_nr "flush invalid addresses" 1 1 1 chk_add_nr 3 3 @@ -1459,8 +1473,8 @@ remove_tests() =20 # remove id 0 subflow reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow chk_join_nr "remove id 0 subflow" 1 1 1 @@ -1468,9 +1482,9 @@ remove_tests() =20 # remove id 0 address reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow chk_join_nr "remove id 0 address" 1 1 1 chk_add_nr 1 1 @@ -1481,37 +1495,37 @@ add_tests() { # add single subflow reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow chk_join_nr "add single subflow" 1 1 1 =20 # add signal address reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow chk_join_nr "add signal address" 1 1 1 chk_add_nr 1 1 =20 # add multiple subflows reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow chk_join_nr "add multiple subflows" 2 2 2 =20 # add multiple subflows IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow chk_join_nr "add multiple subflows IPv6" 2 2 2 =20 # add multiple addresses IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow chk_join_nr "add multiple addresses IPv6" 2 2 2 chk_add_nr 2 2 @@ -1521,8 +1535,8 @@ ipv6_tests() { # subflow IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "single subflow IPv6" 1 1 1 @@ -1536,18 +1550,18 @@ ipv6_tests() =20 # signal address IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "single address IPv6" 1 1 1 chk_add_nr 1 1 =20 # single address IPv6, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow chk_join_nr "remove single address IPv6" 1 1 1 chk_add_nr 1 1 @@ -1555,9 +1569,9 @@ ipv6_tests() =20 # subflow and signal IPv6, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow chk_join_nr "remove subflow and signal IPv6" 2 2 2 @@ -1569,16 +1583,16 @@ v4mapped_tests() { # subflow IPv4-mapped to IPv4-mapped reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "single subflow IPv4-mapped" 1 1 1 =20 # signal address IPv4-mapped with IPv4-mapped sk reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "signal address IPv4-mapped" 1 1 1 @@ -1586,16 +1600,16 @@ v4mapped_tests() =20 # subflow v4-map-v6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "single subflow v4-map-v6" 1 1 1 =20 # signal address v4-map-v6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "signal address v4-map-v6" 1 1 1 @@ -1603,16 +1617,16 @@ v4mapped_tests() =20 # subflow v6-map-v4 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow v6-map-v4" 1 1 1 =20 # signal address v6-map-v4 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address v6-map-v4" 1 1 1 @@ -1620,24 +1634,24 @@ v4mapped_tests() =20 # no subflow IPv6 to v4 address reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add dead:beef:2::2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN with diff families v4-v6" 0 0 0 =20 # no subflow IPv6 to v4 address even if v6 has a valid v4 at the end reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add dead:beef:2::10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0 =20 # no subflow IPv4 to v6 address, no need to slow down too then reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr "no JOIN with diff families v6-v4" 0 0 0 @@ -1647,8 +1661,8 @@ backup_tests() { # single subflow, backup reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup chk_join_nr "single subflow, backup" 1 1 1 @@ -1656,9 +1670,9 @@ backup_tests() =20 # single address, backup reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "single address, backup" 1 1 1 chk_add_nr 1 1 @@ -1669,8 +1683,8 @@ add_addr_ports_tests() { # signal address with port reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address with port" 1 1 1 @@ -1679,8 +1693,8 @@ add_addr_ports_tests() # subflow and signal with port reset ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal with port" 2 2 2 @@ -1688,9 +1702,9 @@ add_addr_ports_tests() =20 # single address with port, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow chk_join_nr "remove single address with port" 1 1 1 chk_add_nr 1 1 1 @@ -1698,9 +1712,9 @@ add_addr_ports_tests() =20 # subflow and signal with port, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow chk_join_nr "remove subflow and signal with port" 2 2 2 @@ -1709,9 +1723,9 @@ add_addr_ports_tests() =20 # subflows and signal with port, flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow @@ -1721,20 +1735,20 @@ add_addr_ports_tests() =20 # multiple addresses with port reset - ip netns exec $ns1 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 2 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal port 10100 - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple addresses with port" 2 2 2 chk_add_nr 2 2 2 =20 # multiple addresses with ports reset - ip netns exec $ns1 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 2 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal port 10101 - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple addresses with ports" 2 2 2 chk_add_nr 2 2 2 @@ -1744,16 +1758,16 @@ syncookies_tests() { # single subflow, syncookies reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow with syn cookies" 1 1 1 =20 # multiple subflows with syn cookies reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1761,8 +1775,8 @@ syncookies_tests() =20 # multiple subflows limited by server reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1770,8 +1784,8 @@ syncookies_tests() =20 # test signal address with cookies reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address with syn cookies" 1 1 1 @@ -1780,8 +1794,8 @@ syncookies_tests() # test cookie with subflow and signal reset_with_cookies ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 1 2 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal w cookies" 2 2 2 @@ -1789,9 +1803,9 @@ syncookies_tests() =20 # accept and use add_addr with additional subflows reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl limits 0 3 + pm_nl_set_limits $ns1 0 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1803,29 +1817,29 @@ checksum_tests() { # checksum test 0 0 reset_with_checksum 0 0 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 0 0" =20 # checksum test 1 1 reset_with_checksum 1 1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 1 1" =20 # checksum test 0 1 reset_with_checksum 0 1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 0 1" =20 # checksum test 1 0 reset_with_checksum 1 0 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 1 0" } @@ -1834,16 +1848,16 @@ deny_join_id0_tests() { # subflow allow join id0 ns1 reset_with_allow_join_id0 1 0 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow allow join id0 ns1" 1 1 1 =20 # subflow allow join id0 ns2 reset_with_allow_join_id0 0 1 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow allow join id0 ns2" 0 0 0 @@ -1851,8 +1865,8 @@ deny_join_id0_tests() # signal address allow join id0 ns1 # ADD_ADDRs are not affected by allow_join_id0 value. reset_with_allow_join_id0 1 0 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address allow join id0 ns1" 1 1 1 @@ -1861,8 +1875,8 @@ deny_join_id0_tests() # signal address allow join id0 ns2 # ADD_ADDRs are not affected by allow_join_id0 value. reset_with_allow_join_id0 0 1 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address allow join id0 ns2" 1 1 1 @@ -1870,8 +1884,8 @@ deny_join_id0_tests() =20 # subflow and address allow join id0 ns1 reset_with_allow_join_id0 1 0 - ip netns exec $ns1 ./pm_nl_ctl limits 2 2 - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 2 2 + pm_nl_set_limits $ns2 2 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1879,8 +1893,8 @@ deny_join_id0_tests() =20 # subflow and address allow join id0 ns2 reset_with_allow_join_id0 0 1 - ip netns exec $ns1 ./pm_nl_ctl limits 2 2 - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 2 2 + pm_nl_set_limits $ns2 2 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 @@ -1893,8 +1907,8 @@ fullmesh_tests() # 2 fullmesh addrs in ns2, added before the connection, # 1 non-fullmesh addr in ns1, added during the connection. reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 4 - ip netns exec $ns2 ./pm_nl_ctl limits 1 4 + pm_nl_set_limits $ns1 0 4 + pm_nl_set_limits $ns2 1 4 ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow,fullmesh ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,fullmesh run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow @@ -1905,8 +1919,8 @@ fullmesh_tests() # 1 non-fullmesh addr in ns1, added before the connection, # 1 fullmesh addr in ns2, added during the connection. reset - ip netns exec $ns1 ./pm_nl_ctl limits 1 3 - ip netns exec $ns2 ./pm_nl_ctl limits 1 3 + pm_nl_set_limits $ns1 1 3 + pm_nl_set_limits $ns2 1 3 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow chk_join_nr "fullmesh test 1x1" 3 3 3 @@ -1916,8 +1930,8 @@ fullmesh_tests() # 1 non-fullmesh addr in ns1, added before the connection, # 2 fullmesh addrs in ns2, added during the connection. reset - ip netns exec $ns1 ./pm_nl_ctl limits 2 5 - ip netns exec $ns2 ./pm_nl_ctl limits 1 5 + pm_nl_set_limits $ns1 2 5 + pm_nl_set_limits $ns2 1 5 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow chk_join_nr "fullmesh test 1x2" 5 5 5 @@ -1928,8 +1942,8 @@ fullmesh_tests() # 2 fullmesh addrs in ns2, added during the connection, # limit max_subflows to 4. reset - ip netns exec $ns1 ./pm_nl_ctl limits 2 4 - ip netns exec $ns2 ./pm_nl_ctl limits 1 4 + pm_nl_set_limits $ns1 2 4 + pm_nl_set_limits $ns2 1 4 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow chk_join_nr "fullmesh test 1x2, limited" 4 4 4 @@ -1941,8 +1955,8 @@ userspace_tests() # userspace pm type prevents add_addr reset ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type prevents add_addr" 0 0 0 @@ -1951,8 +1965,8 @@ userspace_tests() # userspace pm type echoes add_addr reset ip netns exec $ns2 sysctl -q net.mptcp.pm_type=3D1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type echoes add_addr" 0 0 0 @@ -1961,8 +1975,8 @@ userspace_tests() # userspace pm type rejects join reset ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type rejects join" 1 1 0 @@ -1970,8 +1984,8 @@ userspace_tests() # userspace pm type does not send join reset ip netns exec $ns2 sysctl -q net.mptcp.pm_type=3D1 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type does not send join" 0 0 0 @@ -1979,8 +1993,8 @@ userspace_tests() # userspace pm type prevents mp_prio reset ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 - ip netns exec $ns1 ./pm_nl_ctl limits 1 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "userspace pm type prevents mp_prio" 1 1 0 @@ -1990,8 +2004,8 @@ userspace_tests() reset ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 ip netns exec $ns2 sysctl -q net.mptcp.pm_type=3D1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr "userspace pm type prevents rm_addr" 0 0 0 --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101375jap; Thu, 6 Jan 2022 22:17:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJwRkkslc94RuNeFQihMNDpzi5rHP6p254iQg3buObtgtCHK9AfCBoB8amJIIBtOJawIW5Gv X-Received: by 2002:a05:6a00:1398:b0:4bc:cd09:31d7 with SMTP id t24-20020a056a00139800b004bccd0931d7mr14793521pfg.12.1641536267861; Thu, 06 Jan 2022 22:17:47 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id j12si3880837plk.616.2022.01.06.22.17.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:17:47 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2973-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=P1LlSAnU; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2973-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2973-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 3C9A13E0F3C for ; Fri, 7 Jan 2022 06:17:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F3C1F2CA1; Fri, 7 Jan 2022 06:17:45 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 45E342C9C for ; Fri, 7 Jan 2022 06:17:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UmaJ0tmO5pm6SRcNgPXXTgM6+yvTuF+KkWLQWP5YdhU=; b=P1LlSAnUp9r+wKOu297DZk7TWfO5ch1CZKOxnTh9LyUOpdMcfijozBCbHn5iCRPkC/eMKr j+16Ou+ZsbgGRanMRa4qe1F6MPc4p8FNGahiSxcDEY+c91q5rHFSmC3b+MowkL1FXJwwwY SQ2HsKRltx4eeqiHqfl0m+EiYAAUudE= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-4jrOm0X9PbaERhpvr1mldg-1; Fri, 07 Jan 2022 07:17:40 +0100 X-MC-Unique: 4jrOm0X9PbaERhpvr1mldg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZTtoBrn3nKz2q8mOM9huaZvAKmVHuLV4YLiGv2r6E5rVIl2t7ZysNLbQYgIZgX6Ga0uawyrwmwyB/OJ8i0uYK+NCuYIjn4sVGv9/DPkVU6w8rQAK6n2QG9Cj9hFoTWzz0+TgHFCJ9H5ckX/wPyCxb+1cnX6JLIiysTDK4QW6epyvtepG0YoNcljU5KbZE4kKA0pXcAxqV9qqx5U5vbxrG4OHJ7zTnI8p47l0Fr/vw0wEC61nzo6EpL/ZddjGvMUdxl3Fbb7HnHm5Z58WtJFGN55RJ3CbUZ2o3StCO9Jr4MhW60mZHdflI/mO3wSjvwwiCKT86PQoMzH7z50j7/qmQA== 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=DIE09m9TDx7X9rR0vRH9RbMZsPqnaV13eXpYZXTc5Tw=; b=le7BHrds0ykV/t/Kd6EPGIJNJ4CpExQq4JEwIK2B4Bd0wDKvjDYw5Swk/GbBdLj/U71xW2iVddSq8WbI2ohxxO/lmwaCxz8EQGOVwSuzaJ/KoeAvz/uexqGwaL7zMQ2976t4cCHIsUWRgubjIrqDp9WNqQ16os3VOqOkFYnHAlx8cXqXRxUM8sFMsdbLMpS9m7vQO4/cWHa/txeuoO+MSl52yPo3LL+J3sgit30ITR4u6TozRVU5QFtrANfb0FzKl6w7IoFS4Sa1OIKirXSP82UGXbyG1fty13SCqk0pkkIihGrjBIPPWkAv2+Q0nyL31UDyHOHt8AII5xz5HTzfqw== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:38 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 4/9] selftests: mptcp: implement pm_nl_add_endpoint Date: Fri, 7 Jan 2022 14:16:56 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0175.apcprd02.prod.outlook.com (2603:1096:201:21::11) 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-Office365-Filtering-Correlation-Id: e8b267a5-1862-498b-3ef0-08d9d1a566dc X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1751; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G1RNRIqRGVGTCiVxvA1Z7xbzm1WmCVgedUclp27591QDO9awFbcSCFSF3zAJzPqNAEI6qCW8z7PUk5zzn7drKnVKVYdujT6JSqnHuL1fdc33hMGTAsHhu8cWQi0TdwVyQK3i2LMSDPnzsnMPvCxesRrt4KaVuCU6JgHyWEpdjczTq9Qle1JBP4s27UOCbTCY/U+7I6mielpsB8FJpFOA1TRb5G16uwNPOqiTOkSjNKLmRggtthrz9wdcLXUeYOGXjMsSjSGLvibyM3gxgDfasTWlIH7T7B5llNOBov4tUWjkfDOIrm82DOAugybDp3K3Yv66InmbphB+h2EArfF7MSbbYTsNotQM4aukky+7bNcl5o4ZsUYa4EY4BSATGVDawx27/GiFjo6LFSXQR1DwOuMU7z76KKURNfoxo/C4tmVX8u/olpl1gzCPspCOZ1ReMqkv4LNJs+eHoppg1gQ4LJHnsm80irBkx3Ys3ca5AcYjK0M880wxumsnvhWZ6Jb5/Ov8jqdcG4jnVk3T4bfZApZxjUtcSq+sQCRysnUS/Qc2+PW7u1egLRDmC4cLwrZwQA3d21wRjwp5g3R5hQA7dKnm8FKWg5yt4v/hbVCIxdQOdPJDUujOOO4uD5NuJGe7 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6666004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(30864003)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3y6rurGFVIbHk7joSqZqxkoJm71h65PG+BAonOst9DI/HTwwb9Sa4QOzhlnc?= =?us-ascii?Q?+RJs2WJuDsNzIfyIKSrCDXrwOXe3zzeWtWw6O3IoiEL2qTxqa9gBI9AW++8S?= =?us-ascii?Q?ltA697xpjAY0hZcrVydPySTjGllMuYMg4zHXpmR65T901HU6wD4tjA6TCOM5?= =?us-ascii?Q?4c09uinWGuY/o72M67fEDMNd6PDaU7Bqs+YSZlsqwfp4ol9zYs2ni2j++myX?= =?us-ascii?Q?KsyLKiUX9+30mtxc6OFdGtRye3GqgMEViAsh3zhFh/XtrkruFnobR3DGlccV?= =?us-ascii?Q?rFjBL1UT3BLVtIqtKzNIKYFfMBprxY5QcPejy+CQClvTT776lMdctLp+q5J8?= =?us-ascii?Q?z3WLEhldVQ0uHMyKFYQosm6Xk7Rdhb3cxQPmhFGTxlzAiSLZESsl3Hf26DYy?= =?us-ascii?Q?oA/3p+hO3K2IHuzqeXPcs5oxJl//2SS0wA59fvSTx2uqm6a/p82AStmH03qU?= =?us-ascii?Q?lLz8ai9UmG+G86OLnwN207N1Op19cqEDc/BliHZ9pjZ+LKGrFG70YvFnhZ/X?= =?us-ascii?Q?5Ah8/tc7dyn0v0033bQc2ClAB8smvu2KfCXg6n6mmWNKDT3BwEky+yRZiO8R?= =?us-ascii?Q?hQhZUYBKywQVzaLGsIJnzrQ+xA0LrbbpkhhBSulVajIcWgXt+MxwzeFRQTzB?= =?us-ascii?Q?CO1sgE4/2O+WLh3OT4jjzfJ2qeLLq0R0aaAljTvXKM26+UkguS0HpjQEjZI4?= =?us-ascii?Q?jHkhK8TfjYHoCvxy/vzS6+wj7S8lKA8VCjNnNx6qNVX/6OLcc7Fxt/Vbh9Ie?= =?us-ascii?Q?V31soXVrZctxn74IAQWcWIXa9EkJHge43BEWemaciUNz/S4+pCEOhNrFCkqN?= =?us-ascii?Q?HCTTB4W3K/2V19zG6SdIqUPsGHHsQm+4YVMQXDWHAVZPIxSSbz0UMVtv5dLq?= =?us-ascii?Q?CxsV7xbyW3bHHM4yhvSm/Q5s75fselVs85X16Dvi7KHw4xcBeErlcdzeDfxp?= =?us-ascii?Q?+i0jsz9ww4YAdGnI1YIeGkN9vUblAQSnIb7rqXZ3oHkwhrToMNReNuSNXRyT?= =?us-ascii?Q?zZDrzkweOLLRTwCK11PrTozBvqDH58s3lh5B7azQWw0k5t94pgULXwpryc5a?= =?us-ascii?Q?4x51HWe29kYcsslZErPWEmDJTeAUG0pIq3Ieh/nmqHkhp0DvNh9xT29Ukgpv?= =?us-ascii?Q?lZAlZfvmWKMsBGMSG4GC+HkdCupUqTw1P1FrGc5v/260u7Xkz7c8QCEHvyxU?= =?us-ascii?Q?ZM6FtEHpgnYJa06/OhwG9sg7EZouzNPFdDo1ngWiPjUahGvP4Vbjxzw8quMD?= =?us-ascii?Q?sp1vvAKwpIlV6nKh0COd1jZIC5Wp7kPN9Cko0YrWPQ9bmgjUbEDPNgDbqRe1?= =?us-ascii?Q?89tsayowzpPWMi2Lk6eA0hEh4DeNbGTn0ytLoyLmfPUoAhlIv7pkDSTkFvJ6?= =?us-ascii?Q?DLRsl5Jln1/nGrSoNU6UoM4k8b+K/6tXS4ecC+LhgSvXnmufyZd6f8JKkrQj?= =?us-ascii?Q?phxDybu3W+O+oKcU5UJ51SqRi2andSDzicGmr5YB9ndkxd1fAJVvVwL2ouzw?= =?us-ascii?Q?xV4X8XwArYr1kq0jJYwFgz47wE6dS1PHk/Pkrz5psWErfc5+7atN1txaIn79?= =?us-ascii?Q?sW8eUL0d3HKdz4cYeJt4haLEQJUsgR5Xg4DpkGhK+byAuHq74fo7tIvQKltz?= =?us-ascii?Q?/ziyBzB4Rs8T6mD6fuT4+KM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8b267a5-1862-498b-3ef0-08d9d1a566dc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:37.9060 (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: e1672uvPZhFumc6DzNYBKCGf93gau2gYvNC7Na89ncrENK2JtTdsFLqwZo+Oq9lzW6Mp91d8z/EGIXgk0kNRUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_add_endpoint(), wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in it, and used a new argument 'ip_mptcp' to choose which one to use for adding the PM endpoint. Used this wrapper in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 337 ++++++++++-------- 1 file changed, 192 insertions(+), 145 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d9142ad820e4..788a2ec75458 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -292,6 +292,53 @@ pm_nl_set_limits() fi } =20 +pm_nl_add_endpoint() +{ + local ns=3D$1 + local addr=3D$2 + local flags + local port + local dev + local id + local nr=3D2 + + for p in $@ + do + if [ $p =3D "flags" ]; then + eval _flags=3D\$"$nr" + if [ ! -z $_flags ]; then + flags=3D"flags $_flags" + fi + fi + if [ $p =3D "dev" ]; then + eval _dev=3D\$"$nr" + if [ ! -z $_dev ]; then + dev=3D"dev $_dev" + fi + fi + if [ $p =3D "id" ]; then + eval _id=3D\$"$nr" + if [ ! -z $_id ]; then + id=3D"id $_id" + fi + fi + if [ $p =3D "port" ]; then + eval _port=3D\$"$nr" + if [ ! -z $_port ]; then + port=3D"port $_port" + fi + fi + + let nr+=3D1 + done + + if [ $ip_mptcp -eq 1 ]; 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 + fi +} + do_transfer() { listener_ns=3D"$1" @@ -392,7 +439,7 @@ do_transfer() else addr=3D"10.0.$counter.1" fi - ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal + pm_nl_add_endpoint $ns1 $addr flags signal let counter+=3D1 let add_nr_ns1-=3D1 done @@ -445,7 +492,7 @@ do_transfer() else addr=3D"10.0.$counter.2" fi - ip netns exec $ns2 ./pm_nl_ctl add $addr flags $flags + pm_nl_add_endpoint $ns2 $addr flags $flags let counter+=3D1 let add_nr_ns2-=3D1 done @@ -1040,7 +1087,7 @@ subflows_tests() reset pm_nl_set_limits $ns1 0 0 pm_nl_set_limits $ns2 0 0 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, limited by client" 0 0 0 =20 @@ -1048,7 +1095,7 @@ subflows_tests() reset pm_nl_set_limits $ns1 0 0 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, limited by server" 1 1 0 =20 @@ -1056,7 +1103,7 @@ subflows_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow" 1 1 1 =20 @@ -1064,8 +1111,8 @@ subflows_tests() reset pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + 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 chk_join_nr "multiple subflows" 2 2 2 =20 @@ -1073,8 +1120,8 @@ subflows_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + 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 chk_join_nr "multiple subflows, limited by server" 2 2 1 =20 @@ -1082,7 +1129,7 @@ subflows_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow dev ns2eth3 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow dev ns2eth3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, dev" 1 1 1 } @@ -1094,7 +1141,7 @@ subflows_error_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "no MPC reuse with single endpoint" 0 0 0 =20 @@ -1102,8 +1149,8 @@ subflows_error_tests() reset pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "multi subflows, with failing subflow" 1 1 1 @@ -1112,8 +1159,8 @@ subflows_error_tests() reset pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j DROP run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "multi subflows, with subflow timeout" 1 1 1 @@ -1124,7 +1171,7 @@ subflows_error_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow ip netns exec $ns1 iptables -A INPUT -s 10.0.3.2 -p tcp -j REJECT run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow & =20 @@ -1134,7 +1181,7 @@ subflows_error_tests() =20 # mpj subflow will be in TW after the reset wait_for_tw $ns2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow wait =20 # additional subflow could be created only if the PM select @@ -1146,7 +1193,7 @@ signal_address_tests() { # add_address, unused reset - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "unused signal address" 0 0 0 chk_add_nr 1 1 @@ -1155,7 +1202,7 @@ signal_address_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address" 1 1 1 chk_add_nr 1 1 @@ -1165,10 +1212,10 @@ signal_address_tests() # belong to different subnets or one of the listed local address could be # used for 'add_addr' subflow reset - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal" 2 2 2 chk_add_nr 1 1 @@ -1176,10 +1223,10 @@ signal_address_tests() # accept and use add_addr with additional subflows reset pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows and signal" 3 3 3 chk_add_nr 1 1 @@ -1187,9 +1234,9 @@ signal_address_tests() # signal addresses reset pm_nl_set_limits $ns1 3 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + 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 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal addresses" 3 3 3 @@ -1198,9 +1245,9 @@ signal_address_tests() # signal invalid addresses reset pm_nl_set_limits $ns1 3 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.14.1 flags signal + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + 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 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal invalid addresses" 1 1 1 @@ -1210,14 +1257,14 @@ signal_address_tests() reset pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags signal - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags signal - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags signal - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags signal + pm_nl_add_endpoint $ns1 10.0.1.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_add_endpoint $ns2 10.0.1.2 flags signal + pm_nl_add_endpoint $ns2 10.0.2.2 flags signal + pm_nl_add_endpoint $ns2 10.0.3.2 flags signal + pm_nl_add_endpoint $ns2 10.0.4.2 flags signal run_tests $ns1 $ns2 10.0.1.1 =20 # the server will not signal the address terminating @@ -1238,10 +1285,10 @@ link_failure_tests() # Let's set some arbitrary (low) virtual link limits. init_shapers pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 dev ns2eth4 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "multiple flows, signal, link failure" 3 3 3 chk_add_nr 1 1 @@ -1252,10 +1299,10 @@ link_failure_tests() reset init_shapers pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 dev ns2eth4 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr "multi flows, signal, bidi, link fail" 3 3 3 chk_add_nr 1 1 @@ -1266,10 +1313,10 @@ link_failure_tests() reset init_shapers pm_nl_set_limits $ns1 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 export FAILING_LINKS=3D"1" - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "backup subflow unused, link failure" 2 2 2 chk_add_nr 1 1 @@ -1280,9 +1327,9 @@ link_failure_tests() reset init_shapers pm_nl_set_limits $ns1 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup export FAILING_LINKS=3D"1 2" run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "backup flow used, multi links fail" 2 2 2 @@ -1295,9 +1342,9 @@ link_failure_tests() reset init_shapers pm_nl_set_limits $ns1 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr "backup flow used, bidi, link failure" 2 2 2 chk_add_nr 1 1 @@ -1311,7 +1358,7 @@ add_addr_timeout_tests() reset_with_add_addr_timeout pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "signal address, ADD_ADDR timeout" 1 1 1 chk_add_nr 4 0 @@ -1320,7 +1367,7 @@ add_addr_timeout_tests() reset_with_add_addr_timeout 6 pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "signal address, ADD_ADDR6 timeout" 1 1 1 chk_add_nr 4 0 @@ -1328,8 +1375,8 @@ add_addr_timeout_tests() # signal addresses timeout reset_with_add_addr_timeout pm_nl_set_limits $ns1 2 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal + 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 0 0 0 least chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2 @@ -1338,8 +1385,8 @@ add_addr_timeout_tests() # signal invalid addresses timeout reset_with_add_addr_timeout pm_nl_set_limits $ns1 2 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal + 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 0 0 0 least chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1 @@ -1352,7 +1399,7 @@ remove_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr "remove single subflow" 1 1 1 chk_rm_nr 1 1 @@ -1361,8 +1408,8 @@ remove_tests() reset pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow chk_join_nr "remove multiple subflows" 2 2 2 chk_rm_nr 2 2 @@ -1370,7 +1417,7 @@ remove_tests() # single address, remove reset pm_nl_set_limits $ns1 0 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow chk_join_nr "remove single address" 1 1 1 @@ -1380,9 +1427,9 @@ remove_tests() # subflow and signal, remove reset pm_nl_set_limits $ns1 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow chk_join_nr "remove subflow and signal" 2 2 2 chk_add_nr 1 1 @@ -1391,10 +1438,10 @@ remove_tests() # subflows and signal, remove reset pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 slow chk_join_nr "remove subflows and signal" 3 3 3 chk_add_nr 1 1 @@ -1403,9 +1450,9 @@ remove_tests() # addresses remove reset pm_nl_set_limits $ns1 3 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal id 250 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250 + 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 run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow chk_join_nr "remove addresses" 3 3 3 @@ -1415,9 +1462,9 @@ remove_tests() # invalid addresses remove reset pm_nl_set_limits $ns1 3 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.14.1 flags signal + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + 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 run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow chk_join_nr "remove invalid addresses" 1 1 1 @@ -1427,10 +1474,10 @@ remove_tests() # subflows and signal, flush reset pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush subflows and signal" 3 3 3 chk_add_nr 1 1 @@ -1440,9 +1487,9 @@ remove_tests() reset pm_nl_set_limits $ns1 3 3 pm_nl_set_limits $ns2 3 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow id 150 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow + 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 run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush subflows" 3 3 3 chk_rm_nr 3 3 @@ -1450,9 +1497,9 @@ remove_tests() # addresses flush reset pm_nl_set_limits $ns1 3 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal id 250 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.4.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250 + 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 run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush addresses" 3 3 3 @@ -1462,9 +1509,9 @@ remove_tests() # invalid addresses flush reset pm_nl_set_limits $ns1 3 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.12.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add 10.0.14.1 flags signal + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + 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 run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow chk_join_nr "flush invalid addresses" 1 1 1 @@ -1475,7 +1522,7 @@ remove_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow chk_join_nr "remove id 0 subflow" 1 1 1 chk_rm_nr 1 1 @@ -1483,7 +1530,7 @@ remove_tests() # remove id 0 address reset pm_nl_set_limits $ns1 0 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow chk_join_nr "remove id 0 address" 1 1 1 @@ -1537,13 +1584,13 @@ ipv6_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow + pm_nl_add_endpoint $ns2 dead:beef:3::2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "single subflow IPv6" 1 1 1 =20 # add_address, unused IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "unused signal address IPv6" 0 0 0 chk_add_nr 1 1 @@ -1551,7 +1598,7 @@ ipv6_tests() # signal address IPv6 reset pm_nl_set_limits $ns1 0 1 - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + 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 0 0 0 slow chk_join_nr "single address IPv6" 1 1 1 @@ -1560,7 +1607,7 @@ ipv6_tests() # single address IPv6, remove reset pm_nl_set_limits $ns1 0 1 - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + 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 0 -1 0 slow chk_join_nr "remove single address IPv6" 1 1 1 @@ -1570,9 +1617,9 @@ ipv6_tests() # subflow and signal IPv6, remove reset pm_nl_set_limits $ns1 0 2 - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow + pm_nl_add_endpoint $ns2 dead:beef:3::2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow chk_join_nr "remove subflow and signal IPv6" 2 2 2 chk_add_nr 1 1 @@ -1585,7 +1632,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow + pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "single subflow IPv4-mapped" 1 1 1 =20 @@ -1593,7 +1640,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal + pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "signal address IPv4-mapped" 1 1 1 chk_add_nr 1 1 @@ -1602,7 +1649,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "single subflow v4-map-v6" 1 1 1 =20 @@ -1610,7 +1657,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "signal address v4-map-v6" 1 1 1 chk_add_nr 1 1 @@ -1619,7 +1666,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow + pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow v6-map-v4" 1 1 1 =20 @@ -1627,7 +1674,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal + pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address v6-map-v4" 1 1 1 chk_add_nr 1 1 @@ -1636,7 +1683,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:2::2 flags subflow + pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN with diff families v4-v6" 0 0 0 =20 @@ -1644,7 +1691,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:2::10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0 =20 @@ -1652,7 +1699,7 @@ v4mapped_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr "no JOIN with diff families v6-v4" 0 0 0 } @@ -1663,7 +1710,7 @@ backup_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,backup + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup chk_join_nr "single subflow, backup" 1 1 1 chk_prio_nr 0 1 @@ -1671,7 +1718,7 @@ backup_tests() # single address, backup reset pm_nl_set_limits $ns1 0 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "single address, backup" 1 1 1 @@ -1685,17 +1732,17 @@ add_addr_ports_tests() reset pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address with port" 1 1 1 chk_add_nr 1 1 1 =20 # subflow and signal with port reset - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal with port" 2 2 2 chk_add_nr 1 1 1 @@ -1703,7 +1750,7 @@ add_addr_ports_tests() # single address with port, remove reset pm_nl_set_limits $ns1 0 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow chk_join_nr "remove single address with port" 1 1 1 @@ -1713,9 +1760,9 @@ add_addr_ports_tests() # subflow and signal with port, remove reset pm_nl_set_limits $ns1 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow chk_join_nr "remove subflow and signal with port" 2 2 2 chk_add_nr 1 1 1 @@ -1724,10 +1771,10 @@ add_addr_ports_tests() # subflows and signal with port, flush reset pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow chk_join_nr "flush subflows and signal with port" 3 3 3 chk_add_nr 1 1 @@ -1736,8 +1783,8 @@ add_addr_ports_tests() # multiple addresses with port reset pm_nl_set_limits $ns1 2 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10100 pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple addresses with port" 2 2 2 @@ -1746,8 +1793,8 @@ add_addr_ports_tests() # multiple addresses with ports reset pm_nl_set_limits $ns1 2 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.3.1 flags signal port 10101 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10101 pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple addresses with ports" 2 2 2 @@ -1760,7 +1807,7 @@ syncookies_tests() reset_with_cookies pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow with syn cookies" 1 1 1 =20 @@ -1768,8 +1815,8 @@ syncookies_tests() reset_with_cookies pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + 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 chk_join_nr "multiple subflows with syn cookies" 2 2 2 =20 @@ -1777,8 +1824,8 @@ syncookies_tests() reset_with_cookies pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + 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 chk_join_nr "subflows limited by server w cookies" 2 1 1 =20 @@ -1786,17 +1833,17 @@ syncookies_tests() reset_with_cookies pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address with syn cookies" 1 1 1 chk_add_nr 1 1 =20 # test cookie with subflow and signal reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal w cookies" 2 2 2 chk_add_nr 1 1 @@ -1804,10 +1851,10 @@ syncookies_tests() # accept and use add_addr with additional subflows reset_with_cookies pm_nl_set_limits $ns1 0 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 3 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow - ip netns exec $ns2 ./pm_nl_ctl add 10.0.4.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflows and signal w. cookies" 3 3 3 chk_add_nr 1 1 @@ -1850,7 +1897,7 @@ deny_join_id0_tests() reset_with_allow_join_id0 1 0 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow allow join id0 ns1" 1 1 1 =20 @@ -1858,7 +1905,7 @@ deny_join_id0_tests() reset_with_allow_join_id0 0 1 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow allow join id0 ns2" 0 0 0 =20 @@ -1867,7 +1914,7 @@ deny_join_id0_tests() reset_with_allow_join_id0 1 0 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address allow join id0 ns1" 1 1 1 chk_add_nr 1 1 @@ -1877,7 +1924,7 @@ deny_join_id0_tests() reset_with_allow_join_id0 0 1 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address allow join id0 ns2" 1 1 1 chk_add_nr 1 1 @@ -1886,8 +1933,8 @@ deny_join_id0_tests() reset_with_allow_join_id0 1 0 pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and address allow join id0 1" 2 2 2 =20 @@ -1895,8 +1942,8 @@ deny_join_id0_tests() reset_with_allow_join_id0 0 1 pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and address allow join id0 2" 1 1 1 } @@ -1909,8 +1956,8 @@ fullmesh_tests() reset pm_nl_set_limits $ns1 0 4 pm_nl_set_limits $ns2 1 4 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow,fullmesh - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,fullmesh + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow chk_join_nr "fullmesh test 2x1" 4 4 4 chk_add_nr 1 1 @@ -1921,7 +1968,7 @@ fullmesh_tests() reset pm_nl_set_limits $ns1 1 3 pm_nl_set_limits $ns2 1 3 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow chk_join_nr "fullmesh test 1x1" 3 3 3 chk_add_nr 1 1 @@ -1932,7 +1979,7 @@ fullmesh_tests() reset pm_nl_set_limits $ns1 2 5 pm_nl_set_limits $ns2 1 5 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow chk_join_nr "fullmesh test 1x2" 5 5 5 chk_add_nr 1 1 @@ -1944,7 +1991,7 @@ fullmesh_tests() reset pm_nl_set_limits $ns1 2 4 pm_nl_set_limits $ns2 1 4 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow chk_join_nr "fullmesh test 1x2, limited" 4 4 4 chk_add_nr 1 1 @@ -1957,7 +2004,7 @@ userspace_tests() ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type prevents add_addr" 0 0 0 chk_add_nr 0 0 @@ -1967,7 +2014,7 @@ userspace_tests() ip netns exec $ns2 sysctl -q net.mptcp.pm_type=3D1 pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type echoes add_addr" 0 0 0 chk_add_nr 1 1 @@ -1977,7 +2024,7 @@ userspace_tests() ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type rejects join" 1 1 0 =20 @@ -1986,7 +2033,7 @@ userspace_tests() ip netns exec $ns2 sysctl -q net.mptcp.pm_type=3D1 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type does not send join" 0 0 0 =20 @@ -1995,7 +2042,7 @@ userspace_tests() ip netns exec $ns1 sysctl -q net.mptcp.pm_type=3D1 pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "userspace pm type prevents mp_prio" 1 1 0 chk_prio_nr 0 0 @@ -2006,7 +2053,7 @@ userspace_tests() ip netns exec $ns2 sysctl -q net.mptcp.pm_type=3D1 pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow chk_join_nr "userspace pm type prevents rm_addr" 0 0 0 chk_rm_nr 0 0 --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101438jap; Thu, 6 Jan 2022 22:17:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJx31YhNYNiz3Avbq3V0nVZD9+0b9SpoI2/SeyHManVREw+Mm1yjL2nLJzQk/wkJaaoqfGjv X-Received: by 2002:a63:eb06:: with SMTP id t6mr55483700pgh.366.1641536274123; Thu, 06 Jan 2022 22:17:54 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id p9si3746378pgh.815.2022.01.06.22.17.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:17:54 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2974-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=jQhwDfed; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2974-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2974-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 7B5871C0D95 for ; Fri, 7 Jan 2022 06:17:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3272C2CA1; Fri, 7 Jan 2022 06:17:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 F1DC22C9C for ; Fri, 7 Jan 2022 06:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536268; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kxUaQjphST/TmAQw7dnm9aHRbJV15FSE/LLTUMpaWow=; b=jQhwDfedv8NxWz5MNxoivnCbSkxJtbWxPp/Q9qGXWkCoJ9H4soa0Bsp6GuFZ+5dJpNiLy6 7kVlvSV1cGhaj/F5hqUogOz1KdCjwL+exWhJkFjABsU32XHGna3Mh3YMgJ8NfMZMLPiwbg BBdEtnRtWJP7CM0UtuR9ScFBNxNZ6uo= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2111.outbound.protection.outlook.com [104.47.17.111]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-8-d1NQ_TKgONmn7LWppd-_WA-1; Fri, 07 Jan 2022 07:17:47 +0100 X-MC-Unique: d1NQ_TKgONmn7LWppd-_WA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MliUdJ/jz8VO2OhHNg71Gb5NrqhFuBGsg8+lHGq13Nz2VaD5HynmQDazHtZD6nEUgTZpIVFg9W7nDem5FA944Xljthxo1RRnC1RPKFQR8kP2BaYCp8H3tC2IoSvX379Dg2YRo4kW/29PNXRJZrA7nYM6NsuDQZo+AJaY9PfFh0nuPH/fsUJ8QyUbOL37eT+CoJ/WjdjloOtYpFedShNy15ua0sZK+Px4ii7qEK6OO/fG8RjnJBwfE/9ddmcreGQmH0kdVwF0Pi6ocwLbQmlU4aU9ZT+IUiogtJjQtSoM+m3NNyNUpDtPji2gJxIgiR9SMucrb8xlyLDzRZ2yZv+DpQ== 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=CG96a1ZURtIWCxWm8VwSq/3WnW99mwWviZ2kjj+4Ims=; b=K1Qiyc7E4Mi25SkFV9nuudPpUcV2GgrNSQ9NeXs+IiQCW4Wl1HbXWXr3mdATPaTU/HDUVANdTuyhLLGD/bVNKGKzc8ELqqRswob8v1YtIqp0sWTnqts5gom1xEMujHYSNK1VoeV+G7cvSi/6AoSSDCvwEAmsfRHovhA7OaDUHPs7cK8OWEmgykC7RaQgan3m0lR5+UUgE68rAG3rctUlMyLsmEKmMdj2zfEQ9lkIyM2df6XDFyLvKf9dPY2DcCm45FLDCC94fppyJumRBkLsPLVl/2wxnx1Ex2V8NSpZq0JMjexQcoWqxuwrNzxRERIhDCVvB1kXLgBCQDBtKQxpeg== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 5/9] selftests: mptcp: implement pm_nl_del_endpoint Date: Fri, 7 Jan 2022 14:16:57 +0800 Message-ID: <74ccf527130bfbebe3e92ab5b6328e502c880f91.1641535880.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0190.apcprd02.prod.outlook.com (2603:1096:201:21::26) 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-Office365-Filtering-Correlation-Id: c55a6554-29f6-430f-ec6f-08d9d1a56bb3 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TinzI6Vie5FABQoohF2+pwUJOe9z04zMOMymElxFQt2r17m7xEIu2GgH404K9ylL9a62djDnMDwA7tTby/In4PD/VH2bcN+FUsIHaVjefWJ08L4ZuYfaw0DdbVi0Ux7wqal8qpKPdlj2zGlDqjC3sQ7UtakARxNwFgsWn5W8G37xVLfBp9PK5NqwCIudAR1Ctl0M2WBql8YBXy+VlLzTPWlu3wAhxV0AhZkfDlkCRE6/hZJyXn3dwxCiyX8wvDHQuP2CWrupnW7JGRseOtaGiZESj/wgZagpi1DvQD57FigTL5BOPdGoyxLoMR9iR27Xg0ZW8ZD13ypEc2BUTEh4xIj/z/uopoUAlfOa9Ki5QDISuCPEXouo6x1JEWoSCn3b2ZozQ1XOmbF6+k1z0j+0EsmSoaJ1zk/0KNObOh6Pz05QOO7MY5610mWyRILoWptlzAvGsDTjq10mYHl8rHD1FNyAVjIvgFPfbg4DdmVJ/UXSbGBCEMIH74dMwN7iNHxZpGRkf71/mlB5mNuedleS98uhZMbPXPdlArDfikBUbXH4zkLrlogpHchUs73RNrLnQ8ChZyPWZz7aHegl/OndUDxVMDygorC++C24RgTl7slpun9reLiJBdIQrDEs30E5ujzEtkvkHJN0VyVD0GhW2w== 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6666004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XIsJL489dbUiFwRjlU341O3HbE7GYPHWLOn4TL8H/yRNWmYtl3RqdMLntVZI?= =?us-ascii?Q?KJ2yfscSOXdVvoJGj4YyDywrCpF2OMSH+OB5Mg8GA5fTRy3RNYQmwj49Yiu4?= =?us-ascii?Q?z4PngK/+6Buvp+MVUxqJ+umX9uXKceH/lcYPxtBQvcjbr1ygMA0sPSuDQfAM?= =?us-ascii?Q?TPbpbtEFjzjiPdER2Dp6VSYHGHGOM0ovpX4HS2ZV6zEsg5+MuymgMyYoNEfr?= =?us-ascii?Q?+7zun+X61wQc0Mp3WBeb9SWTlZi1d+UazvdvVhNGlgWCPW6wxYcQWlfYg9Tf?= =?us-ascii?Q?vZueCJFonu1uAb/Eq7A7Bl+6IpqXWgV69CQN6L6XZBCIiQkx2j9NhyhiYaYP?= =?us-ascii?Q?/lwOLkPNrgKfmQhhry9QyJi8T7qh5WPdrx4+khBNN2rATAO2ojBm0/kiq8ZF?= =?us-ascii?Q?y81Xe1eGrbsQhxaA4OC/y4eQeP7k4NXa/dQrCv9T7NTvVkjulcyJxV7V393O?= =?us-ascii?Q?0ii3BgHt7sHLQ26XkZqxGJ/2gvlBkW0Z+weObFluqbOeGOEqPbo0x4xTQxqn?= =?us-ascii?Q?47kseSk9ja7++VZ49N3MJSJP3iJckEH3kBLGtBxbTgSI1YwIoT1vnwI5zlmT?= =?us-ascii?Q?FTg0bGiQFMJA4DV1/vJssMDusv0goaoQUkw7pZK2+YI19ZTwgsY3nRvXn19w?= =?us-ascii?Q?wTLEylYwTYMByRCoTtXlwyNn0MNe1ghW2xcV+vGUYJ0uH6dpB2UyXC9laSfY?= =?us-ascii?Q?e4DIOplL3X087w4Slk4bd6OoiUKcwuVFchiqZgdJ19xJQXwZ/92mfN3s6jip?= =?us-ascii?Q?f2OKwCv3yobguZ0Jx1aJFXjiUdEcO4UKKLjrEtt6hV740NuGeFhsTaFBbib8?= =?us-ascii?Q?e0ZO4BwJIjoa/ySUmDUFC+1PWZwUY4Yxg4eXiHo0XBT879KPh6o3oFXXhc0F?= =?us-ascii?Q?x0pNmFdJyjEwB8Lr4iK0AAPmseEgaCOqMCgdY/0pcwApGNaMVUKD3SpeyO5y?= =?us-ascii?Q?hdYrM+AULkAOtpKd9GwSN22A6YyIKVgCrsRCDfa/yHw7EYlU9zIOkxinSbf5?= =?us-ascii?Q?QJ4wgqnPEG4rpQYYk7WPW6+OnECp0SBKKpUQPbylN3ronpI1Zma/E6ZkEJ66?= =?us-ascii?Q?i0AomxzL2o59ElJuc398S+37y5BBTbn3vHcII5opecvvT7VyBFOkEaRNxKN5?= =?us-ascii?Q?hkCn0AA5bU8+836DpbMWjPjwd/6GgA6qqZwGnwamDQhHswWxbVejkuJQjwXf?= =?us-ascii?Q?wtN2a0Vp6FTAprBuZhsko5tcVkzo8yAoCt2NEsHWUEpDeL19kY7vROqyinfy?= =?us-ascii?Q?dvyD+KBOSuW8VsB2PgFjjZyyZIzXejVSEG3cYntrQH+hnYw0LLnpxa2s8UWH?= =?us-ascii?Q?ht8AkkuMgtPTttfZ/Y79o9yCk5qcEZcKKTTCobiTOKwDLEt/6b9F7wm3Bu/Q?= =?us-ascii?Q?t5rDqr62qyMddUq8A1tjZ8osCL+1XA4yRO9YSGFu4Diz6jt6RLFLePo20mLu?= =?us-ascii?Q?H48wRpBQaENrdBaZG6eCvBHWKuwA2n1gCq7f2YyvPDZsmuC4V/TKH062R73M?= =?us-ascii?Q?QgcqY7cwfmnjyZq5XJuZ4FRfDkHOdFJeJuQmj2xFovXcgDsYg2UbdSeetCsC?= =?us-ascii?Q?VJx69uGlpWXGlfw99is1G2OCt+HifRHIun0QG+L1Mp0Qk+BY0F0enodtjGgK?= =?us-ascii?Q?4h2xZwgRvv0nFBpHvGwFhv8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c55a6554-29f6-430f-ec6f-08d9d1a56bb3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:45.9523 (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: 5rzXCPSnZCykEJZMFFOcABv+/VcpbErwjuEeB94YeG0JSbHIPCnsdMvcQVv3jo/mxEuA84tRCQePumcQORd3wQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_del_endpoint(), wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in it, and used a new argument 'ip_mptcp' to choose which one to use for deleting the PM endpoint. Used this wrapper in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 788a2ec75458..9219962291dd 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -339,6 +339,19 @@ pm_nl_add_endpoint() fi } =20 +pm_nl_del_endpoint() +{ + local ns=3D$1 + local id=3D$2 + local addr=3D$3 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint delete id $id $addr + else + ip netns exec $ns ./pm_nl_ctl del $id $addr + fi +} + do_transfer() { listener_ns=3D"$1" @@ -458,7 +471,7 @@ do_transfer() fi id=3D${arr[$nr+1]} rm_addr=3D$(rm_addr_count ${connector_ns}) - ip netns exec ${listener_ns} ./pm_nl_ctl del $id + pm_nl_del_endpoint ${listener_ns} $id wait_rm_addr ${connector_ns} ${rm_addr} let counter+=3D1 fi @@ -468,7 +481,7 @@ do_transfer() elif [ $rm_nr_ns1 -eq 8 ]; then ip netns exec ${listener_ns} ./pm_nl_ctl flush elif [ $rm_nr_ns1 -eq 9 ]; then - ip netns exec ${listener_ns} ./pm_nl_ctl del 0 ${connect_addr} + pm_nl_del_endpoint ${listener_ns} 0 ${connect_addr} fi fi =20 @@ -513,7 +526,7 @@ do_transfer() # complete id=3D${arr[$nr+1]} rm_addr=3D$(rm_addr_count ${listener_ns}) - ip netns exec ${connector_ns} ./pm_nl_ctl del $id + pm_nl_del_endpoint ${connector_ns} $id wait_rm_addr ${listener_ns} ${rm_addr} let counter+=3D1 fi @@ -529,7 +542,7 @@ do_transfer() else addr=3D"10.0.1.2" fi - ip netns exec ${connector_ns} ./pm_nl_ctl del 0 $addr + pm_nl_del_endpoint ${connector_ns} 0 $addr fi fi =20 --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101498jap; Thu, 6 Jan 2022 22:18:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxEUGFFITX1E4EEryD8NXYAwVp8aKbrwAbCJg6gagNfI1qehd4xsJ/UxfKCxo8Qh5yToCIQ X-Received: by 2002:a17:90a:5d83:: with SMTP id t3mr13992973pji.159.1641536280772; Thu, 06 Jan 2022 22:18:00 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id o38si4054128pgb.767.2022.01.06.22.18.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:18:00 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2975-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="Fum1G/9S"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2975-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2975-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id EB7991C0EF3 for ; Fri, 7 Jan 2022 06:17:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8A66C2CA1; Fri, 7 Jan 2022 06:17:57 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 5BB4F2C9C for ; Fri, 7 Jan 2022 06:17:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DQ0sAmxrTeBRiEUAKTQ7azpH3L12M/z7/LA3EPHzpQY=; b=Fum1G/9S0SkgbnuIk4b/oZIyBP1PPpcUvoqbWNURs3EECJ7xjBP5ErB62nTqwmQoJlDuKW FcV/5qdauvL5Be6GGgRNkcgQZec9bnRE2Kh3Sgx5fjBsqvN0yVkC+sOEvG4xXTw5DT2hkh pGxyrzqidsZHqumOQ+u1HGAfnES+If4= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2113.outbound.protection.outlook.com [104.47.17.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-31lfSzJNPJiuviCeHDioCA-1; Fri, 07 Jan 2022 07:17:54 +0100 X-MC-Unique: 31lfSzJNPJiuviCeHDioCA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuY7hCjbnjwqUXDyCemV61eLXIsbYUKIWfLgSUEg76SUhgGGXJjTNdhDMvH2Sc7X4ojWRQCSxPOKz9R9sghyTIrLGR1l+BVIqpmvMKtGV4mD9ElsxkeyNXHa+ZeowM6P+U/TnDjxuMF+YI0U9K6sD13vDuS/Kx7fc2E6Y6a2UxdGOVzgLUV4jYLxQs2IGy+XqlaKYXvJgOYe8/aaK8jE91U+tUbJV843JdLI0NvlWH2HEjhI7LLevAWz3H2RQ2MpvpLB5uq1QO8JF/LqqA7jYSu/DG/2ZuR0v+Yk/BmtS7eT6yJ2GdjgYW2nqXkHGm8Iz92RgoGvwzpWEfQDe9bIzA== 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=Gfjg2K9ih6223KUYzJQpYSDfM6o0E4/trjxZvmjnHrQ=; b=P5ceAXFSeyh542gF7i4H6hEELT0AhCTbLhkeveIEIyGYrlPc3GucfeoZY6CvzoOv3O5NTVAyC89fjoLTfD/HpkqrevqJjMTf4IlbTuAK6UZeEoI6QgzheSHpItV0VZefP6fuSDOtDepcI19okY/mBbfN+1EX9HcLYkxQDFWt1b9U3xwGDQUQgOREs+L68EgPvWhRc8VPRxIFcUr9JD0UrX53GrCfB3ExdVJIOUXqg9UxMMWmvBLg6KKOj+j8VPZ8gQkVB01LKETIUgkvbldPXKe64E6LG3S23WhkIz5pkurEeVMwpmiEYpKQq51s6ic0jaGolYIMWFsf5rRRs36+jg== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:52 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 6/9] selftests: mptcp: implement pm_nl_flush_endpoint Date: Fri, 7 Jan 2022 14:16:58 +0800 Message-ID: <62c2e9c36e5de33653ffbaf3a282c24f46d6f873.1641535880.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0188.apcprd02.prod.outlook.com (2603:1096:201:21::24) 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-Office365-Filtering-Correlation-Id: 7c23363a-d8f1-41b7-1b0a-08d9d1a56fe7 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T/J0kPCQwBQK9D+t2kVNF6q+z1MyRwSRXsY5CfHptqtrF/x/e6/2FEKl1MAXdTwfpPdteSMRRnHCFy9Svckj2JSJjRAgMwRXsjXUUD63WjyTw/SYRVVjLPPPxkR74XdHgX4tTMdXBGXQrUx3hbjWWlIN361Y9ifNASqTGrT20grpRGW1J4kjgwFytLvfAQEWncK7P9OfD5EVcIOLE0JB9EN8Ipahhzp2QFTT+iZSHY7OEgYavSGSTU5oDbPmSIqgxN5GE4F0wRUSTUwvJ/F0/gntwUuT+xLMAaCBd+CqUXUxT6AXzKGTIbqD0sGPepgaGfwvUCC7DGi/2WQwFlQDZ+pZLpcpfx2z1n1uDgvHfk6pcAbN0Ra3KmCCy62BXeecL+/XSEPUjbGfuWsU99qa2K/y9YEY0tsiLLBVV5A6I/4nrlFz+T6DLUJZ9Z1kLaiEx9DB1k3sp3r+Q1y+lDZpHeRCEWAFQ0hIQyJvWvdNdpndjcJvTciQhszrw5W3mwRuKs6olYDZDUgTn4NEJfXT4xUIBKFiMuCDZnpEqjsT38IELfTYkKOx85D2PSw86Xh8qASqgih8Djva04NLfAkKk6VSDIbQ7LsZ34dvshAhJPlUL/DT2eKKL0JOOYPXpS6uDG3ips7ok4LNtgS81RxrVA== 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HBm4LhhxSgqVi/ep7Fp/Fuw/ZqCZ07JoOiOCCDtkDEv07GjdhfYKNnQ/minA?= =?us-ascii?Q?1dWojDn93X2R1QkHCDAsgesPeJpJ+xrxgrETGr5ZyQsxOOOTwFKBU30/aQpS?= =?us-ascii?Q?TpkQO/m4x2+YxbhbtCKa1czoLY/4zcj6Bd2Dh9Ugm2rt9/YS7K5U4ixrTqLB?= =?us-ascii?Q?GjY0mZc/HKfSHOtelSEAm4u5upR/wF08XDpW7stvnGlxniu4BEOfosU9xRfi?= =?us-ascii?Q?MG6xLwWeiUfoaRbxF0oZbp4Tk1XKfxi3MjkwxbtLFgyjxsuUm0gatxwfe6rl?= =?us-ascii?Q?eKyA0OUsZdNdFKTlq0ypm8K3eqNxFwIUA7rJoyLhs27tiJOT9zNqvImR+E2L?= =?us-ascii?Q?g3Qe5bryKx9TKKMbrF5hLsyhsXHV8rVaSDdJhmrwvF2AnQwU6OzWUaKPfFE4?= =?us-ascii?Q?4HeD+ypM+/b8+8Ul1GDPZ7+k7YfT4cS/hW6bgdRrKZyIjQwmucJAQpVg3WJo?= =?us-ascii?Q?a9Nlm4tqM9brfwoB4kgjuypfZS8AQAdy42l2UCVDk4Exd6J1/In0FKYbwLo7?= =?us-ascii?Q?Wn89agzTdqahpdAthuHpnDWJhyZgvkV7EfgsQGoQB9knU6zl3y87UR+VhvN4?= =?us-ascii?Q?hcdNXgKOhx1xG91doOyV7YRcIzOv2yDWWIIWrLRsHD7TMMf7WmKyYLJqNzNa?= =?us-ascii?Q?thW8Ul/87ivH2gn7TEkZHP38sKNF1sZaEyl7EdFI0hCyQTbmD2DwAEmvSmxs?= =?us-ascii?Q?/kMQkra67cDnRAXmD5TCTy9odKLViOvfXO/2maoGDQNu5A2w5ksnM10/+wib?= =?us-ascii?Q?86gZSsvsh/G/kLFQyX8FNbVBd2Q/bBzCyCjXWKBcwNQmF7QvRW3iS6ydi8pU?= =?us-ascii?Q?GepVuxPbTlS0IuK33hxV0g9SjgiR4EWaSEAwg+P2C+qfwXHnk8kEgATkv4i0?= =?us-ascii?Q?ziybxbe28BQK8jhoFHnvx778TRnGXV9W5ePiIicxNkgaOphWU9pXnU05CMmb?= =?us-ascii?Q?saD0uMRYuaw5CEGirJchfVkRRh7jx4+qDKRcLrvaG16aUFZiT2DNu8wqcU6M?= =?us-ascii?Q?x8r0BiOPh9siT2w0kfvx+9OIPLkv//2GnZi7jnBpxAC5eyrC+kbebp7faHCX?= =?us-ascii?Q?4DY3v2+LC4B2dgKyx4lpzPzhsp1XBBhxbtxdxNVrsj+8ztzyiJI1j3SUBKz7?= =?us-ascii?Q?w9G8pXL5pqjiG/HW4rq3vdbefNfvDs9cioD/jmhOsJj9qY7rCyXew8rXId5S?= =?us-ascii?Q?FNqOGN3qbYHv8cGAmmAa+GcLYoQwfVlINKXtDRTKTD6AfWDVzxrSiFbc8BGW?= =?us-ascii?Q?00wSeWt6JMVJ/CiYe2OeUI0fK3XVxMKKGihi81twDOt/mcm4MJ1c2drBDFD0?= =?us-ascii?Q?gqqeldIuQMoOdtRNivl+eRJAOyn3bgTwMFjLnYoCFk/y4oEXYARkFu/w40ys?= =?us-ascii?Q?x0T2811RKprt1zBIJ9wFXG+maeT6/+2nkJA1XujpDRVfpJq6WQZG9cRkaPwJ?= =?us-ascii?Q?0xWCD04eVtUp3OizKqgWbjmVNh5tPtUXGUmn1oOOb/BJZjvlqOEhdNA9uJcX?= =?us-ascii?Q?04FIvoJz1XvXpvu/g6q3m28ZHHyCY2P5NHv0umNQkiueY6ELQqn0wbhrrbpI?= =?us-ascii?Q?1CNXwK+Iuh5bJ85oVb1eUiLlXSWPP/HB3NjA769XkEGIKKsUUW8fwizA5eUH?= =?us-ascii?Q?U8zQcJJ6y3s/qqvxbiwzWZg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7c23363a-d8f1-41b7-1b0a-08d9d1a56fe7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:52.7799 (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: TckQ6UdwwJpz12icaQfkQmmjkPNE49pB9i7R4yWGuHJ4MpG4Kw3Sue4bpFgG4KoyRcDwZb08jQVrv3ZpDuz3AQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_flush_endpoint(), wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in it, and used a new argument 'ip_mptcp' to choose which one to use for flushing the PM endpoints. Used this wrapper in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9219962291dd..475867a01b83 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -352,6 +352,17 @@ pm_nl_del_endpoint() fi } =20 +pm_nl_flush_endpoint() +{ + local ns=3D$1 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint flush + else + ip netns exec $ns ./pm_nl_ctl flush + fi +} + do_transfer() { listener_ns=3D"$1" @@ -479,7 +490,7 @@ do_transfer() done done elif [ $rm_nr_ns1 -eq 8 ]; then - ip netns exec ${listener_ns} ./pm_nl_ctl flush + pm_nl_flush_endpoint ${listener_ns} elif [ $rm_nr_ns1 -eq 9 ]; then pm_nl_del_endpoint ${listener_ns} 0 ${connect_addr} fi @@ -534,7 +545,7 @@ do_transfer() done done elif [ $rm_nr_ns2 -eq 8 ]; then - ip netns exec ${connector_ns} ./pm_nl_ctl flush + pm_nl_flush_endpoint ${connector_ns} elif [ $rm_nr_ns2 -eq 9 ]; then local addr if is_v6 "${connect_addr}"; then --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101543jap; Thu, 6 Jan 2022 22:18:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwXn6uXgFOW65F+r/LNRIaZkl60CDe+TOqMtZh1wLERwwrJ7xTXJPUOGc2XH59HlVNAssxZ X-Received: by 2002:a17:902:b68f:b0:143:7bf7:c9cb with SMTP id c15-20020a170902b68f00b001437bf7c9cbmr61370441pls.7.1641536285718; Thu, 06 Jan 2022 22:18:05 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id my7si8259151pjb.179.2022.01.06.22.18.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:18:05 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2976-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=DMyK93fz; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2976-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2976-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 025AC3E0F68 for ; Fri, 7 Jan 2022 06:18:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 235B72CA1; Fri, 7 Jan 2022 06:18:04 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 E92222C9C for ; Fri, 7 Jan 2022 06:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vausICJE01f1HlQ2JnPOjHonpMDurxI5PwJ06HwGSD8=; b=DMyK93fz2MXI723xNI/hE3+oZc+gXy3CSpiPHIrqTibwg5DzchFzSqcIeWvP/gjcpS8e4K jpKlrBzhfS8JVTs49vU/usWydLz6TWuA9KtYVrYXgeJkNA8W5DPxuGRc1cHm5yA1+/8tG/ clXq3GH8MUtha1Nw4iON39YpcIey4ps= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2107.outbound.protection.outlook.com [104.47.17.107]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-16-AGxJW7L3O6SzXVXrjxpxxw-1; Fri, 07 Jan 2022 07:18:00 +0100 X-MC-Unique: AGxJW7L3O6SzXVXrjxpxxw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T7FINeffkOKQKMsZHkUlKa69/FzED+0lYw6fmLXYfpA2wweXPHsCxcyEw4u6JlvybbS/VOiIgKz+QDnWj99k09GKHoVrOtgBYBn1palmowgvAoIopU4y0p6v7yfiM/XnTklXW4zntUaXlrxkgPC7AxIF6L+RyFfeZK+TFWfCwNXQwueHgI8xjcW2R2HmyVGdO8gVCqbfsDsHdMi6Ldm0KhFzFXhAVs+4Hi2wXFn/AO9omwgjog0TRKTkGrOs4/xjldqC21aEQqPJbvy517VGEnSX5mVV+tRiGoWaywZiQtsOfHYSk0hFETAwFdvCv35l6Z3CpAstV0JK4uuTKOJlUA== 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=UxTBGBXO3CApFldZpLmW98vLiHAKnLjuLJ027qJIewc=; b=Xd7zI0p35MXLEo9gM/H9JTBeRvm556PmWpD6XZHLC2Y8ScC9WJzLDxnG6m0yJ/W1jA1Azg17tjXUN5nUJxbeiCcRyd335vjSa7OFsWhZI/EC9nLFCqZ2I74v3HNCgjjkxW8zxxjKaeCVhtjVigeMg2jcrl4wdi78mUtkZKqLHn2rvKXGZ3LuU5DKzo420HwtJLCZCW6i3Y2O0jY/y6g9nld+3Jp5edYQ1+Pz/m69G6pdQbVhi//kO5WBMkKnOdLEXQv02ZDQCrJNFmvdD6/IrAzTf2pwLLC1XyjPdpzswmHT42xDhsmfamin7mmhF78xEgQRLRgp+emro82xndXw7w== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:17:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:17:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 7/9] selftests: mptcp: implement pm_nl_show_endpoint Date: Fri, 7 Jan 2022 14:16:59 +0800 Message-ID: <47e4e94eda65b9e68ec469fb3e7309405167ec73.1641535880.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0022.apcprd04.prod.outlook.com (2603:1096:202:2::32) 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-Office365-Filtering-Correlation-Id: dc1fc1c4-da80-49d3-76cf-08d9d1a573c4 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xWmvh3efzv3Mhl4+aspgQzopMzo6s4Z3S5k6eZIejWP0pU2bt39bqs41ipn+wfxJPNzwN2SddxqUW9EnDHHswIQvC5cSl8cDcCMio4199K8GTNTUA0zo7gqcmXAWuxh+FoXqftnThJ+aVoRONSI6xkr6FXCcWJ1kSe34mFziZulCb3IKUsqMK19KYwYxCvpWawXSibltDgfSC2GSbQ6oyerjb55/pZ7iF75LQdrtv2EbtBWXaQiQHfnY1q79ngW1jAxdYkrTSs07LujDp2AJxbuSyIsIPYihQ/JaRV49w8hsVjuV85+bMOjoXq/F+FSPOGGfaA/apZKf7s+NuQ3P3s4ddB2pufuOofz6WNl6K+1I0Vo6iQ6nEmqKX5/ETjUZ8PLL1xY33PJakHc2g32/FZ4+CyjC/tUKAwD4rwtkuZVkIyRX+nn+zP/enktXx2Pf0C4g3diJyNw52YFsPBgLloU3df7wuHXsmT+6gY8OJlZiI7Xtli8Bi3qiO7s42N5t/oH81fyCk7Me8lmZotmokgb1Nt3vCI3b8HYgwyNIdZp3QXmFjnQuCDhrc2jLnPoplMSxANInRZe7tHrjisRjLsc07wblXj5DM/Ktq83DLxgOpbzYMzTDvEmPRg0INkEnSaAhkUuVYsG19hywC3r9GQ== 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NFeJip3Fa+Mcc/mhxAS7xfpeIgyx6Y8a42wyCEC1QuRtCIWeZfRHHeC3Eq7Q?= =?us-ascii?Q?QRYoLkLw0Q1+Z/MUGPn63W973YvsD/s3PrqHTbHiMQv2HE36msDIKwT8o0Ks?= =?us-ascii?Q?pEhOKQ/KtvQdMDk373SqsWqWmAGVEa/kA3OIyVO5/6NXrnb9xEhfO9gYv16q?= =?us-ascii?Q?bdnMsQ1B/aaZ0ZhGyLoF6l4JcGYIwJ3EI/6BMJ1sMLdSTP0XmSsyCfFXivlq?= =?us-ascii?Q?9rBO6aYGL97cx1eel9F4zaa5Kl35Q+HhF52vKht9734i1CmjamA/0it0W+aP?= =?us-ascii?Q?uim/LQtgP5EvYCKjrCQemPCFTB6pwp9ptydninSEShgbnECDhFzMWo0SylAr?= =?us-ascii?Q?NmZYY9w44D3fn1HSsA8usGPP+b6aIJEROZudhQao+I8+Ur7Ittt3UVZc+zBk?= =?us-ascii?Q?0BLe4KOGHD33WwOwwuM7pkalVuw+YYvBvN0u9Q5/7kAsU0af/NUMNIYSE+9e?= =?us-ascii?Q?Ivy4rh6RPAA8vIzwEMGdxb1wmDNP6LlBAX8J0oWBI8yK17l7PPbIWZB7LIyO?= =?us-ascii?Q?4waVuUl6g9YUijcnYOUytcML7zFeRBEDtqByF+uqZYxhGBzWl2ISYeROo4p7?= =?us-ascii?Q?O5w5GTL4AMPd5H1eAQ2twQh3euA95c88npSogdbwyr4rBu+eqi6T8+DsRkqm?= =?us-ascii?Q?3ucVoJkmDc9rQbu8NXvbfEG/tcuh1GZ8iwCD+6zwYB/oSC3RIwDjhCSXeBBV?= =?us-ascii?Q?M2bjShR/yM66mCZvgz97XJbvq/K/0UMH5KTPz2/n9relynjpbrRTR8YnNFsC?= =?us-ascii?Q?Na3tGNwDM73zlyY2I5tOaADCZjaqJKiflQNO6tRuLi4raltp28o7G2vVLpuI?= =?us-ascii?Q?RTgnYSLdw5qIzyy7NJ4CSaUjZp4Np4cvA0M8nlQh6lRCqhtLZDutkj+9xG/j?= =?us-ascii?Q?3dd3UVEnlCVMVERYMlqk25sreperyKMJ46i8Hi80tE1zyY+ysFhzU24MlF+V?= =?us-ascii?Q?UQk4D+vK8qJEbghzAnWhAQr/Xi2ulguiMjgkXYDu01Sx2tyE6IyDnXg5jEe+?= =?us-ascii?Q?7qgBOP8zbJz+vPvja/U5ZI2C0xYsv/EiNT8vzFZwm+KoWqFpK6LXjST9Y17b?= =?us-ascii?Q?pERo8SbnDkR6VZkfILfyhiMQPbm0hkec2ScFum0FA3Xa1WA0dP2yy6aF2t4x?= =?us-ascii?Q?1M6+BP7WE6lUfFq7sJp6orh3Spo1vkQcGxGPjOC2GzYUAPZ5u8ihhEDlwyNi?= =?us-ascii?Q?7z46W0cPNhJHANhERpHuazobwv/tLH5OAWnTrBUMjVYe30sfJHmfSM6AZDIO?= =?us-ascii?Q?dYwt2pk2/VUrzH0wTOd3xoVAmpmWFRFzGnGY5WFqg/4YH/qNeaSs624kHb9b?= =?us-ascii?Q?F6iYNeYs0wOUHSprwUd0EwvkZUSZC0yA8XtnbBIK4Elx3FMy2sGo4iIAptE+?= =?us-ascii?Q?PjqUyC5Xxy3TWjJ3hLBGmp4DByfOEoWz+cj79OJivONF143LZHhwPmicjNJG?= =?us-ascii?Q?1h5T0SLtAisga3w/vCXcdn5vp1g9SblO2hO0w0MpGcBa1q22cqk06UBWKfak?= =?us-ascii?Q?/x801Bf7VrZJUlPl1KHcjDy0t08vIwtvErImeV35i3+ZCiUOMaEaet0QWagS?= =?us-ascii?Q?W/Kv0sv993tvoMEJ274OUK1L6dURzT9isy3gBEmq11oa8HaDtgqlcQfRF8Yd?= =?us-ascii?Q?l0Qhs8vp9Pt4JLm2LdY3DPE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc1fc1c4-da80-49d3-76cf-08d9d1a573c4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:17:59.2637 (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: DbAGAQ/vnrrdf3L9Ko5YYTlHiOADoC4tfBWvhOkkU+4gcZiL9f8rWqADrshyuNlbHvkV4NFKmpgCRbeewkmBpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_show_endpoint(), wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in it, and used a new argument 'ip_mptcp' to choose which one to use to show all the PM endpoints. Used this wrapper in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 475867a01b83..1a92f0526a4a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -363,6 +363,17 @@ pm_nl_flush_endpoint() fi } =20 +pm_nl_show_endpoint() +{ + local ns=3D$1 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint show + else + ip netns exec $ns ./pm_nl_ctl dump + fi +} + do_transfer() { listener_ns=3D"$1" @@ -471,7 +482,7 @@ do_transfer() let rm_nr_ns1=3D-addr_nr_ns1 if [ $rm_nr_ns1 -lt 8 ]; then counter=3D0 - ip netns exec ${listener_ns} ./pm_nl_ctl dump | while read line; do + pm_nl_show_endpoint ${listener_ns} | while read line; do local arr=3D($line) local nr=3D0 =20 @@ -524,7 +535,7 @@ do_transfer() let rm_nr_ns2=3D-addr_nr_ns2 if [ $rm_nr_ns2 -lt 8 ]; then counter=3D0 - ip netns exec ${connector_ns} ./pm_nl_ctl dump | while read line; do + pm_nl_show_endpoint ${connector_ns} | while read line; do local arr=3D($line) local nr=3D0 =20 @@ -560,11 +571,15 @@ do_transfer() if [ ! -z $bkup ]; then sleep 1 for netns in "$ns1" "$ns2"; do - ip netns exec $netns ./pm_nl_ctl dump | while read line; do + pm_nl_show_endpoint $netns | while read line; do local arr=3D($line) # 'pm_nl_ctl' shows the address at the end let pos=3D${#arr[@]}-1 =20 + # 'ip mptcp' shows the address at the front + if [ $ip_mptcp -eq 1 ]; then + pos=3D0 + fi addr=3D${arr[$pos]} ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup done --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101612jap; Thu, 6 Jan 2022 22:18:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRQ9/rng28GQs42j/ZRqLAP9LoVPJRk5My8fekGtA61za088n+24xS0RQB5BdW/lpntiC/ X-Received: by 2002:aa7:842b:0:b0:4ba:881b:278c with SMTP id q11-20020aa7842b000000b004ba881b278cmr63452267pfn.30.1641536292196; Thu, 06 Jan 2022 22:18:12 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id e187si4012421pgc.575.2022.01.06.22.18.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:18:12 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2977-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=aDdV5fSh; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2977-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2977-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id C4C393E0F6F for ; Fri, 7 Jan 2022 06:18:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A8B3F2CA1; Fri, 7 Jan 2022 06:18:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 8BF8E2C9C for ; Fri, 7 Jan 2022 06:18:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Hf/U/VYL9BSCIMZZR0FhK0uFHbCyvMDDYueoIaW68k8=; b=aDdV5fShD/DNHvQBgEu672dgwnXpJCl7DnJ0FjCRreMtWEGIY3JSr7iTRQ5aXYeI5ftUiz RAGOe2syUmllE2tUJfGOAv97InLw+rvqc7JMuqUHeK5sPmNSL/TkUMTynbRQ2SIvhNWGEt lNXc7ha/v7C20aPAbn3WrOBktIPST98= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2106.outbound.protection.outlook.com [104.47.17.106]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28-HCTwUF11MsWlYhvyp0IbMg-1; Fri, 07 Jan 2022 07:18:07 +0100 X-MC-Unique: HCTwUF11MsWlYhvyp0IbMg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Vve7sTCwKsCMB9e7E//lj87uPjEggKBJCXI6AowJUTlAFnSyjF8nfi5CqWDQiJyzYMq5gdrkkqe0DhXIRl7a7rCXusOB/YdBh+DAkflRT5Inh+af+sxH/kwTU6VdfdPj2hKjkglRjWL32HTEUeXPpKBbfz7ioTr5TvhN5LWUmju+4hcpkkpXVsk2hPUrI9cwZi0RwwzfcvzsLmrF1enJDFHJGCaLQUAaDbSDnUUIuZll4Rts4dgoxDkNzZT6jqgk8QT42qjRmITkhU9EL1cgM5kHzIsBtkPg0Zq7y5S5onxCbCfD97PkMHhWcTDga/cmeedJG7ySDwLfLmnVPLujvA== 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=Cr5G8LHlSQvwBE62MMnjuAa4Lj5vXn9dwh4QTaOLmzI=; b=iwayS/6rzK77TwEJo7CeBpxhpJEhY6BMP6BaIBqavM/MjHtTTvXiEGWXbPKrUof8kv+YVtEKZIQVJLFoWDJc9PYJxhFlFlLnBAyVYPaHWd6W9HtoUI/Z+YhmAZrcOiA6OaXSbqF07bK5NjHeIR7gcuogklhcVadJp1SftFFFcZr5sO429e38OUOaO49tP46x0zO+tiuh2hQ7c5YMTdkCi+7C2ZxC5rUeP+iB5CL26tCbbZ4is200I4bzZvMidT5s3Zk4Zw+PJywZB8r1FoyiJ9hiRSl8O7vXip24DeDXjQ62IErC83bVxOt7jDaGo0fKxpmlgOXcG4i9MZOEofeRJQ== 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 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 HE1PR0402MB3369.eurprd04.prod.outlook.com (2603:10a6:7:81::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Fri, 7 Jan 2022 06:18:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:18:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 8/9] selftests: mptcp: implement pm_nl_set_endpoint Date: Fri, 7 Jan 2022 14:17:00 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0023.apcprd04.prod.outlook.com (2603:1096:202:2::33) 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-Office365-Filtering-Correlation-Id: 5e322686-8fd7-4a92-9511-08d9d1a577c5 X-MS-TrafficTypeDiagnostic: HE1PR0402MB3369:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YR8593AZTvuwPGmOU21WsnGshIwKz89gWgbfRf5xe+rWaBU5ANB0/vaI1gBEYlQlrq53Iahs9D9nJeWldxm0lWdL5+knXBrNsS2diOX5LibukKmENAbPXqK4kyXryrTt93Zf4lyJGSnT43Y4VI98ZJhOH4QrZ+UMjdzsQDlhFr7PJjTk23/Ldj11LhB8Hs8cR6xbHeFjVIoVoIMI7mjFnb0yhOpQGKn7Q320QgBWimiE/Yntk5i+JoptemUXnJW2LGO1C9fbZNGR312GqKZtDgeeiOt7qG4Eu2r4ASpBc9Y6T5aybq6ue+JFScm5xr4Yrlt5R43dPrYRpA1NslmLqsmIkw5VGOgtrEs5VyWFin+q0F6Ug2KvdS7aSF8aCGzbWYipF1BapPuGLSiSgMPJJFfrX6XTDAlKSy8ve+C0U84kbA9LilhV60ajjxBAXq7SOKBtCxFpFNolFVD/vrjWeOG1+nVRhQukl7aXF0OrjYgX9iWJcZ8M6wDNLjUKYScBuZNkmqyV9b1P8SVrb5eKGrw+DG7JIE5ZY+LRc2DdcUMUT0uNS3nmmABqgP0euX4ld85dYEGbNrsHOElPITVdwNweKuWWkS7j4QE1UEy7cpSPfDgEGg7qu++IIl6GEg3m7RFMtLz8YnawGDRpWEyBIQ== 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:(366004)(4326008)(6506007)(36756003)(86362001)(55236004)(6666004)(6512007)(8676002)(6916009)(26005)(107886003)(316002)(5660300002)(186003)(2906002)(6486002)(66476007)(83380400001)(8936002)(44832011)(2616005)(66946007)(38100700002)(508600001)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GsNeR+//B3mO153+qHEcP8qqrZiQ0O0EA6lziPevOEu1GN5En0oYU7waQfe1?= =?us-ascii?Q?Cjzai1Gj4qAyXaUnUlvU6mSRkmKsB1xtxVKGYy0OSdcAK2uF9yUXTOX55KV+?= =?us-ascii?Q?SQsAYOGkgE+dGxP8qZfLsYWL43WYm3E15mUZa1QjXb0cRkrihy+EMqVgF49D?= =?us-ascii?Q?2ZNOO5/J31XRV2AojxiuXgvSb4TMLu867oORYA1lw/l1IEEa4BP6+OOBeFsj?= =?us-ascii?Q?xEob53sYcOIylvuvfzOKo0/JYrQel0eE1XWaHI9t78HXXJfgs18V6RsVgmYd?= =?us-ascii?Q?YAIYivbbNuAx7JshITxbtyScSWMh4hvQ63/sAi6AdoCoYOLVXdsqQtMVx3Xr?= =?us-ascii?Q?N4O0I4ZoxQEbE0LpnZJBapWVbantzlNQn6zL1Gz/RnbePaaR/gG9NlCB0OdD?= =?us-ascii?Q?FDzJivwlk10S1xzu05S5E0ueEkCPIV1cl4UGyWt3TS4OuI4QJj/Rn7mUe2PO?= =?us-ascii?Q?kjFlxmdXdq7ynP6X7JRB8Hwx1vxBzfdKJE9CJtoIc7b3mClj2SJgKHaSEPq0?= =?us-ascii?Q?+mc2V9N5ETXvH3fdqbKpAYOaIg6XBKpd5nhyPYteh6RGyeQ0S5xTpsaP7fQ/?= =?us-ascii?Q?w5yxsbO+AiHZVRm3rcWUN21dgK734mubYRflF+72xXDb63H0V6wyDzVjISjn?= =?us-ascii?Q?W1L2jYAG/KmJ1VVT/O9A6BhjvOlzsoacpBUEkRKA1OazyGWYf8ogZ4+Sexoz?= =?us-ascii?Q?k6IOxnNMcojBYMIq+RqN7wCH6EAq67koALzLBdQrtUJLBJM7nOjtrst0GWBK?= =?us-ascii?Q?N+lrwLRDMZL70mMEyDO9Bx12OnZ3ZiE6U1yxmbbgnP7Jtxv630IIyZoHk6Xz?= =?us-ascii?Q?wHzPxbOofvQtQy/lgRqJeSWaYxtLwPH/cYTBD4NGmfZzsLORh8Ugz0VdE4OH?= =?us-ascii?Q?copCbMqndiGrmsmMH0tYrLTIKy/RrohzmncE2IR1DIB6Vf7Abv8X/TVJabSt?= =?us-ascii?Q?pNHRZFt2eRbp2qmCWYbnuexJaTQPqRmmn0y6WEqAdvvV2CqIckVL/Iw1qa+G?= =?us-ascii?Q?5cxZWpBrbegekmaIkCcB7MZ6FqVJKTzBZCjRs7mjJmFR0tp1EUq9wgWPMMzz?= =?us-ascii?Q?N2rC/2y1jtjMHs1v38/B2vl4yKbb9vSpO8OCSHk6CCGISni6qOsSno4aTeL2?= =?us-ascii?Q?iaxcMqXI3oL/Lt9hAj0N6BWkaOzpYJQ1hFZO6mCbtSIBp6m2Mo5YhEbihI5O?= =?us-ascii?Q?Z3RRQUYhWUcOw93j7uBa/f2GwO44KkZRJ3uDG5h4X+se3ZcSLNs53o2m8S0A?= =?us-ascii?Q?46vi/znk8eNildvQTsw0QF/NfnAOlLkffpRCAG0FAuJhmNvWcOG7KzSCMPJL?= =?us-ascii?Q?OSfWAROykaBpCPhsCe5Y/CmN2GEPVAY2wG14N5ksvwAHB3pexWkyghSKWSoU?= =?us-ascii?Q?fh57N5eMMIX0+8ie+RABHAfWh4sX4zmxJ1dlXsol8QCAhNnyWwgFLWd70CuZ?= =?us-ascii?Q?4wX/LxrlH2jYz5exlzE5OEgfrHFqc6Ibb6QB6AruXn8BXEA8wN1U0nCybYwr?= =?us-ascii?Q?NslRv2JPGhQ1TnOUte/2vSBgzQej+SfZ5XsktK8WTegifBhJLx3X4Nboq4Kt?= =?us-ascii?Q?c1gDJ13JgP7Y3L7MmmquUQ3ejgEHBsMMYI1HltMfqugKcmqJTKsvNo8etC5F?= =?us-ascii?Q?y+4Y/lCgejPeqFW1/ye9aqs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e322686-8fd7-4a92-9511-08d9d1a577c5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:18:05.9975 (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: dsWb5LNjaT2/Kqv1CEWCm/mQuzqTLo0HqpBZYsNNZHB5ObtvhHpSh2z0JdW5Qz4J5VBajxncEOIHLGP26Feu8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0402MB3369 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_set_endpoint(), wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in it, and used a new argument 'ip_mptcp' to choose which one to use to set the flags of the PM endpoint. Used this wrapper in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 1a92f0526a4a..8202c5750c33 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -374,6 +374,19 @@ pm_nl_show_endpoint() fi } =20 +pm_nl_set_endpoint() +{ + local ns=3D$1 + local addr=3D$2 + local bkup=3D$3 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint set $addr $bkup + else + ip netns exec $ns ./pm_nl_ctl set $addr flags $bkup + fi +} + do_transfer() { listener_ns=3D"$1" @@ -581,7 +594,7 @@ do_transfer() pos=3D0 fi addr=3D${arr[$pos]} - ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup + pm_nl_set_endpoint $netns $addr $bkup done done fi --=20 2.31.1 From nobody Thu Apr 25 04:44:03 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2101717jap; Thu, 6 Jan 2022 22:18:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIixiqY7PNtu5Ld3q6JXikCaV4xSMIUHI5/TroV13+RhXIdovNk/1VYFCjMckFmZWsSCA6 X-Received: by 2002:a63:f244:: with SMTP id d4mr55743450pgk.65.1641536300905; Thu, 06 Jan 2022 22:18:20 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id g18si4636094pfj.13.2022.01.06.22.18.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Jan 2022 22:18:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2978-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b="b/3hZzLc"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2978-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2978-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 2307A1C0F0C for ; Fri, 7 Jan 2022 06:18:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B03C72CA1; Fri, 7 Jan 2022 06:18:17 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 8FF192C9C for ; Fri, 7 Jan 2022 06:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641536295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gCBiVMtkBvcRr/u2RQomgj7ZbF31csL0J5PCdPL2CN0=; b=b/3hZzLcRuti4h5DITS9hiFd2wPuBeCKfFYg4SLABPv7L/LrAubQTpVGdQ1ucVDLOl7kWY Ok7xMexPw3DICeu5OnAi0Y88a4IfuIVdOoRu/RLdGL0FlB8miPLxO/VC+JRH85vO8DSsaG lRzNkWmqtM6LubWQ43WSGgj7Nw8M6uU= Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp2059.outbound.protection.outlook.com [104.47.2.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-37-bYl5kFz0PIKd4kxz0NW0Ug-2; Fri, 07 Jan 2022 07:18:14 +0100 X-MC-Unique: bYl5kFz0PIKd4kxz0NW0Ug-2 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Os6f+daGJEFDSmrEvW/L1K2XnYCvuLY/K7OEnSJD9PZ7gSz8EJFBPY8p9A1lUrq+qBK8W0CmzyVdD6cBGr7kA0hK7qddZBFE8SJ47iuDesqDxIpR2wnzCWUII8DOwcrP9C8Ypp+dZ01z5+yVuiOJGX6GEMQsIumY0swne8dUczpIvAdCq6gkzk9EqhZfdKNLzHn4z0WMAPLUWCNvqNqldanF0LsrfpKqo0ZCG4+8eXh1GTvK8vN2iTVscOEho+Gi5Xwx8BUgFlAaNpnMeBo+w7HPnHeR7lUKiYHYPOWDdSDTJx0NVOO8laBVOYErIDOez2FPN+I8CjGVeld88CI7uA== 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=M4QdS9Pbzh2AD/ZE1TDdoQXRZgE4cXYaWmu++ZQardE=; b=QU2VfetMbBVN0/iWRV2gsseaGIymg73M06dV8qTpbzCJeRwldi/wZaBDYPucR7q3Izxpxn3hyIL3LsWblZvD51KsM+tUdAbWc/u0AkHdbGd7iXnuGrP9D53dh2FGvmWozmvkCTrB1M1PIn2slerTkeWq+MphgnSmxMr9iJ8+gFI4Q8UuYnjrQChM61mgXYsnaZr7V0Q+3YPzx/sxNi2PKjoX6NddaCNgQVoCGOG1lNmYeQKR3rp8SzrwT5/7mlmF8N/mYA2mt/kVxHyP8tvBVZz0ZUhbA8x6JWceislUx+Syn2FrmN8oAfEa9ARgdDGYCLyYkzYDXXWuFpyOyV4TOA== 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 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 HE1PR0401MB2540.eurprd04.prod.outlook.com (2603:10a6:3:84::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Fri, 7 Jan 2022 06:18:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4844.017; Fri, 7 Jan 2022 06:18:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH RESEND mptcp-next v2 9/9] selftests: mptcp: set ip_mptcp in command line Date: Fri, 7 Jan 2022 14:17:01 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0160.apcprd02.prod.outlook.com (2603:1096:201:1f::20) 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-Office365-Filtering-Correlation-Id: d5ffc04c-eb70-4bff-da2d-08d9d1a57bcd X-MS-TrafficTypeDiagnostic: HE1PR0401MB2540:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mzzgm2zP7zFlKMGMNxkFgOCHJKdi7dCcprrYE5SLVG+27mqn6BxDtIgiVOlPc+Sdv8AeCPy/Uqu6Wm7BCV24P+ZZb381iPhu9zKzdsE764My9WtwczMYwkho9No3t8+Q0fVju/K20eSeo0QAFd/+RTl9aTeslJpeUqF7Y34GEBzsDlBdzG+8RPtmkze1DSVKH+5fkC9Kt8HhGzPhpwgPnmMvjB7Kks/6FMbClEwowDralmfu2jp0jIgcWnb/cgXoScvkVWB+VZSZkvpUTMn2zOM1CdAy75iVv3sogzOPN+VNtlDg3Gg3Nz2NwjtM/JGpBBXCBLMVGyzXVi/8QWMartQHM9GrElL6bE0ZqaE+wNUlBFFYFqweQ1QxwsgMPOSt3P28gnv3vGGH0FNQt8Fn7WmphEXZQVA6+6Kyrb5RZ62tQVoF/NvopQ1jNGusVB+Ho4y7K/EpiCGJbHL657GirR4MtjHCbQ6D4PLvBBiPnezndxIczlo8DhihlEfCwcC3Mn3kPE+s1LmVH3UgfxTQ8CuV+Pd7HUvpEAvtbnC8YKJdcIaKZWtIYDbg8JuNDouAZ29UDP5khhI5DBM43saHpytLjY1GL2Ls4biTAfYzdny5S1uKezC9hSCzWd7+l/yUlq47QZ045FFRlUYAx4+CTA== 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:(366004)(6506007)(4326008)(66556008)(2616005)(107886003)(55236004)(38100700002)(8936002)(44832011)(66476007)(66946007)(316002)(83380400001)(6916009)(5660300002)(8676002)(508600001)(186003)(6512007)(86362001)(2906002)(26005)(36756003)(6486002)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fWZZ6UxTD4UfSvvCGSm1N44XUabMxbfaBBnW10eeouw0QkaIc/c8fiuCilyK?= =?us-ascii?Q?Ynmc4eyJe5lTDxSLtSUKMCDNqcyh5mdODhukymj9+FSNI2krINoKm9+qsIUo?= =?us-ascii?Q?3SMaLgX6w20K26HGr75OerH7IeelYlTEO9TRxv2J/BtaqRjaxuJFV3hiWtWT?= =?us-ascii?Q?DWki/rf4CFDA69K4kbDxc6Iz5wEYyR6RCxCowN7HYr0vAA8xV5orY3M+96F2?= =?us-ascii?Q?BNslpucjWawmmHFK5TDvMU6O1g3iMfvD8UHNv64b75gl1TsH3Ff0CexikjN6?= =?us-ascii?Q?JTV8BMWArbwTF00X+qXCRnHEUYP+dD7pd5B6i57WB6TDigtHu9TiBUqyl6/x?= =?us-ascii?Q?IxI8+2grVpzsyaeygSgVhPUNKgBjFEJMin4kYfH64T0NZsbupbNWInjfoKO/?= =?us-ascii?Q?zLQ5NY3yEGRY8PwEkmtPeC9CoA4++uHDTawuPl26xqCjLj+kWNe4tZhpqSGF?= =?us-ascii?Q?mBtAaoSLtgfrlLqDgZzYXE1XgsPNINxdhhahHjo4UQR/UFF3HmQ2LHpP+FAP?= =?us-ascii?Q?iUUlbFchfu8UOyeOmoZs6bEUz5632TixbDUr1J4rO0QxgKiHacJ86ol+Nktg?= =?us-ascii?Q?6x2wsZCjRbFjGrQHRb0/V7DNp+wFZDnQ4fgbmzWy/u8FHHwNAOZSeQYkhi5F?= =?us-ascii?Q?DdDfQuQWGX1c5cgJXDkYh5cDn7wkDCFs1OGSyTBTS07OGw7iouYQ09m0dXpS?= =?us-ascii?Q?ITjsy5+8MocXy+UMXNsqMTYsLluAC/423oV7SEJxU4gu2TGKTLRNvJ4qeYV1?= =?us-ascii?Q?i4g21B1VnOEEIqgvPG1bAeJXbToBOtPwF/+QOMUtKBcLIZqK3+1Q1+tc8jLN?= =?us-ascii?Q?joLkbuVSKY+cSZh00LtCXLcw0e48urfA3JZ8UinN5MRxg6dnN+gtWKzCJ0cI?= =?us-ascii?Q?gFVXKkHvL3na6PUSlllJxnOng7GNDe8LCFP3Kc79gOHRuEYGFI/dn7DUa+Gj?= =?us-ascii?Q?ZIgbz3r95M0/GziMgMFwRFzgNFl8QEVUgNsrYlMdLpNKULzp6KQ/lEtIlU4H?= =?us-ascii?Q?/DQ+G69H0UHHQwTrHPQjcnWD1qYGhHm/fpV/9ep7+Rz6e7e7HIbBi6Suf9dI?= =?us-ascii?Q?TAqSIHmPOQhUXev+76zpXAqsMFpBt9u1oYXq5vERAobo/O19iDluT3KsV1jw?= =?us-ascii?Q?t8EmOOIMgBKKx8Oavqn1p3PBnVEFEVfqjiMu4pslFwptXDyTQaw6RN44eWrD?= =?us-ascii?Q?TJZj6k7zheO9G6/UxTvcYa684/vMjXnE8DA31++pJaX0rP9P8DM5kLW6KSTm?= =?us-ascii?Q?lx4kCEE+t5AieZYAGzK4sL5ETdeWcqSR1So7ZivKLp90GK1RbT6UgnsnVM4a?= =?us-ascii?Q?EGiMPfiRteqAEYsEDp+hKUPKou5JLlKSzNFBeElLVR5QsokZ+LEV1Kdsz7Sy?= =?us-ascii?Q?fzGeJR1PvtYkQ15GGhwxjZrNCluXV0dw8OuVakqs94zdG/6fExpi2qxIYwOI?= =?us-ascii?Q?/4cSJR8P4CS6oQdMoIyH7VX8ccR+Hkt3+nut1dBD+GfrxSM7sL8SnSjBFkfL?= =?us-ascii?Q?yKc7ZdW59AsT6r3WhqNK2+u1zdOVLSVM9pE64gRZ460bNmZB1yLGcM39Xv6s?= =?us-ascii?Q?2B1UcleaLMUp5iCu11BNerCmCKw+hZmFHoyM33sByhyiTnE25dQIWQRwvbie?= =?us-ascii?Q?lbQnRMbCiIFp4r+GGIVcf6Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5ffc04c-eb70-4bff-da2d-08d9d1a57bcd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 06:18:12.7470 (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: r3rKpku7yn5+AIzFGokCqffYsKNMqcrlUBG+kHv3/n7u8BPcKjkEgZaQuuhqb2NnMXcDggSdoACf1vZBFPLBqw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2540 Content-Type: text/plain; charset="utf-8" This patch added a command line option '-i' for mptcp_join.sh to use 'ip mptcp' commands instead of using 'pm_nl_ctl' commands to deal with PM netlink. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 8202c5750c33..7ceb8ec11f79 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2152,6 +2152,7 @@ usage() echo " -u userspace_tests" echo " -c capture pcap files" echo " -C enable data checksum" + echo " -i use ip mptcp" echo " -h help" } =20 @@ -2173,9 +2174,12 @@ for arg in "$@"; do if [[ "${arg}" =3D~ ^"-"[0-9a-zA-Z]*"C"[0-9a-zA-Z]*$ ]]; then checksum=3D1 fi + if [[ "${arg}" =3D~ ^"-"[0-9a-zA-Z]*"i"[0-9a-zA-Z]*$ ]]; then + ip_mptcp=3D1 + fi =20 - # exception for the capture/checksum options, the rest means: a part of t= he tests - if [ "${arg}" !=3D "-c" ] && [ "${arg}" !=3D "-C" ]; then + # exception for the capture/checksum/ip_mptcp options, the rest means: a = part of the tests + if [ "${arg}" !=3D "-c" ] && [ "${arg}" !=3D "-C" ] && [ "${arg}" !=3D "-= i" ]; then do_all_tests=3D0 fi done @@ -2185,7 +2189,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCS' opt; do +while getopts 'fesltra64bpkdmuchCSi' opt; do case $opt in f) subflows_tests @@ -2239,6 +2243,8 @@ while getopts 'fesltra64bpkdmuchCS' opt; do ;; C) ;; + i) + ;; h | *) usage ;; --=20 2.31.1