From nobody Thu Apr 25 16:03:59 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp9882312jap; Tue, 4 Jan 2022 02:11:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyk8xy2xBfRevzPSFwG6Cg2P/2ucFtKLNsn4nphchcPcQJxBUdo09NIPhlbi9n2DTUwvoeN X-Received: by 2002:a17:90a:fe0b:: with SMTP id ck11mr60706506pjb.22.1641291106905; Tue, 04 Jan 2022 02:11:46 -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 i17si41663070pla.356.2022.01.04.02.11.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jan 2022 02:11:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2885-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=JyDIPZMk; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2885-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2885-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 BFBC61C0964 for ; Tue, 4 Jan 2022 10:11:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5FFCE2C9D; Tue, 4 Jan 2022 10:11:44 +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 C07572C9C for ; Tue, 4 Jan 2022 10:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641291099; 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=w6xLJO4YWijik9jW7an89WAQ8eyUSpg8j7KgugeLUHs=; b=JyDIPZMki/H32mWmgkNM876MPOSq5KAwvPxByIrV3jCqTWktbEJa9uxF+Cifwb1r3g2cu3 vcp2hiXwt/QepgKimBGhwjx2vCjy8f2acwjttMyqQUt63AbrfOCZ59cuSGE4T0VZPg5KeH bLDVP12LJTAWexz5p+lOs5uv0cthgkA= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2059.outbound.protection.outlook.com [104.47.6.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-32-f2fW8V79Pm2tXMTgJFKk9Q-1; Tue, 04 Jan 2022 11:11:37 +0100 X-MC-Unique: f2fW8V79Pm2tXMTgJFKk9Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HMNuRm0hXpAUtXWzfw7Kxy0h+OTUl3XT0xnjYsvKiOo6h0ADrpOFWWbcQol0JC0MiL+F8BOWI+t36y2wvA19RBWQEhiOea5watlkHwHPfoonzYub/MYlk0+PY/V2jz3ihbotvCAAmOcCJLp0iuIzuEJncPf9sTsDh4x+NX0fQPIX0H4xQKZngAAkLjhHe2EaMcAmEntuJgxqTv0KQwQwYUZF0eQOoseleb0iBQ3OzIZGX6rofTKmTe4HNNHJe6c5cocDXLxgx2mXQz+atFqSCOSLWrpr1H3nn8kiJhEWW87X3ATravo681dDZTyo8Wvf4xsMmO+Re3AOXw1wcOUcFw== 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=5SMdfNw744UVpC6DCHuc/nTnGfsJzeB1kyw7343qFy4=; b=LLc1HRfdOgbXz5a5xvoBfoOInlRyUgAmePzIrZun+M1AcTEi85MCkyo+1eLMoHgYKu9AQm5xDPd7RKq/7w4Y5quY3KzpO3VLSylGQIuzsOq/kCdSGP53KQJTqy6FZsUGQdbBim+ho/H+1FePZRLuwivQzJDir9eRWGEpo31qclbbQG7cjBAp5ofG+JB0LbjgGz4ikONPPE28+l6YFDqS9WNa7xSv8kAZabFW1KiCwQsRmkPSeTJYlQXHBp9VUoSCzJPOCzyRO4H+QEaJ+b1eBaEAi+wVQcuFBfFpiq8zJbUqlGswWML54CkMfq5MEkdlN5g8bT2TrvrT8VYZb5sH9w== 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.4844.13; Tue, 4 Jan 2022 10:11:33 +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.016; Tue, 4 Jan 2022 10:11:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/4] selftests: mptcp: use 'ip mptcp' in mptcp_join.sh Date: Tue, 4 Jan 2022 18:11:16 +0800 Message-ID: <9f4ec73636180987e51fddc3b240feccc0a5c553.1641290905.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0145.apcprd02.prod.outlook.com (2603:1096:202:16::29) 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: 7e306252-3914-498c-6e60-08d9cf6a9578 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2540:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1443; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zsYeiPY0bX9pnRm6ILuXzQxMijTIVY+pc4ZH2bn3oczCVTknE7CzdSO53tyJGm/HWLvqf+COl0+ZGfeRTEKtK6km50+pJ2aGoeRYqsdsVUgwDCAm9HXtZLFIiZvyDP41kGP1gOabyUTqQI7J9ghLFPmzVB2pyVm//cF3BXC/ktI6+00/4GxdTMjno2HBZiQv7ucVr80LH4HJo5WlFvSPxzhTgONWVPGbL/m18MJl7ngP3IFfQf/nntt4WDUmnJ2d91sTR4ODdO7njetIevv51nnLeUa5FsHv92otJEnBIZIHZvnMnjjeZcZzJncLgA5NUBYaXY4cELKZzvTUOat0xOfiWc/FuMHBD5EJacas3HbvH0i2QUqotKJVW7Cy9+FI9zt0tw5jK7Gq/CMjzplQmqVzVhWRV4oUqyzGs0DJRAQNJ1w91SHVEC0PyPuKGdt2dRpIHRAneRX9ZpMX8IAGIa6YrrFBOeJIDhKytb60/6Vlb6xACWpUKLaxQAXhS3ekcESNTUgu8VH3xjPHEHD03l/FR50L4FvrhnUqXnuqIuMh5TbnhMmuf094BpRAhT1nJYRGzWdot6Or9LPUOOqlN+UkLgF5M3/Nh4autMmNTI7bMyZKP3/e7A+n2CXhiDfjO/Cfzt4vb7GQaIDrUydQvA== 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)(66556008)(30864003)(4326008)(66476007)(8676002)(2616005)(508600001)(6916009)(86362001)(6486002)(5660300002)(107886003)(186003)(38100700002)(8936002)(36756003)(66946007)(55236004)(44832011)(316002)(26005)(83380400001)(2906002)(6666004)(6506007)(6512007)(579004)(559001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RxJ5+FnGR2Vs66Y2TT4NMl7LHm+d+Q0tGTrWpWJvY99XoRMmzZ+pw3tDeVTv?= =?us-ascii?Q?tbvvGmwarbBtgFayl5WDIL7K7iNUEJCEiYcrNtvjFwd68fCo75g7twdh2k1M?= =?us-ascii?Q?B1lSNSXPLVA+jDsR+jaVCDjOQcCmxt3v8rEw5Oq1oHCwGIXK4wITaY+0Bb7m?= =?us-ascii?Q?YU0Pk3tMwa2jQjd77yMtUdz6WSiwiu6PoTHkdSVxZRx4WVvL5LIHy/fxEmV6?= =?us-ascii?Q?bbaMsNXym6UayhZdJv7bmjqVbpNRXaMQYrMhcu9v5Fh93fofdFO0SqW4YXT6?= =?us-ascii?Q?qEqTpPFRfNfxgekBIn0LLK2++uJfjxbGo/0IAP1qNnJ5bJ0NVSnMt6YwAr5U?= =?us-ascii?Q?QCUEeK1t/c82MxSqwrhAfCmENWEAXFAGDWaueuKZQ3Ss0SuKPxqEGoK/+DQu?= =?us-ascii?Q?t4pMm2SyjMTtvnFmHc97oFg09nr2GHvSR6Z4HT2UkV2bIiM/Rt8Xbxv3qjWh?= =?us-ascii?Q?ESWshbEJXhg/QkZUlWKMP1ZaItXCG2I101y5bk3/0712Pc1D4tB0677PKqkW?= =?us-ascii?Q?vx40/m960EF58wEXGvwpEbwZGdTG1pjZ2pEHza/SB1wavocdc/ykce+6E4UR?= =?us-ascii?Q?xsYUsDuWIOJv0sVe8Hs0ucqptLdaXnVxFr2ehS6WpAdzM4gT7Onu4VTJnprc?= =?us-ascii?Q?mozknJWMWVEOJ1aJzOI/CbAKeqPbAO97rKPRQQK9ojED/whoRfiDVNgOZKcw?= =?us-ascii?Q?8L9ur+x5Y9kNPLd3GD0v456uwTC8cG/mpyfCvHOpjkDjhHisO8f+3o1OtKq6?= =?us-ascii?Q?8Ub60a8QuBBZ2wRnqVVfdTuDN7Xa83VctDhddBX5coHE1eDGjmVnFQDlTRAb?= =?us-ascii?Q?x06QLbNQ/pAINMvCsKnXy4nMpuChTJCuCrNcXllJcSn8EgBeWhmMkQmxLrSW?= =?us-ascii?Q?sKkEdQeadYTRSB7+0vs3mFuo3WQzvo+Tx3hbgAcYqoM5lls4v/TcfYMVeMrx?= =?us-ascii?Q?scodg/5Xn+nkwXJ2WvWK66oWmrWIy6w61Rag38jrIrSt8TtpJ648YrjL3Ph5?= =?us-ascii?Q?7wByK8+n7GYf6AX5nX5A0OSHw3CRuzOcx5wenXTT6XKHC0I2WMyepU2OazcE?= =?us-ascii?Q?w2GxPi0JKJLrOSB7+0qqs8VxzRyPjx+5RSd6WJc7hWr51ez5Gk7w0gKYfVjk?= =?us-ascii?Q?ezBGGpz4ud8X+6zkCF9zNvqxNAYtn6eDt/GjSZMtPJOgHKXFGM0ngBz+qxPE?= =?us-ascii?Q?/T/4mTnJBD8KaHlJjU78beBw1t52H2TqtAJUEm/ySuW0lk/soWch3YkzWSSW?= =?us-ascii?Q?5YPw0NHJjzrTYYZWdgrHWaJ5LpdnH/i2hSyxgDvryvREw2B1Y2x6YM36NVMG?= =?us-ascii?Q?k21jlryaZCN984jarfLXkgjnf5Bx+kn+drTvjrsZqnNFB9xvJBRphdSSLMN1?= =?us-ascii?Q?1fZk5Cz76zpyXrE99sgwPsEFnhYe4a5NmvT7p6qWKBBcDkAOdZdIF/eTUMxV?= =?us-ascii?Q?SKyZB01NMCLUOzmpyPOzfc4hlMtS61aNeSdetUUVJLC6m2/mLURoQ+GnakNF?= =?us-ascii?Q?A5uubOpK++8Syi4K//1qs2vOpJ9ybWflZTKrGwC6DB+pEqpfQyl60ZjnNeS1?= =?us-ascii?Q?rUSNY4etIuBCgToGf0sZvNAASyZ2NiZF0VxyTlXFx9uZS5aZd/UpWaD728ve?= =?us-ascii?Q?+6jPC0UInHRAgAuaIQFr7Wg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e306252-3914-498c-6e60-08d9cf6a9578 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 10:11:33.4253 (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: 9vwM3KRLnXfKDxQUQ2OANNpTa84SA57Yr6KdqmkqidJYTLQzn//8KFKuX/Bo24Ifg2mwVjJJyiTPOyPagO5kdQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2540 Content-Type: text/plain; charset="utf-8" This patch replaced all the pm_nl_ctl commands in the mptcp_join.sh script with the 'ip mptcp' commands. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 686 +++++++++--------- 1 file changed, 343 insertions(+), 343 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e48ce23d2386..1a2a6d878d71 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -378,7 +378,7 @@ do_transfer() else addr=3D"10.0.$counter.1" fi - ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal + ip -n $ns1 mptcp endpoint add $addr signal let counter+=3D1 let add_nr_ns1-=3D1 done @@ -386,29 +386,29 @@ do_transfer() 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`) + pos=3D0 + dump=3D(`ip -n ${listener_ns} mptcp endpoint show | awk -F "id " '{ pri= nt $2 }'`) 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 + ip -n ${listener_ns} mptcp endpoint delete id $id wait_rm_addr ${connector_ns} ${rm_addr} let counter+=3D1 - let pos+=3D5 + let pos+=3D2 done fi elif [ $rm_nr_ns1 -eq 8 ]; then - ip netns exec ${listener_ns} ./pm_nl_ctl flush + ip -n ${listener_ns} mptcp endpoint flush elif [ $rm_nr_ns1 -eq 9 ]; then - ip netns exec ${listener_ns} ./pm_nl_ctl del 0 ${connect_addr} + ip -n ${listener_ns} mptcp endpoint delete id 0 ${connect_addr} fi fi =20 flags=3D"subflow" if [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then - flags=3D"${flags},fullmesh" + flags=3D"${flags} fullmesh" addr_nr_ns2=3D${addr_nr_ns2:9} fi =20 @@ -426,7 +426,7 @@ do_transfer() else addr=3D"10.0.$counter.2" fi - ip netns exec $ns2 ./pm_nl_ctl add $addr flags $flags + ip -n $ns2 mptcp endpoint add $addr $flags let counter+=3D1 let add_nr_ns2-=3D1 done @@ -434,22 +434,22 @@ do_transfer() 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`) + pos=3D0 + dump=3D(`ip -n ${connector_ns} mptcp endpoint show | awk -F"id " '{ pri= nt $2 }'`) 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 + ip -n ${connector_ns} mptcp endpoint delete id $id wait_rm_addr ${listener_ns} ${rm_addr} let counter+=3D1 - let pos+=3D5 + let pos+=3D2 done fi elif [ $rm_nr_ns2 -eq 8 ]; then - ip netns exec ${connector_ns} ./pm_nl_ctl flush + ip -n ${connector_ns} mptcp endpoint flush elif [ $rm_nr_ns2 -eq 9 ]; then local addr if is_v6 "${connect_addr}"; then @@ -457,17 +457,17 @@ do_transfer() else addr=3D"10.0.1.2" fi - ip netns exec ${connector_ns} ./pm_nl_ctl del 0 $addr + ip -n ${connector_ns} mptcp endpoint delete id 0 $addr fi fi =20 if [ ! -z $bkup ]; then sleep 1 for netns in "$ns1" "$ns2"; do - dump=3D(`ip netns exec $netns ./pm_nl_ctl dump`) + dump=3D(`ip -n $netns mptcp endpoint show`) if [ ${#dump[@]} -gt 0 ]; then - addr=3D${dump[${#dump[@]} - 1]} - backup=3D"ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup" + addr=3D${dump[0]} + backup=3D"ip -n $netns mptcp endpoint set $addr $bkup" $backup fi done @@ -1011,51 +1011,51 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 0 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 0 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 0 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 - 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 -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows" 2 2 2 =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 - 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 -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows, limited by server" 2 2 1 =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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow dev ns2eth3 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow dev ns2eth3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, dev" 1 1 1 } @@ -1065,28 +1065,28 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.1.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.1.2 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 - 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 -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.2.2 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 =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 - 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 -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.2.2 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 @@ -1095,9 +1095,9 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 @@ -1107,7 +1107,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 + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow wait =20 # additional subflow could be created only if the PM select @@ -1119,16 +1119,16 @@ signal_address_tests() { # add_address, unused reset - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "unused signal address" 0 0 0 chk_add_nr 1 1 =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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address" 1 1 1 chk_add_nr 1 1 @@ -1138,59 +1138,59 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal" 2 2 2 chk_add_nr 1 1 =20 # accept and use add_addr with additional subflows reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows and signal" 3 3 3 chk_add_nr 1 1 =20 # signal addresses reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.4.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.12.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.14.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 4 subflows 4 + ip -n $ns2 mptcp limits set add_addr_accepted 4 subflows 4 + ip -n $ns1 mptcp endpoint add 10.0.1.1 signal + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.4.1 signal + ip -n $ns2 mptcp endpoint add 10.0.1.2 signal + ip -n $ns2 mptcp endpoint add 10.0.2.2 signal + ip -n $ns2 mptcp endpoint add 10.0.3.2 signal + ip -n $ns2 mptcp endpoint add 10.0.4.2 signal run_tests $ns1 $ns2 10.0.1.1 =20 # the server will not signal the address terminating @@ -1210,11 +1210,11 @@ 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 - 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 dev ns1eth2 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 dev ns2eth3 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 dev ns2eth4 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 @@ -1224,11 +1224,11 @@ link_failure_tests() # for bidirectional transfer reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 dev ns1eth2 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 dev ns2eth3 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 dev ns2eth4 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 @@ -1238,11 +1238,11 @@ link_failure_tests() # will never be used reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 dev ns1eth2 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 export FAILING_LINKS=3D"1" - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + ip -n $ns2 mptcp endpoint add 10.0.3.2 dev ns2eth3 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 @@ -1252,10 +1252,10 @@ link_failure_tests() # the traffic reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 dev ns1eth2 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 dev ns2eth3 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 @@ -1267,10 +1267,10 @@ link_failure_tests() # for bidirectional transfer reset init_shapers - ip netns exec $ns1 ./pm_nl_ctl limits 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 dev ns1eth2 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 dev ns2eth3 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 @@ -1282,38 +1282,38 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflow 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 =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 - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add dead:beef:2::1 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 =20 # signal addresses timeout reset_with_add_addr_timeout - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.12.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 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 @@ -1323,28 +1323,28 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 =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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 =20 # single address, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 @@ -1352,10 +1352,10 @@ remove_tests() =20 # subflow and signal, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 @@ -1363,11 +1363,11 @@ remove_tests() =20 # subflows and signal, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 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 @@ -1375,11 +1375,11 @@ remove_tests() =20 # addresses remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal id 250 + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.4.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 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 @@ -1387,11 +1387,11 @@ remove_tests() =20 # invalid addresses remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.12.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.14.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 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 @@ -1399,11 +1399,11 @@ remove_tests() =20 # subflows and signal, flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 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 @@ -1411,22 +1411,22 @@ 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow id 150 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 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 =20 # addresses flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal id 250 + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.4.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 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 @@ -1434,11 +1434,11 @@ remove_tests() =20 # invalid addresses flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 3 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.12.1 signal + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal + ip -n $ns1 mptcp endpoint add 10.0.14.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 3 subflows 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 @@ -1446,18 +1446,18 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 =20 # remove id 0 address reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 @@ -1468,37 +1468,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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 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 @@ -1508,33 +1508,33 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add dead:beef:3::2 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 + ip -n $ns1 mptcp endpoint add dead:beef:2::1 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 =20 # signal address IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns1 mptcp endpoint add dead:beef:2::1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns1 mptcp endpoint add dead:beef:2::1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 @@ -1542,10 +1542,10 @@ ipv6_tests() =20 # subflow and signal IPv6, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:3::2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add dead:beef:2::1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add dead:beef:3::2 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 @@ -1556,76 +1556,76 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add "::ffff:10.0.3.2" 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 - ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add "::ffff:10.0.2.1" 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 =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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 =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 - ip netns exec $ns2 ./pm_nl_ctl add "::ffff:10.0.3.2" flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add "::ffff:10.0.3.2" 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 - ip netns exec $ns1 ./pm_nl_ctl add "::ffff:10.0.2.1" flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add "::ffff:10.0.2.1" 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 =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 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:2::2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add dead:beef:2::2 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 - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:2::10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add dead:beef:2::10.0.3.2 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr "no JOIN with diff families v6-v4" 0 0 0 } @@ -1634,18 +1634,18 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow,backup + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 =20 # single address, backup reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 @@ -1656,28 +1656,28 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal port 10100 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal port 10100 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 =20 # single address with port, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal port 10100 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 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 @@ -1685,10 +1685,10 @@ add_addr_ports_tests() =20 # subflow and signal with port, remove reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal port 10100 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 @@ -1696,11 +1696,11 @@ add_addr_ports_tests() =20 # subflows and signal with port, flush reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal port 10100 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 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 @@ -1708,20 +1708,20 @@ add_addr_ports_tests() =20 # multiple addresses with port reset - ip netns exec $ns1 ./pm_nl_ctl limits 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 + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal port 10100 + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal port 10100 + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal port 10100 + ip -n $ns1 mptcp endpoint add 10.0.3.1 signal port 10101 + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 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 @@ -1731,56 +1731,56 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 - 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 -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple subflows with syn cookies" 2 2 2 =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 - 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 -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflows limited by server w cookies" 2 1 1 =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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 1 2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 2 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 =20 # accept and use add_addr with additional subflows reset_with_cookies - ip netns exec $ns1 ./pm_nl_ctl limits 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow + ip -n $ns2 mptcp endpoint add 10.0.4.2 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 @@ -1790,29 +1790,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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 1 0" } @@ -1821,26 +1821,26 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow allow join id0 ns2" 0 0 0 =20 # 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 @@ -1848,28 +1848,28 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 =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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and address allow join id0 1" 2 2 2 =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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 2 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 signal + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and address allow join id0 2" 1 1 1 } @@ -1880,10 +1880,10 @@ 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 - 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 + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 4 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 4 + ip -n $ns2 mptcp endpoint add 10.0.2.2 subflow fullmesh + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 @@ -1892,9 +1892,9 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 3 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 @@ -1903,9 +1903,9 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 5 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 5 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 @@ -1915,9 +1915,9 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 2 subflows 4 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 4 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 @@ -1928,9 +1928,9 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 @@ -1938,9 +1938,9 @@ 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 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 2 + ip -n $ns1 mptcp endpoint add 10.0.2.1 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 @@ -1948,27 +1948,27 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type rejects join" 1 1 0 =20 # 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type does not send join" 0 0 0 =20 # 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 1 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 @@ -1977,9 +1977,9 @@ 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 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 flags subflow + ip -n $ns1 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp limits set add_addr_accepted 0 subflows 1 + ip -n $ns2 mptcp endpoint add 10.0.3.2 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 16:03:59 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp9882309jap; Tue, 4 Jan 2022 02:11:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyXPAWUFxN2qP7Jh/gt76Xy+JUrFDMejcSo9PPcwqrQP98MmNLri1kSJbhdd9GIQ0IwbYnN X-Received: by 2002:a17:90a:474d:: with SMTP id y13mr26731822pjg.54.1641291106996; Tue, 04 Jan 2022 02:11:46 -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 p6si21252239pfh.25.2022.01.04.02.11.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jan 2022 02:11:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2886-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=WCREMTNE; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2886-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2886-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 B89C33E0E65 for ; Tue, 4 Jan 2022 10:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 41C072CA6; Tue, 4 Jan 2022 10:11:46 +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 E53462C9C for ; Tue, 4 Jan 2022 10:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641291103; 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=I8QrsAONIBZCbjOM4+fb6XgDLOwxfvas2pawqDAkurk=; b=WCREMTNEHrGUT1YHt080BelwVHRsD/JjaAykN4hpfiAYSJb/2yWCHnuYBb8cE9tpMKZV9n bjfjJ8WkX/ManA6Zuk65dbzOhIdFR21UIBPhG9xVqr0fAy2DL/kfDKtqu2Ka8jWNos6jJ8 8ULrS2hxhZE+zqVlgBcDmVPW1/UeecA= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2057.outbound.protection.outlook.com [104.47.6.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-2-2CI4nI7GOIG5MhR86tBEaw-1; Tue, 04 Jan 2022 11:11:42 +0100 X-MC-Unique: 2CI4nI7GOIG5MhR86tBEaw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YvEyWyP9FjlJL+Gto7a2Kn0C4i0d17II32+DQweMtiM04BQeplR/df9ZznbyvcSXZ/1QpclmnwjNsWYgCIG8wrCjwJ4qyu898rRNpsbaqOQACExpXrpI2jO2kjMuw2Ewy+Zz5GZp4cMhYxzfJEHDPoZN17NOOoghzgntTJQFzHF71p18jjmih07ksW7DqKsQEam6IccnY0F5yT4B4ItFTViSDV+FrKk5ByRBqvZ0TW6IyF2D4pe6nlhQ7AkAMaNaDfu/TtA0ChX2gczFNUD97U8mJjB/R4dVTEXTs4SAzgwEtuEaUp/GSuuHytJWq8uPRvNleZnusA7/Hxks7r110A== 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=gM06RPRL9tf6YmRRV7ILBoxPfLa2AfsP5V/lMO8WbVU=; b=Y+/NtQFhDxiZ3DV4hb+d4KpOo34NYVhH08rIRjvKlLFMl5y3RKEnW4yHaMfD3jTMARx/Wz+i3CckEKtEA9Av815zi/vnx24s5g6yeddRUSVniI4sZqnBQXZsKhQuyscTwIbH5A7bvkx9+WhJvCVshIYpgOIAXW9DUkRtIQlsDYZVo2slrbw3o/nig5/dMENH2GGtkd6XyBB1zA8aBg+fLT5KOOJjbkz/9VPTTn32YkCz8ASzM5nKkG5tOwjtfoceRSLT7xTCXw3I0/7FVtvLOjW4txED0366T7QBmpyex8mwb8xe1Q7NXB+QliP5RiWKRF66mSu8X5VoFWho0a6B1w== 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.4844.13; Tue, 4 Jan 2022 10:11:41 +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.016; Tue, 4 Jan 2022 10:11:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/4] selftests: mptcp: use 'ip mptcp' in mptcp_sockopt.sh Date: Tue, 4 Jan 2022 18:11:17 +0800 Message-ID: <6653dbf53abfec82b61ab0856a182d5f4e79277d.1641290905.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0148.apcprd02.prod.outlook.com (2603:1096:202:16::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: 794bd484-b3bf-4c1f-9291-08d9cf6a9a46 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2540:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s45kZH2vnMJsGKM0p3b6LD/G8cfbcWZcdYLcKqkznABjqMDgWY+5g3QVkg8yoqe07Himy5xQlTGZOWnlC4d+ExionCu26RJOjl1l5gihfV+kmMq2zU98DYSJkkzlS7+4P+g++IQblWJgUnAMc0mGKnuc47FacJBRJHPEu0aTHhKv4wWVToQINuXIMC/fwAnz+FIIJcSaWK1u0WDSxfR31EufonwowCh7aRuUX7hfPjJ/bVl4HT1iDRAgFOLXCvDHUba2Y/UPlp7GgxPDHLCJMm5my2jKSeQRUr0q0MO6lv/FEFTJBkEZ/ra793Xr4pQ1mxm/PyYInrmRHszTSCjctfmK7nDf1w0WfOf98vPAhJt3tlSX7xArs3vwuaIoEdYQv3NH0TufxOYdKEpZtZpwz8Z8xwFmy2xSp270Z0Nnim+yE20cifzVGRW83veYJnnp/YD6ga7BPprURvVZzCGG8+gykgUwl32WpPXtufaDxiSj69h73rWfy0MsS+UnBXm4nwNPvMaeORIxY//VFv9AZQt9e2IivLEkPlHKXtp1X9GkC7vOCOwniAdG+9+9HZbBD9b5fYSMFba7BFIStmEXrfsAbjpkzbH28h+9sj7m796XUiAm1JLx2oRqixSEr3PCLKDiYgOwFPAiJCocvOsL+w== 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)(66556008)(4326008)(66476007)(8676002)(2616005)(508600001)(6916009)(86362001)(6486002)(5660300002)(107886003)(186003)(38100700002)(8936002)(36756003)(66946007)(55236004)(44832011)(316002)(26005)(83380400001)(2906002)(6666004)(6506007)(6512007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?2AZ1tG833rMRwlPKAKpA6Z3D2O0LdV8qxHRwShZqHkcxINKjAQIskdnRU0Ld?= =?us-ascii?Q?ypSLXXTxh9/oIayXW6+mp8FY0ZDV6cHztMbPo3yv7//gkbM+lav/2Cne5VTP?= =?us-ascii?Q?bao6pDr2TTqdggRLeOB+olgLkUjK13kCT5rLwcc9tB54aPTK78C0dEcEdQwj?= =?us-ascii?Q?jHv/NagXrcq4OOPM9XYTP//6D+T8msh/gZAIVT9xZONqUWYfFkm53Txan7TX?= =?us-ascii?Q?dvNAqGkd004lLDgtKCv1YlteUp/RH5l5GXcUZ5kkFvyogwTUpHIDfmLmQkC5?= =?us-ascii?Q?V8fC5YBNP5ruEhz0yIbmiNthiGYNnO8SCpCsbUI198pYtHNG4uNMbSyxo+x+?= =?us-ascii?Q?pbrb58BzFa16M5KIUVhaRTx7Zop/s/glIYsOS3boITpnfm/j8oiUCp5xgvLp?= =?us-ascii?Q?stfSFXaWcQ5S9gpZXUdbQ9bp04mg5Zg2Ml0OoIGJcfJoGPzjasDxCB9TXXWi?= =?us-ascii?Q?OXZX8ijnUdijf0zOof3+Xum0RrBM2Hhec3A4139PBW7zypXgy/jXhSuqhJEi?= =?us-ascii?Q?5WhA/76crQwQScD/rXBJkmt1mpo1ATXm4nkOcOAcRCVA53nXp40SyK+BvhZt?= =?us-ascii?Q?HGxfckcbe5O3sJBOmToyWBR0WgRIgXpaLOQQ8fYhqaqc/ncSIzX1LDYglxAG?= =?us-ascii?Q?xCsrQ35+YWCu0wkoYJKQPPPmKjBPI08wzV9JNnzkmgTrmcHtkpX6f7EETHMD?= =?us-ascii?Q?u5noJNC0XWWn5LGoh0K3Tdhka5ajo2tnYoBPJC4pCJhMIpWYdsbOjwY72QO+?= =?us-ascii?Q?qG3z9LOao636tE+WcwFU0rEinZStGa4bBEEokk9kB2zGQt+PakyXdJ4uCXut?= =?us-ascii?Q?1igotDJ1P744Zb+OoPWw41UBE4W8e4GsLFApIb0W6v2SMaJdciSpbziTB/OJ?= =?us-ascii?Q?XZjKj3/tOBodtUjRijCiLrDoYFzjZ7M51bO4UDs2zCn2CBz6iyk7MRTIS4NX?= =?us-ascii?Q?mwEywAmZvKQI7KTEr1v5I4nCm5OAAQqUdMOt/wRBvZ9xPvTCYQ3kA+FkMU/E?= =?us-ascii?Q?szmeK3acJPMw2RkXzkjFmVBgmpg9Tr2wsN5RaBkjTi9upBBsibuZ4IdSsALH?= =?us-ascii?Q?XKXDWtbDr9V3DFFK4gVFLuA8jjNzwqPNkkExwmaeiU+yXhn42gCbwt54AmA7?= =?us-ascii?Q?E1L6qkgAzoeuYspvjICDqTf51FDkxOV5z0YxUaLZx+yUVkNbd+blNmRp3++Y?= =?us-ascii?Q?7AeyTkNnCKFmoCUYTrn1G/xLia83TzNa/GKgIhj6Rnj9pL1vNPivuLfdbLB+?= =?us-ascii?Q?WEhxUVrbuVNDOYdpJ2f86mw89UbE2QRoGZAYv7Y6l3Y95YhQBBnWoqatcN+Q?= =?us-ascii?Q?lkCL7pa3OHH/0JRm62MAuIyh7plZx4ukRrovlyLkhs+lL/P1MdKx1udHiskh?= =?us-ascii?Q?5QoJ1FY+EnU/jbpLLri8nR/k62TYKHpFuo8pedw8vNinzBGu5OkPozw28zWC?= =?us-ascii?Q?gYTnvrTjHQnpbXBzCAI1T9hcz5l5XoXis5UOI9hpufeViVMbW/rOESIjOJfA?= =?us-ascii?Q?DyY0Hm3CGRNwXyzg59SBaKx3UkdgpfFzLkPX7TcXeXnkQngU/VPu8AvoeEU/?= =?us-ascii?Q?i0N5dsGBsQhWNHirJ7hHpeftXPZ410jws+B/XO9xi3c33gZdRnhNNHxjaowk?= =?us-ascii?Q?GnO+U77TP5XcgsbU9bsftxw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 794bd484-b3bf-4c1f-9291-08d9cf6a9a46 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 10:11:41.2216 (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: s/CqhUROBGx6sc8YNW0eFNAEJa+7nYyPrCXBbOc3GFkw0moAOh7W+U2g6oCPDS14uT/Ew3x/5YISPMklpwE+nA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2540 Content-Type: text/plain; charset="utf-8" This patch replaced all the pm_nl_ctl commands in the mptcp_sockopt.sh script with the 'ip mptcp' commands. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 0879da915014..f4da6d2da1c5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -57,15 +57,15 @@ init() # let $ns2 reach any $ns1 address from any interface ip -net "$ns2" route add default via 10.0.$i.1 dev ns2eth$i metric 10$i =20 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.$i.1 flags signal - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:$i::1 flags signal + ip -net $ns1 mptcp endpoint add 10.0.$i.1 signal + ip -net $ns1 mptcp endpoint add dead:beef:$i::1 signal =20 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.$i.2 flags signal - ip netns exec $ns2 ./pm_nl_ctl add dead:beef:$i::2 flags signal + ip -net $ns2 mptcp endpoint add 10.0.$i.2 signal + ip -net $ns2 mptcp endpoint add dead:beef:$i::2 signal done =20 - ip netns exec $ns1 ./pm_nl_ctl limits 8 8 - ip netns exec $ns2 ./pm_nl_ctl limits 8 8 + ip -net $ns1 mptcp limits set add_addr_accepted 8 subflows 8 + ip -net $ns2 mptcp limits set add_addr_accepted 8 subflows 8 =20 add_mark_rules $ns1 1 add_mark_rules $ns2 2 --=20 2.31.1 From nobody Thu Apr 25 16:03:59 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp9882418jap; Tue, 4 Jan 2022 02:11:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJzmaWKrKe0Rpw6ZunAAFN7uoNyI50EIrytY0RN8ldQqi1lpTfb2xFyrxJz7qJARbjI39UN5 X-Received: by 2002:a05:6a00:22d2:b0:4b0:da80:2dac with SMTP id f18-20020a056a0022d200b004b0da802dacmr49816377pfj.66.1641291116431; Tue, 04 Jan 2022 02:11:56 -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 l14si37509838pls.471.2022.01.04.02.11.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jan 2022 02:11:56 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2887-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=Eq8FP+Q4; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2887-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2887-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 A2E861C09DE for ; Tue, 4 Jan 2022 10:11:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 74F072C9C; Tue, 4 Jan 2022 10:11:53 +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 B425C168 for ; Tue, 4 Jan 2022 10:11:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641291110; 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=eXqmdpQhF9TsJu6DU4NhEde2wUVF5wVoqcNmFMKfK6k=; b=Eq8FP+Q4nbq5CLtoPvJDWuTUnYv9tHVxSD+O287uBnjzu2+DeETzW+rscFvWoAB/NoGcpc 3UEXRV5dGcgl4fU7WC0t+c3e1iOthYvhs5e3rrlhnr6iqo4jWDcVbyw7s2zE+G/zJtK9OA umJ/4MPbRdSnKqbK6owv9btsK0JxIgk= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2058.outbound.protection.outlook.com [104.47.6.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-33-84nDgNbgNNu7b1Ds9vPC-g-1; Tue, 04 Jan 2022 11:11:49 +0100 X-MC-Unique: 84nDgNbgNNu7b1Ds9vPC-g-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E5jN1bGQqU11AVeGOShbpszN6IvSosKcTUpZRncVHlcquIzesDJDxypHmhPYQEQGzCXlgybjmfewqmsrwtfavnK4xYIJ8uKdl6aW5RiKQUCJL9YkBi3YGIMEKfPuS+Lvsl7bB7TcTVUK5J18acfREFJcOxjh3vcmYjOwPLKt2vjx2J8DQH7U7j4ZBQnQdMggjD0uI5Hja8E0EcNBPSk1IfdyuegqUJJt5EF7lh/X5hciCCeNAsdFt9jAs5hvrDuhW+VDN/VgQ5R3gKoKizyC5gpRDFZ96S6ijrZInNGowbx57xHYM/CJfcOGwrmEemAHP5keV5QZoRICNVsHHtN2EQ== 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=K6pN6rfE2S1EoCE+9gvoL01WShYwecDufpFKEK9HCCg=; b=Iu9IncQLPatpPMtfRqdleb4CacX/kUA0f5UXh7LdXSjn+MwDQBQAP3MGNcUVFj0N2JGAf+X9pj1hyXuVlwF6Tv/ak8m7G4YVlS+Pav/H6r87TTuT3bhOXXs2YrE9n0baxNSfx2AF/FNlpyxZdoMAJtP5uAetzcfgEuTKBuSpEvpgk+pJhTvFxwLonlxxZ7AHHcCcFnXyxSQ/7aYbaxaS1P54lVwATLSfT2fgXqQn/QrztLszJMMyPrZvWzzADNH/BNrmgLm3vqhtLITkeWDE8IFb6bzObSQSzU1nvJjNBOf2B2Qvt4FdvlHX3qIc8pR+Srtg3aSXXcdPsha4H7qW+w== 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.4844.13; Tue, 4 Jan 2022 10:11:48 +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.016; Tue, 4 Jan 2022 10:11:48 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/4] selftests: mptcp: use 'ip mptcp' in pm_netlink.sh Date: Tue, 4 Jan 2022 18:11:18 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0203.apcprd02.prod.outlook.com (2603:1096:201:20::15) 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: 3de81546-33d6-4f35-3a03-08d9cf6a9e51 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2540:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SSH7gvSgs35RdnbSUWFcfbzDAXhg8fyF7KhdTSLI9g+c3RM8qjUmbVco3aoWQUGwzmvUaakF3X+ZfVLWMvl5Asay4dOHxgn9Wjst+IZcKEW3tGbvxyFD2HLxGwchHZm7ifoNURpUl+ATDX434X+9hKOgR8WfZB8kJmHuQlZVTf5Uavo+6FaWCAZLuqQd+VlOj8HJE6CFDR+gr763XqxTZwvjX/SO3WuA87Mym4AtrATJF9HbG865jNCueADhfV9IBVtM1ewPyHZVF+9Snu8qbl9uexovdyV8A1EVFT0sM8MRtTzgxuq3eEl3qjTdkyWM8gDYvkZ5+2xWAbIStokw84lLlBB6Fl4U10Sl9eO5SQXL6SeikYh30SlxCtUY+/AA9ZhYxnNvWJ7eVIYx60J+UWRem3d9M8dFIWN5i/kvx3zpVhakkiQ8O+haU+KhMZzWY2O/I5+iHRzKZ1EcKb/Ty48kxgyY5/Epam4in5CaMa9ba6x0D2b+wVFo/9+xW9/aqLI33b6YKrdacVhgiOmH+jvOtA52Gnq8qzktehwGRb1ciitFQ6WMzXn6BYXiXGqH8xbYuKyxFfm0TaWx0GGv5yEPhT25RT2PKIBvukh6ZaKldQgZ2VDqbNIB9IiLmce2YuzJQqwFEfT2puCNQJkHzg== 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)(55236004)(44832011)(8936002)(186003)(38100700002)(66946007)(36756003)(6506007)(6512007)(83380400001)(2906002)(26005)(316002)(6666004)(66556008)(66476007)(8676002)(4326008)(5660300002)(107886003)(6916009)(508600001)(2616005)(86362001)(6486002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?q68FzQ4rdAMLaTf8q+Q2+Mu55lC9bHuxXxuGfjlTfKXF3ajBmDGMriyxjw95?= =?us-ascii?Q?fdlXpKr5D1Xdqw+5+r/MlaLmPiwdj122aucAuqvPqqCdEE6en+1AP/Ggrnwi?= =?us-ascii?Q?6NDy1n9hLxFETx/bXH5iblbYOZp0QxPPFovhaJB00MMmbukztSKOojzBmr4s?= =?us-ascii?Q?zCbFjkaPfCKJizs5TgerjO909WbQYD97QYduk2ViuMw4deSpS3lAkhwoSqfL?= =?us-ascii?Q?iSV4VaRUBtkIzHrkixka6h9AEqIyzihY/0mHyNSitLAHrnkYtEeAcY1bI0Cw?= =?us-ascii?Q?QaRFoChIj+cMb3a9Zn0Ao6OSQgFE72FKFqsD6VOBDrRd05DhgprnJxNW37sB?= =?us-ascii?Q?75zNLTNMej+/nX0d/xpqjm3Qgt1TSq7y7csaFDiJbzv/4/t3mgL2n7Uh9/Q7?= =?us-ascii?Q?6HT6+legPqn6WVOxB5IUnuwhIz4ba1sZmsheGXwnvmY1OZPOeka7OvkDK62i?= =?us-ascii?Q?B/iKvQw3oHNV9o68ZuX+E6+Cp/+Oh8+aPRRVfhWt5GI4Bg55rO97vg5S1CIc?= =?us-ascii?Q?og99aClSxWo1DTiz90Jx5fJV55ocasuxef8/6mve45zipPCRXFeNn3AV1Zbj?= =?us-ascii?Q?QE8UmQ77sv5/b46L4uOiAEahuamYuxY3OCDOre5Iyoqgz6+A3f6k+7jLR06a?= =?us-ascii?Q?6EKP3eeaIACps/P1ehTxanb1zRJxBpjqcFYtRtV4raR0Ne3XbNG4SaK1EKh6?= =?us-ascii?Q?G6bt2PflRjWq9Di0EwL+VjhJzSaJ4FVWooVFcS46n0P17oiZJh2zeJx2Diwc?= =?us-ascii?Q?k3KleMAnHlN4nTv+Y5E5wBzMqLCORgpAbYCNorK7UlZXj6eL/MBPrSW54Ksv?= =?us-ascii?Q?3thAAUzw3BON7aGG9oMflehY0LSBvDAlCKf3Qlra8K3lrmihcSHpZ5LXu5QE?= =?us-ascii?Q?ycO4KQir4ehENinKpCn+evIQpJOg201QTv5yTCJmjiryVByeR0Y4325/QOiU?= =?us-ascii?Q?GOJnjr3WcSUcFtDlc5phitMWVfxAXYd6oM2qUkPyLSXSl6/SRMUprGfStznL?= =?us-ascii?Q?vRL84x+/XrQs9AUtdlweZGpWXAzaKHlYv03zCrc+l1Z5vLa0rbh9Urla1iDv?= =?us-ascii?Q?lII0DPdgRRvN+jknexgTb6e3GPSHqgoBqcT/aaBjQd3sK00ezE3lj8MEw5Kw?= =?us-ascii?Q?Qeo7PkXHAtc0JKA2/LLs1QJjFg78FVVivictxy70F9Az6JXxRODu+5IIpZM3?= =?us-ascii?Q?0KZRTkUQ2VrgUSf589Roh7VT6o2Kx0TrXiOHXrZDb8cWCE02jJWpt1eQ8r2M?= =?us-ascii?Q?7aNR+kH8RMjtvvF+WdSaZ9nnGnoaoWuqYLJXlkheTw6ivvgIByr/HNVOHRm6?= =?us-ascii?Q?h/dun2VXLMirheR496ro8J3LRT3yNOZ6A7S+W9rvEPpKHJLj2jO/fpj3deKQ?= =?us-ascii?Q?kKOEbucLc9Gdmx0YJQdYYmcGcc9T6MRYsstJrlFw1FD+RQXkNrKKVIF+qL7V?= =?us-ascii?Q?jOkIIJKIbRmdVrrLilxd6Nv5JTjHLoXXqknPQzmkICy2GFCnH6se9hSYUf+3?= =?us-ascii?Q?OjMGdEc5vq6qNBw/395jkzZ4jOdRD5kE4qY0IxZZkXaBe9/l4ALGqXFg2pzL?= =?us-ascii?Q?hUx+gpst8+ULu7uk0hf7tlOoXTpJEw5Gg7j4FZ0NSfLG6gXcM84B1B637Q4t?= =?us-ascii?Q?360nv1Q2hZDpJzLARq6o0sY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3de81546-33d6-4f35-3a03-08d9cf6a9e51 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 10:11:48.1898 (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: E49vyj4e5VGXW6YjRuZC8NbDmsl1VAtBZqgW0otWsRQSOJ09umsY5y1P9P9WEUp/hsQh64tzl7xO+yMiEqTksA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2540 Content-Type: text/plain; charset="utf-8" This patch replaced all the pm_nl_ctl commands in the pm_netlink.sh script with the 'ip mptcp' commands. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/pm_netlink.sh | 164 +++++++++--------- 1 file changed, 80 insertions(+), 84 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_netlink.sh b/tools/testin= g/selftests/net/mptcp/pm_netlink.sh index cbacf9f6538b..638705d639c2 100755 --- a/tools/testing/selftests/net/mptcp/pm_netlink.sh +++ b/tools/testing/selftests/net/mptcp/pm_netlink.sh @@ -68,100 +68,96 @@ check() fi } =20 -check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "defaults addr list" -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 -subflows 2" "defaults limits" +check "ip -n $ns1 mptcp endpoint show" "" "defaults addr list" +check "ip -n $ns1 mptcp limits show" "add_addr_accepted 0 subflows 2 " "de= faults limits" =20 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 flags subflow dev lo -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 flags signal,backup -check "ip netns exec $ns1 ./pm_nl_ctl get 1" "id 1 flags 10.0.1.1" "simpl= e add/get addr" +ip -n $ns1 mptcp endpoint add 10.0.1.1 +ip -n $ns1 mptcp endpoint add 10.0.1.2 subflow dev lo +ip -n $ns1 mptcp endpoint add 10.0.1.3 signal backup +check "ip -n $ns1 mptcp endpoint show id 1" "10.0.1.1 id 1 " "simple add/g= et addr" =20 -check "ip netns exec $ns1 ./pm_nl_ctl dump" \ -"id 1 flags 10.0.1.1 -id 2 flags subflow dev lo 10.0.1.2 -id 3 flags signal,backup 10.0.1.3" "dump addrs" +check "ip -n $ns1 mptcp endpoint show" \ +"10.0.1.1 id 1=20 +10.0.1.2 id 2 subflow dev lo=20 +10.0.1.3 id 3 signal backup " "dump addrs" =20 -ip netns exec $ns1 ./pm_nl_ctl del 2 -check "ip netns exec $ns1 ./pm_nl_ctl get 2" "" "simple del addr" -check "ip netns exec $ns1 ./pm_nl_ctl dump" \ -"id 1 flags 10.0.1.1 -id 3 flags signal,backup 10.0.1.3" "dump addrs after del" +ip -n $ns1 mptcp endpoint delete id 2 +check "ip -n $ns1 mptcp endpoint show id 2" "" "simple del addr" +check "ip -n $ns1 mptcp endpoint show" \ +"10.0.1.1 id 1=20 +10.0.1.3 id 3 signal backup " "dump addrs after del" =20 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 -check "ip netns exec $ns1 ./pm_nl_ctl get 4" "" "duplicate addr" +ip -n $ns1 mptcp endpoint add 10.0.1.3 >/dev/null 2>&1 +check "ip -n $ns1 mptcp endpoint show id 4" "" "duplicate addr" =20 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4 flags signal -check "ip netns exec $ns1 ./pm_nl_ctl get 4" "id 4 flags signal 10.0.1.4" = "id addr increment" +ip -n $ns1 mptcp endpoint add 10.0.1.4 signal +check "ip -n $ns1 mptcp endpoint show id 4" "10.0.1.4 id 4 signal " "id ad= dr increment" =20 for i in `seq 5 9`; do - ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.$i flags signal >/dev/null 2>&1 + ip -n $ns1 mptcp endpoint add 10.0.1.$i signal >/dev/null 2>&1 done -check "ip netns exec $ns1 ./pm_nl_ctl get 9" "id 9 flags signal 10.0.1.9" = "hard addr limit" -check "ip netns exec $ns1 ./pm_nl_ctl get 10" "" "above hard addr limit" +check "ip -n $ns1 mptcp endpoint show id 9" "10.0.1.9 id 9 signal " "hard = addr limit" +check "ip -n $ns1 mptcp endpoint show id 10" "" "above hard addr limit" =20 -ip netns exec $ns1 ./pm_nl_ctl del 9 +ip -n $ns1 mptcp endpoint delete id 9 for i in `seq 10 255`; do - ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.9 id $i - ip netns exec $ns1 ./pm_nl_ctl del $i + ip -n $ns1 mptcp endpoint add 10.0.0.9 id $i + ip -n $ns1 mptcp endpoint delete id $i done -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1 -id 3 flags signal,backup 10.0.1.3 -id 4 flags signal 10.0.1.4 -id 5 flags signal 10.0.1.5 -id 6 flags signal 10.0.1.6 -id 7 flags signal 10.0.1.7 -id 8 flags signal 10.0.1.8" "id limit" - -ip netns exec $ns1 ./pm_nl_ctl flush -check "ip netns exec $ns1 ./pm_nl_ctl dump" "" "flush addrs" - -ip netns exec $ns1 ./pm_nl_ctl limits 9 1 -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 -subflows 2" "rcv addrs above hard limit" - -ip netns exec $ns1 ./pm_nl_ctl limits 1 9 -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 0 -subflows 2" "subflows above hard limit" - -ip netns exec $ns1 ./pm_nl_ctl limits 8 8 -check "ip netns exec $ns1 ./pm_nl_ctl limits" "accept 8 -subflows 8" "set limits" - -ip netns exec $ns1 ./pm_nl_ctl flush -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.1 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.2 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.3 id 100 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.4 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.5 id 254 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.6 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.7 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.1.8 -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.1.1 -id 2 flags 10.0.1.2 -id 3 flags 10.0.1.7 -id 4 flags 10.0.1.8 -id 100 flags 10.0.1.3 -id 101 flags 10.0.1.4 -id 254 flags 10.0.1.5 -id 255 flags 10.0.1.6" "set ids" - -ip netns exec $ns1 ./pm_nl_ctl flush -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.1 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.2 id 254 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.3 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.4 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.5 id 253 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.6 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.7 -ip netns exec $ns1 ./pm_nl_ctl add 10.0.0.8 -check "ip netns exec $ns1 ./pm_nl_ctl dump" "id 1 flags 10.0.0.1 -id 2 flags 10.0.0.4 -id 3 flags 10.0.0.6 -id 4 flags 10.0.0.7 -id 5 flags 10.0.0.8 -id 253 flags 10.0.0.5 -id 254 flags 10.0.0.2 -id 255 flags 10.0.0.3" "wrap-around ids" +check "ip -n $ns1 mptcp endpoint show" "10.0.1.1 id 1=20 +10.0.1.3 id 3 signal backup=20 +10.0.1.4 id 4 signal=20 +10.0.1.5 id 5 signal=20 +10.0.1.6 id 6 signal=20 +10.0.1.7 id 7 signal=20 +10.0.1.8 id 8 signal " "id limit" + +ip -n $ns1 mptcp endpoint flush +check "ip -n $ns1 mptcp endpoint dump" "" "flush addrs" + +ip -n $ns1 mptcp limits set add_addr_accepted 9 subflows 1 >/dev/null 2>&1 +check "ip -n $ns1 mptcp limits show" "add_addr_accepted 0 subflows 2 " "rc= v addrs above hard limit" + +ip -n $ns1 mptcp limits set add_addr_accepted 1 subflows 9 >/dev/null 2>&1 +check "ip -n $ns1 mptcp limits show" "add_addr_accepted 0 subflows 2 " "su= bflows above hard limit" + +ip -n $ns1 mptcp limits set add_addr_accepted 8 subflows 8 +check "ip -n $ns1 mptcp limits show" "add_addr_accepted 8 subflows 8 " "se= t limits" + +ip -n $ns1 mptcp endpoint flush +ip -n $ns1 mptcp endpoint add 10.0.1.1 +ip -n $ns1 mptcp endpoint add 10.0.1.2 +ip -n $ns1 mptcp endpoint add 10.0.1.3 id 100 +ip -n $ns1 mptcp endpoint add 10.0.1.4 +ip -n $ns1 mptcp endpoint add 10.0.1.5 id 254 +ip -n $ns1 mptcp endpoint add 10.0.1.6 +ip -n $ns1 mptcp endpoint add 10.0.1.7 +ip -n $ns1 mptcp endpoint add 10.0.1.8 +check "ip -n $ns1 mptcp endpoint show" "10.0.1.1 id 1=20 +10.0.1.2 id 2=20 +10.0.1.7 id 3=20 +10.0.1.8 id 4=20 +10.0.1.3 id 100=20 +10.0.1.4 id 101=20 +10.0.1.5 id 254=20 +10.0.1.6 id 255 " "set ids" + +ip -n $ns1 mptcp endpoint flush +ip -n $ns1 mptcp endpoint add 10.0.0.1 +ip -n $ns1 mptcp endpoint add 10.0.0.2 id 254 +ip -n $ns1 mptcp endpoint add 10.0.0.3 +ip -n $ns1 mptcp endpoint add 10.0.0.4 +ip -n $ns1 mptcp endpoint add 10.0.0.5 id 253 +ip -n $ns1 mptcp endpoint add 10.0.0.6 +ip -n $ns1 mptcp endpoint add 10.0.0.7 +ip -n $ns1 mptcp endpoint add 10.0.0.8 +check "ip -n $ns1 mptcp endpoint show" "10.0.0.1 id 1=20 +10.0.0.4 id 2=20 +10.0.0.6 id 3=20 +10.0.0.7 id 4=20 +10.0.0.8 id 5=20 +10.0.0.5 id 253=20 +10.0.0.2 id 254=20 +10.0.0.3 id 255 " "wrap-around ids" =20 exit $ret --=20 2.31.1 From nobody Thu Apr 25 16:03:59 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp9882493jap; Tue, 4 Jan 2022 02:12:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzG/ywqtOu0teC564thZK8h4m6lqu70Pncjy74bq9Vr8rZFJ6AEdTHUnpkcNPzpjPxJqihf X-Received: by 2002:a17:90b:1c09:: with SMTP id oc9mr59322678pjb.59.1641291121756; Tue, 04 Jan 2022 02:12:01 -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 t2si39575040plg.418.2022.01.04.02.12.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jan 2022 02:12:01 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2888-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=lsApbXcl; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2888-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2888-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 26AD23E03A0 for ; Tue, 4 Jan 2022 10:12:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 27B852C9D; Tue, 4 Jan 2022 10:12:00 +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 AB05C2C9C for ; Tue, 4 Jan 2022 10:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641291117; 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=zTliQydwIJYMGhhc85buxfYo71yzoTSDYzDeeHXYdaE=; b=lsApbXcl5dI8ww2Ryk5FUH89Bf75vNNUbdXNGGI09NL10xIMjXQ7FiFqTeBVFqCUeKiCw1 67WvWSid7l4phNQg1jSRg6S4D5DcRvab4TnAg9ga+W0EEGd93nHOCQZGyDcQtfq6Cs8Pwn AcsYkBe03hK/u+ScHhVx90kFKy3VAjg= Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2053.outbound.protection.outlook.com [104.47.12.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-kNeS0hYZO5mdn56zde3FCQ-1; Tue, 04 Jan 2022 11:11:55 +0100 X-MC-Unique: kNeS0hYZO5mdn56zde3FCQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OLE/DJVR9iTWydQ5cNtyi9rWoId/Hqcy8KELwdd9F9uSE6UgOztNMBOAalTb4SOHLFOi4RRpbDoDeVlgdmWT2SytzDsB0KA8Fbsg663Z5BweZnf97io1rVRT7Q+QByVebWmAmzfTg+z+7GNIBp4bp1/GnoeaXLIVEOOeJtR9yH1xE5bE2kFQ6jQLqES5Sb/ZfOB/SWs1qslC5Op+omaFvqTkFrBCRwavqHW9ecRQVtepVm5sIcKYUvEJ6AeGHxyeHMnt2aYcMDSTWSHFvfVgnLJUCrGD2lcRE7o9rtVvIeUoEXtQZ3udG179pwO67dOqFcPjUAh4x7wnFJIwwAifgQ== 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=phYuzi6RE58qlRybUuzXEulnkwGBCwGqqFb5/9j8Zp0=; b=c+CmAPMeruElHVcCTiO/4Un+Q5fXTZeSGP5y1+N7U5M1fcmklAk9j9bN43GB2zUJ3ygjC5462Uo5i9NtP98z0kLDt7gZqUe57j6qf3JDXrqFR7WZOazb9on4lneVNYMYra67LE8oFPq1Q88ftlvGegOKNiXALgBvoslwynKiT7TCrxpwM1ZlwwGXmH/SGJMH9NRQ2uxK19sBnXIeZ2pt4Sru9R/C+kgNN1/fzQp1RzqYSf4MIRyTCDyA+FQgtoSd9ABxUiwPpq1peI+CC7gtsxp3heH+cREo57TzPU7NZORICmEUIo+YFt/UC0yo+K8g/bTIiM6u0zxJwzPi7qkIcg== 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 HE1PR04MB3162.eurprd04.prod.outlook.com (2603:10a6:7:20::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4844.15; Tue, 4 Jan 2022 10:11:55 +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.016; Tue, 4 Jan 2022 10:11:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 4/4] selftests: mptcp: use 'ip mptcp' in simult_flows.sh Date: Tue, 4 Jan 2022 18:11:19 +0800 Message-ID: <7010ef65ca65ccfe3a5b118fcc296515a8ade984.1641290905.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0211.apcprd02.prod.outlook.com (2603:1096:201:20::23) 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: 46271311-4ffb-4a7a-b873-08d9cf6aa273 X-MS-TrafficTypeDiagnostic: HE1PR04MB3162:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dEN22M35Tc2lYyacw/3tIEfndBjaasf4fN+fuX/6ryUp5arTl/DFlqD6rVyWt2N13Jsz/PDX4BJK4VQpfWCaxad1chFxJuM/FMAFwZjJTe69Nxy0tkWWQNKoip/vJDMPQ4DYTEUlmJkpjSe+kpvf2ZGrEvrK/MvCLFI+2b6l9hBn4JMIeyWCCEc8sfkhTSXV00vAdEOXZldmlBkA0j1wH/2P8JiAR5vJCQeFs+kz5TPpK4u2QtWjQD1jql/kkCfUNw37t1DSfotPRmJJeW/pMWfVCXwac1R8ZrBTRGqT+vybsQegEdh13i14L+pjrB6+I+ALtUZ70cIiHf6cr60wxSKS75gH85Bw9NZu3l9SHrpFfCq6Paeg6KKA0RATWhHLQVVNMr+79z3vji7tZHBisw19GGVqPxWugd4K54MOfXVfPFCia71MSeEukti8YCpVMSIz8HXkpIzC7L7Pws65f5nlT8vf/KmpSmUTCCe1yD4yQL+b1MddGGdNrJnlqM82PqYhX57dqBR/oL86CKYRPrWdpo7xGfWqxMjYo/stDJS7RHY10QQwM0i9/IrcL+VOkB9dW8UQqi1easH50J3OC+N+C98JEjZqKb6OQPYXJCCrGkAfW3Dc+bu5vRnB2v0EYZ5YjKXFIKejJ4w8szz17w== 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)(6916009)(66476007)(44832011)(508600001)(26005)(83380400001)(316002)(4326008)(66946007)(107886003)(66556008)(2906002)(6512007)(36756003)(55236004)(2616005)(6486002)(6506007)(8936002)(86362001)(8676002)(6666004)(186003)(38100700002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XouPcXTl+V5UT5dwxYh81ubRohLL94XlLusfnffQtqwZNqXrO5l00/4EOgHC?= =?us-ascii?Q?QjyItkxemE8fkF8zF9heFAv/fduVJKUpXUhbveZRXY+WIuH6j7iESBgkTtG2?= =?us-ascii?Q?Z82K3eUT6L5HSbu/a90SUBZGTBG6BHPKCnUXZKTnpPTCF+tVeqbRfRy6qqqH?= =?us-ascii?Q?W3IqP9EOwsW1y/9qeS7wHiaFFL7Xc1CZoCkWiOrrZnCLkeDvF+aa2LzmMaYM?= =?us-ascii?Q?L1KlKEHHjvU/yFkoFQ409+FWL4JM36B3KKcPY71Rj4QgvsVv3U60e6K00xlO?= =?us-ascii?Q?rQNjrPQJ7d7DQK0s04xj9W3r0gqA9AXYZVp4dOpgfz8KTQqRs2gUpMHV7m9P?= =?us-ascii?Q?q+dbsz8oZTphFRjvSqps3pCPoy78CQGkFf0d4XYPKiq362V6/zZStV8xA4JN?= =?us-ascii?Q?1+wic0pRoYoaOIHL7BjlZwRJtJO9ncoP62XEX2WXwg010aE3GtIYxd2Sh62y?= =?us-ascii?Q?4JVzo22/rbiSjLh7SZ/aeu+WAEL+i7+I/jT92w9/FGysikWxos/R8vPP77up?= =?us-ascii?Q?HfOPube5iJPjZaqth/NFa9vO1T55hU7pJz1NHLsg1Xyy/BCrDSBwYHn1Hn9w?= =?us-ascii?Q?xv2gOuMhFzqq35mziwcN3ljouxN+KnF3BaK6E2b5yDlgxjdlB/W/bMTz8+iP?= =?us-ascii?Q?URtGCufj2y/YBHHqGCZOzRMkqEt/KdILWslmJdn1FPAxnuWqQRiJQ/Z8Jn26?= =?us-ascii?Q?a6gf7nwofQRN4zLaP2bKRoyESxcC0u8yyBl4jjNgkfkIBGYp4Sfj9/kCOlv2?= =?us-ascii?Q?l4rlNhiqxS4B1ZOb89vzMXfyPVOpGH3qbOZSrekk1yWPi4ixmYArbVO70w4T?= =?us-ascii?Q?qfgBPDBeoV9x2g7VLTJVZYus2tkPv6gz3LR8N5H43iw+K8ubr7N9jB3tt2Uj?= =?us-ascii?Q?8dfkrv9R5ziHg4D96L3Q9JT9sq/UQwYAS8eYKRPVnf0aF62WCdSgRpMa2RYs?= =?us-ascii?Q?A2MLaGTCqBmbAgO5mpDHFpird8E26KlsKBW98A453ehqpkYhUsssQ4rEdLzm?= =?us-ascii?Q?G5211bvewwbd20esSnOC8cyQnChd/xVKUjrNIv55Qo4aEMO2h+yHUoQtqWFD?= =?us-ascii?Q?0dnpQ9WOxLLnKkw94sEvJNbpR7cHV2L6tLr3bnpK5QoG4DWJHNtfJPhZrH53?= =?us-ascii?Q?IhlWJKxIitYAkJ0aKFFwqvdRJnolx5yHgATA2jSLsD/HNAgTkXn+t8mE+Y1m?= =?us-ascii?Q?6aKQYEz2vrvoVZ3ztVf5O+YKrWkI0B+Ov/52Y20ZkNuaOyUqkgU7spwry8T5?= =?us-ascii?Q?DeVv9RNi+yUW0BHMt0TtxEZvjjidbF5LN68gR2gMQlarZ8iiNioNKe4+y0+n?= =?us-ascii?Q?sRxfVizSIDeZU/OR3EUSfBrpnwymXDz0R2CpdJ/5A1bmJt/WHsv30F1vHKvh?= =?us-ascii?Q?zsW1EkfdbuzPz6b9J1c1THB400j30D20d6nKyzbIxm6C4FHwQzhNXa8L79rt?= =?us-ascii?Q?izyOR2dwPV3ZoYCurlN1d70JQjtn9nqaI1o+sllBzlsMChZAbf6NeuYLwVHJ?= =?us-ascii?Q?JonJ3ju3RoLi/uYivfKbIzPL+ds2D68772CiLbtVQQIYhb/x2Edggo1Y6WKi?= =?us-ascii?Q?ozu2r8CFtnFd2PHOQ3BDu5yj7KWjzF4/EXzbBuVcMTbnDlaOnt3yoluqQuQD?= =?us-ascii?Q?4AuRwf6D9Tb1bUfkNy838Yw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 46271311-4ffb-4a7a-b873-08d9cf6aa273 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2022 10:11:54.9080 (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: DO/sX8QyZKSPyzz2MFIDKkq9oUyZbogRwPBZueizNRgVPquaF4kOT6vYdnncu0TDoTYQd1WZMClcGdbZOhI/kA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR04MB3162 Content-Type: text/plain; charset="utf-8" This patch replaced all the pm_nl_ctl commands in the simult_flows.sh script with the 'ip mptcp' commands. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/simult_flows.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index f441ff7904fc..af2eb5b3da66 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -80,8 +80,8 @@ setup() ip -net "$ns1" route add default via 10.0.2.2 metric 101 ip -net "$ns1" route add default via dead:beef:2::2 metric 101 =20 - ip netns exec "$ns1" ./pm_nl_ctl limits 1 1 - ip netns exec "$ns1" ./pm_nl_ctl add 10.0.2.1 dev ns1eth2 flags subflow + ip -net "$ns1" mptcp limits set add_addr_accepted 1 subflows 1 + ip -net "$ns1" mptcp endpoint add 10.0.2.1 dev ns1eth2 subflow =20 ip -net "$ns2" addr add 10.0.1.2/24 dev ns2eth1 ip -net "$ns2" addr add dead:beef:1::2/64 dev ns2eth1 nodad @@ -103,7 +103,7 @@ setup() ip -net "$ns3" route add default via 10.0.3.2 ip -net "$ns3" route add default via dead:beef:3::2 =20 - ip netns exec "$ns3" ./pm_nl_ctl limits 1 1 + ip -net "$ns3" mptcp limits set add_addr_accepted 1 subflows 1 } =20 # $1: ns, $2: port --=20 2.31.1