From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829435jah; Sun, 16 Jan 2022 00:18:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJylDu5dGsbgqJ76BjVpeTJXNSetie8wxjLoU61a57408Rzo6FcV/eikIoyRqqduAChzcWcT X-Received: by 2002:a63:d6:: with SMTP id 205mr14513886pga.516.1642321089592; Sun, 16 Jan 2022 00:18:09 -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 m2si13164911pgu.849.2022.01.16.00.18.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:09 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3175-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=bINIXUvo; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3175-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3175-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 A85203E0F75 for ; Sun, 16 Jan 2022 08:18:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CDB332CA1; Sun, 16 Jan 2022 08:18:06 +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 A7DE02CA0 for ; Sun, 16 Jan 2022 08:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321083; 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=9xzRZ5Ju775pwgMtrQsKSXPn80z2XMlI8UMv0Y0OzJk=; b=bINIXUvokYQ6W3qPgC/UBpOZj1De6mlHg+SnJvcnjg37IsKuGdfPJ+HI+1sZAX8JHiwZkD QjpK24y0ESqJmiyvbenm04B0RORJPxeXytWnnEv8LO1Ul3QyQtZS5aYb0FK4qO9PyZjSv+ 0Ma+DEEc9AxkYur6fgOuTntyXdFsiBo= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2058.outbound.protection.outlook.com [104.47.14.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-yK3QEqFBMPGLmZrtojvjew-1; Sun, 16 Jan 2022 09:18:02 +0100 X-MC-Unique: yK3QEqFBMPGLmZrtojvjew-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=frGRff+p3oJuQ+WkuggTaAGk2xdels4RLJPjVljshuKQFwGU6/gZuOEisnZeH1F0PtwMrdkZgmVRTKvrzBR/S7R6uMXCI0EhkK209tPi7JwpusipiSOf6/WTbugub/G4Xv9R+8goso85KbaMQB86wcY0YHzaBzJFCgOs1CUvyJem1lkLrzf13d7jMxpq1r1qHFsW3WBINomfvpsuWlEpG6Lpk5npVAecXSplOKILDQf+vgGfKd3idyL6a600b1UX+WoyjlKQZPP2bDIo1Ad1gtJWDwCztJRNXmylJBYgGZHscvEA3hEAX/MzHmtE8v1pDb0yCynBHLviEgMaURp+CQ== 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=m0YsZQnzkYI5YgpY2tTKc1guMc6z3BIvtD0mFgYXKCE=; b=iWbY7OVhJ9q2tEPmqWs/WjNjorEFzx88/dmT9s8UQZC0aX/c42UajdB4YivmMXYMnvMcDChPgun9j40tnCdh1zNrEgLeAxtLaIodwWqAhE+dDtkf4+0+4HTM+z277lZ4Tk6//VGlddsn7kOOVvQzC1t4Wqi8hDIiQh04u0KqTZTClwwv45z/OiGV8Nv4OHpFzwtlVh/qvZXrTRWuASnGUuf/wx7cfD2p61WCTtD1MN7CeXIAoK64yCI7P2tOdM1Wzd74Jqk9uUPp2/K4DbYJYQoyHiwVZEJQ9P2cgdkFUUdEwshuEES9undDjtZnHIMbCeSfL4REP4T7XIby3jvxVA== 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 VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 08:18:01 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 01/10] mptcp: set fullmesh flag in pm_netlink Date: Sun, 16 Jan 2022 16:17:31 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0009.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::19) 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: 611cd918-ff73-4533-6e9f-08d9d8c8b660 X-MS-TrafficTypeDiagnostic: VE1PR04MB7472:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:392; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /AmG5aROj0/LxAJvYIZ2IGwR3P4CVhQrUaragai0s4GHU0cpKFc9yyksFV89cEGrtQ0ab2BPayIq90OUZBDjGsPZK8rmhcEeYgNns5+OujBH3qggYNGen5ooVz5OGPm7QT8R7UUW2pADvM7ubA0WqOWBJux32hF7ZZ94TiD0t28WDBg8JiRi8fhGCi64ZZpCMKdMICwBbtKm3487haglXeHqvejC/c/2ZuBYfwBjGIt5NfuldZfsdL4J8gBDh5w+4VK35qNFLVu0NF1NKmUnuR5uemRvGzJE73T1wkhGrtW1R5MydTXjG4/AU6NBsYu+4OpvvebtxJZszoxurJ5+8gvDjlvH7VvdiO8zNTRD/w+GJU6FT5fLUkxeOd28iAKLKXI4NclX+ecRt+fecor18kakDJF7MiQe6bAGIwTyhsFB/lL1hqt9ZYzC5q43HrjphVgJUZi51LUoF9zo/jawfDXCQXK6N7dpS0Rk5K54WQY3YAWGIDSKp6RmuI4FFjaH8BcqCMex1p7D8g9dmxIpO/mjB6JjVt+TnW1ACShC/ZYFtxK10JorbuapnpzsdGUGjRQdOXov2EcSzobKyZbTxJmKqYd6rQ4T/HWgMdU3gsXphIPGJ9+ksDLtefId2ZRv4SlGrYW0SWzr0BYczMq9K5a49o8xd4BM5XxPXCTohBZ05z6Tv4EAjQ50Bc/izMoS 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)(5660300002)(107886003)(6666004)(38100700002)(2616005)(44832011)(6512007)(316002)(186003)(508600001)(66946007)(6916009)(66476007)(4326008)(6486002)(36756003)(83380400001)(8936002)(2906002)(86362001)(26005)(6506007)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?8/Z8EAzNsejYBX4tYxYSfNrR1QHflY/6/f2LgZxHdSOeuDYNSFxni6NP2Lb8?= =?us-ascii?Q?OcjwWDFr/2B3mKkaBZt6cU/6g6y/Ce6Su6jty9sM8slTfCDMPQEHm2R+B8OK?= =?us-ascii?Q?Dgfp283kXm4uz9+ZpsEAKJFWqa8rYgKFTfgJcKeRKQe2Aal3pbW4YwhjUYs1?= =?us-ascii?Q?S95xrrkkx3cZauH4qxvEPnYCLg40IaTv7kltTmX8hdu+koEhyIKffv+3Hz4Y?= =?us-ascii?Q?iLwMagFguoc5CYvUsb/ETgFaD5uiVW+6wx2mv0spiug703h2jHgNxA4RDopH?= =?us-ascii?Q?AeRYyaJ2JYzJpGZh/fbPy0ZE5YLuHU8+EvOgkIxHNZXCkjrypnN/zeN61HwY?= =?us-ascii?Q?o1nq1ARrPoM8lDqPm07TFu0lNsbttaS9FCfnIyp0idQFT5eDO+25//46zNzG?= =?us-ascii?Q?sWNb+33CpbfvmNCBJrZSA0mHdQ3QcNMsH5RtSuFqjzQ7NlQwb9zr1wKos5fC?= =?us-ascii?Q?re4mi6skw5IIg1egR0JAiSxLHyxLYjfUoLP3NhnPF9/gRYlhwsXoZYcaDiJF?= =?us-ascii?Q?xJYbyMQ2tlFob4/p0OGfNy+XplCh28cJ1C7bzN+Mu59XUQBqCl8O034qZHzv?= =?us-ascii?Q?tJ6mi1OQwZ/b1Y5KpidURi+uXArtOBAejyBcCerNxdbFzOjd6g9L1nYo9txo?= =?us-ascii?Q?gxrfBW8Toh9zcKsRFjj1qfePoqZ0EModKvuPc3IrRTdPJ1L97STigiZKG1Ik?= =?us-ascii?Q?zNaL/64zSdtm2X4SXyfGZ8rJzmicrNA0ZvH/oDD7LSfQu7J1wCCHBP+xK7/1?= =?us-ascii?Q?y3DmDZq5CRjwaLNAnRZHjT1rItQ8ji1AFoPUV22V5CKhmxB5w3zGqe6371Bs?= =?us-ascii?Q?c44SKNHp8fvxLnVZ0RKMfphZBgTROqJGE7d40kr9T0puFVAzhBCmkahC2APv?= =?us-ascii?Q?NoP2F3qsl4/MyQdSkYEO/pgh7KrERiHQsagBdxI9Ex6dH0cW5F83eUycUgeO?= =?us-ascii?Q?l8/lTl5/GfolkyatHxoqPKd/qdcucMrH3oa0BmUYLd+7R2B6hhfgsESrCKpx?= =?us-ascii?Q?mCHwZfapSmE9ZAC08Hs1Io6/4vmC8HEP9bzHDfEBBC55AQlAxjciHuwsQS0+?= =?us-ascii?Q?WNzIkxFwI3hlUWD/XxaAvhAxslbXzH5ds2qt89yy+AD12CJ9TmOI4wfod6w/?= =?us-ascii?Q?py0m7UQqcrvaU3lRLk6W0Sj3T02Bpycz1InrD9ZNXW+KbCpOk/2MpB3CsvEc?= =?us-ascii?Q?aoK8DsrdMDec5DjqMS0SGgIYBpyEoQ3wuhVv94RPs0knwZWy0LecRkFOPv89?= =?us-ascii?Q?OhrkUQKHNXrEWaR4VZg3EVZoYsgChK0cqyT668g7tJtIrr5wIjkojCeggfJC?= =?us-ascii?Q?FhUqHBvuT13B+9c2F4cQjHs5nSIaY72fnfF4L8SgVhSVaf+AhBRl1pi7B6fy?= =?us-ascii?Q?kyhr6sCpA0B11Cu8uPHHohlySdnvv6Wm0c3Sn5jUr/4YJ7JDTQf1tTCo1wH1?= =?us-ascii?Q?vSCADDXBX1mzUda0T9LDwPbgXSpHZ2EMb2F9w4kDbQl366/2rfBsxd1A/ftu?= =?us-ascii?Q?Th932uaSsT4IFWL3c+BhcO1hODTP/4PpZefJFWEmZLin+h5ydn3lwbnThB0k?= =?us-ascii?Q?/wEOs/g4s4DpcbLMW/RP5kpWkoOL7lWc2EVy8e9ClzJTTVQ/Go9rErNeVDiT?= =?us-ascii?Q?h2LQBmOvCuhUSPmCYyts/Tk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 611cd918-ff73-4533-6e9f-08d9d8c8b660 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:01.7280 (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: U3n4XjEfZpOLIKBSNkzncavMugM+zn3Da6UQxk+A79V9ybOyQGadi82ISrrVNQJc+xq3yBraCYZ9jnlnM0A1dQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh flag setting support in pm_netlink. If the fullmesh flag of the address is changed, remove all the related subflows, update the fullmesh flag and create subflows again. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/pm_netlink.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 4c06cd6381ef..51df0b478ef0 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1722,9 +1722,20 @@ mptcp_nl_cmd_get_limits(struct sk_buff *skb, struct = genl_info *info) return -EMSGSIZE; } =20 -static int mptcp_nl_addr_backup(struct net *net, - struct mptcp_addr_info *addr, - u8 bkup) +static void mptcp_pm_nl_fullmesh(struct mptcp_sock *msk, + struct mptcp_addr_info *addr) +{ + struct mptcp_rm_list list =3D { .nr =3D 0 }; + + list.ids[list.nr++] =3D addr->id; + + mptcp_pm_nl_rm_subflow_received(msk, &list); + mptcp_pm_create_subflow_or_signal_addr(msk); +} + +static int mptcp_nl_set_flags(struct net *net, + struct mptcp_addr_info *addr, + u8 bkup, u8 changed) { long s_slot =3D 0, s_num =3D 0; struct mptcp_sock *msk; @@ -1738,7 +1749,10 @@ static int mptcp_nl_addr_backup(struct net *net, =20 lock_sock(sk); spin_lock_bh(&msk->pm.lock); - ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup); + if (changed & MPTCP_PM_ADDR_FLAG_BACKUP) + ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup); + if (changed & MPTCP_PM_ADDR_FLAG_FULLMESH) + mptcp_pm_nl_fullmesh(msk, addr); spin_unlock_bh(&msk->pm.lock); release_sock(sk); =20 @@ -1755,6 +1769,8 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb= , struct genl_info *info) struct mptcp_pm_addr_entry addr =3D { .addr =3D { .family =3D AF_UNSPEC }= , }, *entry; struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); + u8 changed, mask =3D MPTCP_PM_ADDR_FLAG_BACKUP | + MPTCP_PM_ADDR_FLAG_FULLMESH; struct net *net =3D sock_net(skb->sk); u8 bkup =3D 0, lookup_by_id =3D 0; int ret; @@ -1777,15 +1793,18 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) spin_unlock_bh(&pernet->lock); return -EINVAL; } + if ((addr.flags & MPTCP_PM_ADDR_FLAG_FULLMESH) && + (entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) { + spin_unlock_bh(&pernet->lock); + return -EINVAL; + } =20 - if (bkup) - entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; - else - entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + changed =3D (addr.flags ^ entry->flags) & mask; + entry->flags =3D (entry->flags & ~mask) | (addr.flags & mask); addr =3D *entry; spin_unlock_bh(&pernet->lock); =20 - mptcp_nl_addr_backup(net, &addr.addr, bkup); + mptcp_nl_set_flags(net, &addr.addr, bkup, changed); return 0; } =20 --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829498jah; Sun, 16 Jan 2022 00:18:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJxRn2vkze5cdfAlOQ1LLuXjpjn3nGAq5QAuOE3X5puI5WtQVLAAoytBagTdyjbGDQDWlX9V X-Received: by 2002:a17:902:e3d5:b0:14a:37bd:5ca3 with SMTP id r21-20020a170902e3d500b0014a37bd5ca3mr16679724ple.65.1642321096872; Sun, 16 Jan 2022 00:18:16 -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 p6si5182698plf.208.2022.01.16.00.18.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:16 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3176-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=GG+KBysa; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3176-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3176-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 33BC73E0F75 for ; Sun, 16 Jan 2022 08:18:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59D062CA1; Sun, 16 Jan 2022 08:18:15 +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 47C152CA0 for ; Sun, 16 Jan 2022 08:18:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321092; 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=MjhzF5PoEJuwwWAa22cnMbzTBhyfzDBP4zMPxwH47Yc=; b=GG+KBysasxeqyYEsICijGbkSyemsXW6N3yLSkczArfhlu0q5wXHVjjWbZLE3AFE0g8nqMS tQqZxeqqUCGpR0NGVLjtUuK82gY2mXGdqigeYru21t33A6FRZe55sg79OZgaZthQJP6J8R hpy3bf0OoT4e1yRpbO/Mqb07rjJzE7Q= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2055.outbound.protection.outlook.com [104.47.14.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-3PRIekFmPDKRDSl-JmDNDA-1; Sun, 16 Jan 2022 09:18:11 +0100 X-MC-Unique: 3PRIekFmPDKRDSl-JmDNDA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cg5hmTuhl/1wkrMwRIJP0D3SjLYrEoROK07uEhcj49uNRdDHuY4csjJUDOTvB6apu3rXOYXmpyofinNuf1imSfwS0JV4K2QNmLqf0mJAo9qMbw6LWxXgaRyIqp2k6ZfNfIdabdaaerLRAjw5jqDRfLE/+CfoSimrL4p+FXDfd13gxBSu2FkUD1sKk6ajf66n1B8k/UgWE1n/zBywrOja6sk5/enZHHAuJIM/Q3guuLHSm7Neex614kneb7hBSuwwHEA4rtCEh/EnTZKj9myjSeUhWcDekN6fCgSO78HVjrVI4/5Tf4sG2ZZK1Nibm+Xrk/QtS/Hb2sNUXcOno4r/NA== 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=07GI3ftnUr37Z1HJrB3SsxT0T9Jz3pwnTguJIgU49KY=; b=aCzHbUos72wQq4kL7Cgj7HfgSPZdf4UiDlVAfCW4KhGtHQy/iWznN/ZtmP8WZVowXOxYXKXVWU70cU7yiAfFSogu13e+RCXk+eODvQ7vU4SCSfzbVbTmluxhqUoYP7A5AXP0gAEOuyUVsVunrHErmlHiuB8JexZolRFMtqTsek9LcHUZ1A3hGKoW1CAbhl+2F+SehUNvJ5JTXm7QI99YubIYyNA4inH1oJNBcJ6U+/LPd28ymOUPVsnk294NUa0VYdAucLh8SBM980qEd68om/3ahJ5U4JMaMQZZ/i0mSh9xsnFi+hrEQoWhijg3wbRCH/CguExpCUMQXTeB+481xQ== 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 VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 08:18:10 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 02/10] selftests: mptcp: set fullmesh flag in pm_nl_ctl Date: Sun, 16 Jan 2022 16:17:32 +0800 Message-ID: <75d2a81e0a35aaae416da2c2b3bca971598c7544.1642320655.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0001.apcprd04.prod.outlook.com (2603:1096:202:2::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0f830ca-77c1-4334-73db-08d9d8c8bbd5 X-MS-TrafficTypeDiagnostic: VE1PR04MB7472: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: 1m8uq9j9h/BpUnmWnqBnRNuZOV1xc+vx34kNwPdNwTwvZsAMewN7mRlVYeOOjS2lBqqZnXjWnqm6DfaUW680eKpQgM/kG+UWVonUhoxkfAMfY9EBpRwY9oCdlAzE82u1tYm9KL5q6X4GlTkP0LFyQ/k6KWJYwubJtsMLzY0A5dJ8I++qVXWyidQXB4blT6CtEkwP4SpYDjfeouEkaD5eWNnqnBgVkhVH8MH28ZKNqkMILHZzQGTBIZKLJ7qM+3jua90+UU6XZzwY0NAbJdqISK1ARL/6eo8XfjjolfFrcEIcvRET9SS5WjYFszF+VGJfMiLa9Lx/M5ptr4XzjlfKuwrSFUG3tCpwUQp+9c7uaKfLwUhZou3jywrEeNNaVA0KU0X8RG6ZtyqRmCVNnpSzekrOTMvt3Za4VZYQx+sQXFVzO7w1Y9GGuX9drw1EO/7GoTi0Yd4p084hCdnD6CxCVvgRBVVskNostpX7O9jdCO/JkdIuo4w8r7VmTaFmhmPO4d6ksqbLZASQJYefkDCR9/41TI69eAz6hkMOZ1E1l2+HJbUSSK75FBsgP0jHKGnjlNIeCqHRrspuunEYcHufCDkQYWn/2/ieqOtOP9MTfED5FN/DsE5APg4p8EyO39dNQeqjCPt96+T3WWcJjKx0jYAauWwsIQL+BuUYZJkKRaSttyWgbqwLWRMRk9AIDil3 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)(5660300002)(107886003)(6666004)(38100700002)(2616005)(44832011)(6512007)(316002)(186003)(508600001)(66946007)(6916009)(66476007)(4326008)(6486002)(36756003)(83380400001)(8936002)(2906002)(86362001)(26005)(6506007)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fleWnur6KvAKvh9fEoCZQkhrhNtaL4cxcsv3EvrnNnRZDFqekBeUAIpB2Hpc?= =?us-ascii?Q?ngv79p5iUii5YEjWiLKLDNXZX3EuRcd2aPua03ot3dPb9n7a/xgNA893Brnu?= =?us-ascii?Q?fdFXJ8dW8MHg2n4leaIjbgTMpQfUqVgloAQZDd7l4quhxtj4fezx+ZQQejP/?= =?us-ascii?Q?jkyk1bw7mpGNLvb4TzPwQvg0F2ZYDO+podY7rFNOFNU9AQ1Q20UV+STWVlLP?= =?us-ascii?Q?7IUBMGpiQU38dB9uRaly1FxmdV+cZLshvDqpZgOJ6KpkTBT5aysMwdG+XR6W?= =?us-ascii?Q?DDFj84eglgrF6dwMINixTjUzfnBguBD3F0O4PzOUv7KAaFmA84SYI4Pr+NX+?= =?us-ascii?Q?t6NWW9TUofI3MhJDAUOSCnwDBZb+0n0ePHifVs21r2vSagjbsZLK8hfYLD1k?= =?us-ascii?Q?++0eMYy++ceANUc5Uot8kNTRPJeOw7qXksp46GZFZ0b2GWG0munc27ugmRlB?= =?us-ascii?Q?LvWMRBtUzF5yZ2WZOOUcUaD/acfPiRoA3XHqjoYn2EJrA3F2fWgJf5l9CSBH?= =?us-ascii?Q?no1hHNLmLJbjLL3N4JDrSgOwu+nlC6bVAb/h4qI+ZgmkR1uVVaAhvtZjHZY4?= =?us-ascii?Q?J1QaabFLsiINW5rEf0MFfq3sr0SXLwSqL8gG+wp44F2uOD3vs1cExK63/OYx?= =?us-ascii?Q?HgKadtmBGb6QQzJcm0dsHuYs0EFHFODVS35CBxaVvQTUglZ6LaGA0PaATgGs?= =?us-ascii?Q?lDU7hLEEBul2pK8InrwtoxYsWPflpBuVsILemLYA/gWJZW4UcCENQmsQghbd?= =?us-ascii?Q?FE2N+35V13wclXU9ePqh+jWxhHnGSJyzHADjGupJt9S+u4qcUq6Y+stghPjc?= =?us-ascii?Q?BFqY6EE3FL5vzLUhTSZKAPhki6AyKEctoNqKACwPQjsgb3ZmElmZs40kXG2U?= =?us-ascii?Q?LvbyUg9HscWCzjdftz69AvmtnheN5KTORpYhm5BnYsZMF7RbOUOxcVlw1e2O?= =?us-ascii?Q?PV718uSPsBmtCTMlImCtlNFwyNaPaTYvzc3lhJ7JpfXqKvhtUYkmUXYNx6F0?= =?us-ascii?Q?omjGPHJ4x0EYc5/rL/Cy51bZ+sTPvEZiNFkLyWSPIUQAL1eFjMgZ6XvFwiPt?= =?us-ascii?Q?OZieTIR+0QsiWROXK5EcKBtXo2KRR+8SmDI5BOVVZX3nTTsMxhI/PLloa4lg?= =?us-ascii?Q?z20Xk6wnZKOUW2oh1Zupf1vIKpUmxGqsEo5GhLita78bjJkjS/uBPPLijN5/?= =?us-ascii?Q?XorMFZ9ONeDlK5cfDipr7MhGc6LUFfyyqKukdgNEaW8DVsVB+OubzWlpgQ98?= =?us-ascii?Q?uRa/wmY8jQ7tJCnPUhYe44qKZFbo1mdF7GQGRYgMWcNntqcEM9sXhaO86OyV?= =?us-ascii?Q?V+pkJu5tnlcFCAy6Mj0nSDPqU1u5/qgdeTGpqBHqDMOo5u2FVSSkU1KwoXQa?= =?us-ascii?Q?CUce/QWYUUGZ1MceqoiEyKg+R+fEWk+y8o8PfWP1tz5/RrJgbAFkNNVNFCxn?= =?us-ascii?Q?BUhJO9YoeB0G/tP+hxoqsunVS/LtE4tQhVZPq26xBQw+x+zfGD1ez+iQcwmX?= =?us-ascii?Q?HglfnIQy/W8i3WlTGkbKDXvM4t8j88gN7wXSOtFPl4Ywk6K561KdLKtGBz5K?= =?us-ascii?Q?tHnZJTOv9UkQ18o4KxfdonlWVmscS63mOvYmt0MLsQDrWPXFxSIBW/ff6d3i?= =?us-ascii?Q?20izo2fS7BD3mwDB2unSaIE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e0f830ca-77c1-4334-73db-08d9d8c8bbd5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:10.6804 (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: oaB/B3hB8JNgcAcwI2cbmWtzb5SvCgveRK3auJnsdmwTTpAWllZyWKLbRSL0CpVu2+NFVu7Anr1s7a3SyFrJlg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh flag setting and clearing support in pm_nl_ctl: # pm_nl_ctl set ip flags fullmesh # pm_nl_ctl set ip flags nofullmesh Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 354784512748..9b6db9d77223 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -28,7 +28,7 @@ static void syntax(char *argv[]) fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); - fprintf(stderr, "\tset [flags backup|nobackup]\n"); + fprintf(stderr, "\tset [flags backup|nobackup|fullmesh|nofullmesh]\n= "); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -709,7 +709,10 @@ int set_flags(int fd, int pm_family, int argc, char *a= rgv[]) str =3D NULL) { if (!strcmp(tok, "backup")) flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; - else if (strcmp(tok, "nobackup")) + else if (!strcmp(tok, "fullmesh")) + flags |=3D MPTCP_PM_ADDR_FLAG_FULLMESH; + else if (strcmp(tok, "nobackup") && + strcmp(tok, "nofullmesh")) error(1, errno, "unknown flag %s", argv[arg]); } --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829554jah; Sun, 16 Jan 2022 00:18:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJzIaRdzv1zuV4UokVF6rVRlLaF7KVV2oCt2VNnSdTPdj155WbCDak+6nfAsxZwIB1uLAHeg X-Received: by 2002:a62:2f86:0:b0:4bc:fe4d:4831 with SMTP id v128-20020a622f86000000b004bcfe4d4831mr16090900pfv.23.1642321103526; Sun, 16 Jan 2022 00:18:23 -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 mz7si289777pjb.119.2022.01.16.00.18.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:23 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3177-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=ZHOPr+gx; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3177-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3177-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 B0A903E0FDC for ; Sun, 16 Jan 2022 08:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 069762CA1; Sun, 16 Jan 2022 08:18:22 +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 CAE1A2CA0 for ; Sun, 16 Jan 2022 08:18:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321099; 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=hdrGhP5lKliTUPx/gW+lwCi554ynq0Rb0/Lw8p+k9OQ=; b=ZHOPr+gxBN7PuiginqutHIcb8BIw9GiYx7ehlz4i7RO8hLMJ+Nnu5CU0aNOA1nsyfrBrcF E10RFgX4RuF8TNiGDa4ZD863d8n+W9Cx5ocSXhUydfVx2+X+LvXgQBVKrC/3aFwIX+pcdc xWuMedsRVP86dxF5sgX+vXcwWCQU1aQ= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2056.outbound.protection.outlook.com [104.47.14.56]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-2-WkjK9UVvNoeD-siyDM-z8Q-1; Sun, 16 Jan 2022 09:18:18 +0100 X-MC-Unique: WkjK9UVvNoeD-siyDM-z8Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NMe9HxkNqGAQP9TZXAeWiAUGAYZTNjQeVk1DYGVXNOgggTFGV0o1X7wVh8lGEjG/G9EWYzxR55NNx5wqxLKbEgnL/xw+cb1tW+0JDnqD3IQ7zG8tKFaAr17RJwv2mcMA1L3Gfg+EKD3C4uAzaZB9nhjc9Lj1IqYafbq04ftjeOpyZ+/4MmGoQEL9Ct33NIc7lt6AJui8XTcXV2iRpzS1M8jaR4ijFtN+vRHJO8x5jCy9IL2YfIV2O7YcXnBbKGfg9YMwYbDkH/f/7ch5fyOa3rRBJLfuM+kzjmAIlAceGPwdDV8TqXTkXvh4ZzYh8KHQSZ+pfRGCloKrdsDfNCa7rw== 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=EEu0FpTBQ0hcjXtCedDQEoBIsY7yFQVpgEI2JMg389U=; b=RwkErHTb8YKGDNzfiIKsyPZgTuN8fewvZghlckUakjwvymLClc2ogEgmkjkmYTcCTL6eNYcKBIrjW8wH58nRGCGAEuiT4RYDYqaQzjk0rHR/9uWao0a/+yNTwp9N6AJHxQmf/xPkBj0FGJBFUNZetjsq2MB4TvHgn4uyCm+rH2wI6dgSHTs/lQOjlDDhKvZZVYJp5NfvyH2tXecJbUKvAXmFmJlvZ0cwDcnQav953C18O3KBAcsnfjAi5iRISc2iYw2wOCwj7Q7goKUBZpA2mpGxoNOezyZFBNIG/RYguFy+1B08gpA+TIU+hsATJwp6QM1SW1E2vD4PKLsJCZVjiQ== 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 VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 08:18:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 03/10] selftests: mptcp: add fullmesh setting tests Date: Sun, 16 Jan 2022 16:17:33 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR0401CA0002.apcprd04.prod.outlook.com (2603:1096:202:2::12) 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: e7154068-59ba-4667-33d7-08d9d8c8bf96 X-MS-TrafficTypeDiagnostic: VE1PR04MB7472:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6ECCAdXjtnJ2XyFIeVJoq3TLv+CluMlc7s8c0VpG5IiZ0gn6vNQ+tMneiTK/XE7lqE2kIec/nj6yjgo5HEduLKI6QuKzXLsA7ion9VxYd6FtKwLodo5N17QgyNHib0vubm6gWGIi1vsUlZBsUfgVRDtguaomdOVGQ50/kQQFiDjfU9iHA6epE2Xr4o1Egps3IFot+cCg1mr4ooIQPef5YO0NGH2yq67/mvnku8lQVWbAorGA518D0ztN/ZnmeFHcb+t3tuV2QwdO6Ti3T4RKr811nSSNNjm+1CAhRTgytEumqTQ1kgv6ikJaAP2Jd62+p3cXK/7vIMVcpZSOFP3pLbCDcLzrI4xbF04f5m/Ql/F3SjYYKHM1f3860/iZ4tNw3Sql6gYnXa9KyPcjgiQu1F7EKkl5MWnqFodG2QqWSTS+ZfAxlJnan5eLPU8rFSfyzYzLD8lcLxfVhioHPl3pWtImwjVbeIpGW9l4BmdiQW9G6VoTgnkxtQdFTwAiZ1m0xJ6nU35aQWRlHvpZt80sb9+Z44ZScJWJQ6Mf0jepgPKX5N8ML/lwH0uZePsfJFJ/x6q4wBZm5FkG+MYhPnJIsGZ7l0kcsxtTS/zcU5BNaO2VRd95j1t4Zvpw+tPQZRBUiBE02k+rNVtWeP1pP+RsTeStoB604KmWuxNsgzjLvZmMgZVuwQ/TbjsRDsqDT8FC 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)(5660300002)(107886003)(6666004)(38100700002)(2616005)(44832011)(6512007)(316002)(186003)(508600001)(66946007)(6916009)(66476007)(4326008)(6486002)(36756003)(83380400001)(8936002)(2906002)(86362001)(26005)(6506007)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Qv2OLjmujso3MCKD3Oq3NCCiLt3rf5uC9tQJm21Wsj/CFXsy0vHueEk4FH9k?= =?us-ascii?Q?aZrq0qYufaMQ+BpuS6B7KJlUcwQPLW5GLAtPPEzN/67SxiBcEznnfC5H1ujH?= =?us-ascii?Q?znbkJwMG5058YxBKQEhk0UZtNN38pTuHbqKMRY3Vh8/VfIyMUi0Ttj/z80Wi?= =?us-ascii?Q?GUlGZOnPm31OphewFFSNRxPvqwMPNEPZficz4lKvcSgT7ue+b8LmReo+f5Z6?= =?us-ascii?Q?63QgendmIIqWxTIlN+aPxv1bsyczKNW2+jb7hNXMzTFN+2FkVguFypjMMPZs?= =?us-ascii?Q?Gt4zKVGneILDrBv5mDhgATGE+D8ojF9hLtXc4Xkl3PIimCrU9kGxbkz4a+Lw?= =?us-ascii?Q?xV3gyvSmoe6u7fkPYBqrPJQTENZlv9CqXFvOEzZkykUCzjlWhs+8+CJJ8Y7I?= =?us-ascii?Q?iCwDoTL6TH/554ZWNwihdTSU03KFkHimhHLQ1E9DLuATv5eBhjSv8SzQB3ct?= =?us-ascii?Q?D4Fy0kv1Nls0+KZEagBZKOiFFVfFgU3pp3jRqKf3sKvrtlm6wRYH4RRRiq3F?= =?us-ascii?Q?BmCBnpu5KfjLKjACeDUMIhmWJW/fWGjjQgz4q/7fLvNMOMt5j+L+wzuP35Ve?= =?us-ascii?Q?sFmjPtTlie2pJwg7SUYK60hydtg9exjFDzsSvSFTwWNpcZCc63myionV8Byg?= =?us-ascii?Q?WtQhsynGOgDE4HoOOXF1GT2hnSgbzD60sYaD13MLmkZImA+I1QDi69yEqZxr?= =?us-ascii?Q?4CZvB1jSxyaUzptNOECyOpzTi4YYtT2IkAYbkxsaONmSg+iUCa7Z5UDh8pS8?= =?us-ascii?Q?j59N2HgF12xCrkthBns6U4bvkNbJe3A/9OX0HchJ3mL/3sANkWZ10c+uPRGK?= =?us-ascii?Q?tb6iNttAHf8nGRVGIkH3pWlltqeotPSvmS8JQzre3e8vKEYjY9rxHFuWrwN2?= =?us-ascii?Q?vKOspzV2pN0Ks1j34vi/UzDsg2jPOEfiCEBTmp3D4C7YVg7tBVm7KszGZdmf?= =?us-ascii?Q?FiIDCjiPAofcUu6RcaEaYpcLSkh4Y4TpBkq4h2wHbLA40hEQh3es/tJ1dbil?= =?us-ascii?Q?4FoHqGNg7LwAstvfiC3X1PkOgxQ5sXflzEJFazgUMqKJfZnS6aWajBtS6GSo?= =?us-ascii?Q?1l93Jt9IV8lGCyHk9M/q+gPeGmI0coC9AnVcVNOYsjZ505HjVb71HT8XTH/f?= =?us-ascii?Q?YcDyCY52lyiQqbfVzfZsirEidvalfc6ks9KpXycpAJCBZf2rGIarsRcC1q8t?= =?us-ascii?Q?h0vQB8a5OaH6IuWvkjof3flKHH4NgwOqdQT5u9AV8jXdN2IpKLWY2nB0Qfs4?= =?us-ascii?Q?L1ToC1msAkE0f/g7EfLUX9Lg+CpJzTxjYMDlGUDqgi/GatdFV5kERV62Ezr2?= =?us-ascii?Q?V/htjesnHjsASLeuZas6zH9BH0R9z0dOhDMcB+l4D1sZXMsLTcUQeep1rLEb?= =?us-ascii?Q?US2Lf8O4/HCjWPLeOKPd2zLsy4YnsLgCSWx5euzdZI6CPLKrcaNhgVhmKseS?= =?us-ascii?Q?XXP1e5mLg7c/Ii3vBwBpqrnAQ90iPoW295Sxof7ai3CwEOhGT4M1MB6FL4xP?= =?us-ascii?Q?47j4NjvuTyhn50FIWzqY2D/b7rIsf/xNNF6cQuo+VzeRLi/3mZL4M5F0KjQ+?= =?us-ascii?Q?jPH0mmxxrcCXcWO6KUA31q+VeOR9DnekIpTnKXgAW0kAvmOVg1Wsmb7PB52k?= =?us-ascii?Q?Kg9PMFvoVPBeTFLY0sGyBNI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7154068-59ba-4667-33d7-08d9d8c8bf96 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:17.1798 (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: tH3tfPsDxZZR4dGNjxddtX2nsy2QS0qiH40XfwMOohCnsJbQXCNFA9Ar66KdyPs7DZbuMUJjlRq5LVHqc3H5+Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh setting and clearing selftests in mptcp_join.sh. Now we can set both backup and fullmesh flags, so avoid using the words 'backup' and 'bkup'. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 49 ++++++++++++++++--- 1 file changed, 43 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index de6589d1c541..dde5ccc8ef75 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -297,7 +297,7 @@ do_transfer() addr_nr_ns1=3D"$7" addr_nr_ns2=3D"$8" speed=3D"$9" - bkup=3D"${10}" + sflags=3D"${10}" =20 port=3D$((10000+$TEST_COUNT)) TEST_COUNT=3D$((TEST_COUNT+1)) @@ -469,14 +469,13 @@ do_transfer() fi fi =20 - if [ ! -z $bkup ]; then + if [ ! -z $sflags ]; then sleep 1 for netns in "$ns1" "$ns2"; do dump=3D(`ip netns exec $netns ./pm_nl_ctl dump`) if [ ${#dump[@]} -gt 0 ]; then addr=3D${dump[${#dump[@]} - 1]} - backup=3D"ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup" - $backup + ip netns exec $netns ./pm_nl_ctl set $addr flags $sflags fi done fi @@ -553,7 +552,7 @@ run_tests() addr_nr_ns1=3D"${5:-0}" addr_nr_ns2=3D"${6:-0}" speed=3D"${7:-fast}" - bkup=3D"${8:-""}" + sflags=3D"${8:-""}" lret=3D0 oldin=3D"" =20 @@ -582,7 +581,7 @@ run_tests() fi =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${bkup} + ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} lret=3D$? } =20 @@ -1929,6 +1928,44 @@ fullmesh_tests() 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 + + # set fullmesh flag + reset + ip netns exec $ns1 ./pm_nl_ctl limits 4 4 + ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow + ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh + chk_join_nr "set fullmesh flag test" 2 2 2 + chk_rm_nr 0 1 + + # set nofullmesh flag + reset + ip netns exec $ns1 ./pm_nl_ctl limits 4 4 + ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow,fullmesh + ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh + chk_join_nr "set nofullmesh flag test" 2 2 2 + chk_rm_nr 0 1 + + # set backup,fullmesh flags + reset + ip netns exec $ns1 ./pm_nl_ctl limits 4 4 + ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow + ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh + chk_join_nr "set backup,fullmesh flags test" 2 2 2 + chk_prio_nr 0 1 + chk_rm_nr 0 1 + + # set nobackup,nofullmesh flags + reset + ip netns exec $ns1 ./pm_nl_ctl limits 4 4 + ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow,backup,fullmesh + run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh + chk_join_nr "set nobackup,nofullmesh flags test" 2 2 2 + chk_prio_nr 0 1 + chk_rm_nr 0 1 } =20 userspace_tests() --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829597jah; Sun, 16 Jan 2022 00:18:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJzfDKBjZkOnD10wzOeFFOD50EDxjYIenGUUjKrsDKOfv572hd3Oviyo++nVpYfPZ87/8le4 X-Received: by 2002:a17:902:e154:b0:14a:8dc0:8ff4 with SMTP id d20-20020a170902e15400b0014a8dc08ff4mr11207450pla.72.1642321110005; Sun, 16 Jan 2022 00:18:30 -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 w14si9825876ply.562.2022.01.16.00.18.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:29 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3178-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=VUWqzrMU; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3178-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3178-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 516A43E0F83 for ; Sun, 16 Jan 2022 08:18:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 456982CA1; Sun, 16 Jan 2022 08:18:28 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.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 2AFCC2CA0 for ; Sun, 16 Jan 2022 08:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321105; 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=TS2a+TzorqIf+/zLR6+SH0PRQlsDMC+W4vjYwQAjZb0=; b=VUWqzrMUt+JvJP4HB70epnbTLYDLODFRDniCkCp5klDs/xIFCWNS/V8IUXz2aQUSKaH0F1 n2EHgGHNba6CjblWeE33GQmW7asPdvIScpWSe+eZZQAZKyjOi0MbkldCqw78UL6X01eIO5 ht8i9IqMrJ/3v7IS6el3o1pDBbHPSlw= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2059.outbound.protection.outlook.com [104.47.14.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-6-qgGx6qKhO5ignNEuk3SAYA-1; Sun, 16 Jan 2022 09:18:24 +0100 X-MC-Unique: qgGx6qKhO5ignNEuk3SAYA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LLrVKb9P4Gh9jbOaP6zRwR1/vihkPLEkg4Og6mGrA9oON8ubt5w45dmPp3DrLhjGvNY3H5ZNfDMKPEIlQf+3nqfysrqWsoRJmKbIvrPMgj3Ig6U7mgzUjOgo4PA89U9rsfPKDmjp8xe0Ow2qaiREHB3VPDYeWFxfz3Eb2LoIXh4PHCmbQz9TomdOOskogVw44dpInl33if0GISBSe1RIHNRX3LpYYzIvLsJrySLjAlQKg7SnVaQiYyumtLNNLDAmqlm2uWXgONqE6ciZeyGaG6ybXbwg+9G2Bv+Po28nMAtQUWgEHZqtAFOTKmDWwPs4PEtSwO51qxYmloDjEk5v/Q== 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=NEx7jyTu68AMD+lRygK7W72LBHx0eCCvize345xLkkE=; b=irml9rYpIN+hSud6Ib6xU0AZMdW5bmbW7Xl3c1KCaiM128L3n9KcYiwQfKj9DSF3LuGyPh4CnSm0uZOVyAXwEX3O2vWcXSyVR18LrWJDhqJFrqpB7fUmfBTNfgwqCp+TR8myS2JY3i8P0JsisK9wcNonPhWZRdPlLJxDmMf7XmBwahfixK4gS5v5PSfbjRZtaThG3vTZORUAIxd0U82zfGxJMrlPbqE5Z6Qv3tNRwYLYSroOkixNKvYd/1vZLNVMZaNzV0wCXFDgpne4Lm2miF+8Z1C4yqV8L8/t86//ZQMrgzHrx4SetxOILhPckRhoYsjyRhAf1nRRznvW4wqdpw== 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 VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 08:18:23 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 04/10] mptcp: allow to use port and non-signal in set_flags Date: Sun, 16 Jan 2022 16:17:34 +0800 Message-ID: <3be4e9906eafe7efb2326e47f75ef26cc1031427.1642320655.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0058.apcprd04.prod.outlook.com (2603:1096:202:14::26) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac8afaaf-3800-40af-ef98-08d9d8c8c394 X-MS-TrafficTypeDiagnostic: VE1PR04MB7472:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vMu5/l9E2V5Hi0LuS63TpBB4uQUi1+Y13KQAZJLa2FA7VFuMZgsBSUNC/+QEKyNhc6OPOueuCarwcCt+ALC6ewmMBqkXb0CU70DCyiWiNJiroIssPIMGFAApA4FMPA0v6SOnMfZwqBdlfYJh6x+R3aLkgvg4tVpM+m1DSR65OvFMzXDrOlexfJK/dmai+B/1ZsnB0gLywgLhuxjf+OmEGRhBWlrBb6AS+kB1yaclYr6wjGbl10TNzTGHMjaVjNOXiKZWcjBZekSMTShs/V5qwkX21v15jBIU25rb7kg/3HAbF2c36raUvOY68jY6AsgqQJtn8HpiQ/DAhzkZq7auonuAMeVcJ9qqiPQaVHiyen6ZKqPhp4IUBLFo4dt0ZZ/vgMAxH2GKaMrRQXcHJjRqNwqlyPmriQ3EJtldfsJ3M/ZgNgKOFW2g5IobEJDWp9tRJ0QI6kux8CShGslqWwacebHbEUmiQCI22pgfZTDfO/MLVaBNCB7P0ajpvgG9ILKD+3g9/8AfxYI2JLnqdq7WD275Zh83AbDeXuaK5PG4RDXB6TIeqiq34RiOZmzs9usDV39NiT8FOfr3pBCBspVZd75P8WDCbTri62e6ZGsJa1YKKS2Yhzk1Re1Ae5ImHjSRVsY+g9tRF9Ni8NyUuw9CJbK6ZTUIoJVXBM+LgyEpZkBCudqSxbnOnc211dgB25U1 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)(5660300002)(107886003)(6666004)(38100700002)(2616005)(44832011)(6512007)(316002)(186003)(508600001)(66946007)(6916009)(66476007)(4326008)(6486002)(36756003)(83380400001)(8936002)(2906002)(86362001)(26005)(6506007)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JmVdC372eiLo7QrrTzWaj6XWMF211WenyOcxy0ejzwK/IdDst1TgQqEkUJHq?= =?us-ascii?Q?FF9EwsuhBrZUDuLRWlaUJwplIbijERBKCYecN7KE5450HNasgfqJKogd9gES?= =?us-ascii?Q?WdQ4PM8tw2zqoBKu9N2Khl8/vvxu+PznoxgDMn7DbugKFqSDku2YpTgipahJ?= =?us-ascii?Q?bKjJRTdhbgqOAr8CtiGV+23x/CoPleE8sI8bqMdhNYa8etliDe7ZPD6jc7hH?= =?us-ascii?Q?tHKuBUkNWExAlcj3a/4KlewkFGP39lMLYnX8I+Ug26sIIIBJcKRxZy9uZuDQ?= =?us-ascii?Q?x/Vhw9ej4Fu5MvO1GByxbUJJv16xo3psNY0os8inoSV8NwTxjLQA2xzn9qlK?= =?us-ascii?Q?sC1eqOAvUMv/6whP/2hCoJj/GecxbaZsm/JtN3vK/3S1stKVvwiGsgUhNWiO?= =?us-ascii?Q?wB/CM21pwsP+v+1r5/yThvdPqVpDhj9O7gHPbGxSdhlp9FxoFf+hKCeB2Y1n?= =?us-ascii?Q?AQDKDeQOQbQE1R3gSPPZjPRLYL2+ttUDGjbiS4f5P+kDfyV7Ura0mpHjUatb?= =?us-ascii?Q?+NBPem22qnKF9LqiZhc2OCP9YOwjCGN4izPhZJQCVnOd3ozmU8VM5zIVFbkf?= =?us-ascii?Q?t7ZuuaqSFTjjafoovbfdWqQlYm1zGcpInDgSnkXnROJ7b1ph4AYYlM5zP631?= =?us-ascii?Q?Q48IehBatfh7F5hI5l9cDnC02qWlen1R5ZLYQstibW/Yb9lm3Ee6urv6/kOZ?= =?us-ascii?Q?WK84CznGQR6+RhDJiQCWkjax9aLWJZo6v/V6NNZmuISbr/o03yAfW5cTj+3c?= =?us-ascii?Q?oHXHWmKeTZjrcPpWuU/oT7NHqvsUw2JMlAQxMdVQi+bYGoEEQSjQnudGpiWp?= =?us-ascii?Q?BHLbC1lwgw+vgOmkbIcEIgYM6ILXDdnq/asF9rf1WO1gG4NKQBA7rBfzU4kH?= =?us-ascii?Q?PnWCiNQv3ojyzGMEvCxxvxP+tGSgjsu/zBSL/FXTtqs8OSpvJ6H0BKMboH1k?= =?us-ascii?Q?ReJkGmAD/z6naGwaZFMi+TDD0MgC/WVSXehoQr0kMdYB0XFwWZM+c3XjQLwk?= =?us-ascii?Q?nvCkOf8jGTKty6VFdeog+5WknMKxhmku/sKtaYo1Bnjkcdwhy6gi7VAceE+p?= =?us-ascii?Q?mkbhK+8VLFx4WLFGx1m40YQTg0YVt1M6gtYENowh2fTaSswW2/wJeoo0ilHn?= =?us-ascii?Q?wIQuiHIuhTX9ndkfA/WV4Gq8lsu3htS05rTMrDfisyp9SzuMg2QY+2y4Nf1M?= =?us-ascii?Q?dBW6WwQuaU4aRn7+GE/QqpRMt4Z5ELZBYdziA+uz1zGTN4Eut16m1cHAs01X?= =?us-ascii?Q?Hxi5ELvnXLFQAGjfw/WZwxyRNeL9MmJik4us673yLU6iInIm3G4xEGBi1Nzs?= =?us-ascii?Q?ifeOTeTVqKg9eW8nZ6HsTySiXSH/zw8vCTBWb4bTn9gPaPRoT3fJYFfK/irQ?= =?us-ascii?Q?xTl9nK/zM0sGF2BsbpRLKCO7lLqb3dO5P0xa+OISNhzYoKxqYimxSniZgRam?= =?us-ascii?Q?ZUodknnbt7Ye2HisuB8jGxlN+dEBYFEjzSmTAJt//eJgUbqw1c1Sz9HdBM0f?= =?us-ascii?Q?NGfp2zPP6wEnQFVGgaA082PBWiRcxBA9LryW/9/kvLAQ7IZMJxsizI5g3JS3?= =?us-ascii?Q?nCDJ4jm2tnDZdsArUp4fuPd0q6lpT9GnT00Kvze9+nsdQnM+JsgPUzG+s47q?= =?us-ascii?Q?+P98r3ttNSozo9mju4jN2Tc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac8afaaf-3800-40af-ef98-08d9d8c8c394 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:23.6949 (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: z3uCFqDuU+SaF5GlODhtayELxdXQ4xA/tjVpiJ93z3vBZ1PM8ZJm4WOe7Ml6jFe9YgEDyA4+TGNFN2kV/LYfLw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 Content-Type: text/plain; charset="utf-8" It's illegal to use both port and non-signal flags for adding address. But it's legal to use both of them for setting flags, which always uses non-signal flags, backup or fullmesh. This patch moves this non-signal flag with port check from mptcp_pm_parse_addr() to mptcp_nl_cmd_add_addr(). Do the check only when adding addresses, not setting flags or deleting addresses. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/pm_netlink.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 51df0b478ef0..5eac5bde5b49 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1162,14 +1162,8 @@ static int mptcp_pm_parse_addr(struct nlattr *attr, = struct genl_info *info, if (tb[MPTCP_PM_ADDR_ATTR_FLAGS]) entry->flags =3D nla_get_u32(tb[MPTCP_PM_ADDR_ATTR_FLAGS]); =20 - if (tb[MPTCP_PM_ADDR_ATTR_PORT]) { - if (!(entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) { - NL_SET_ERR_MSG_ATTR(info->extack, attr, - "flags must have signal when using port"); - return -EINVAL; - } + if (tb[MPTCP_PM_ADDR_ATTR_PORT]) entry->addr.port =3D htons(nla_get_u16(tb[MPTCP_PM_ADDR_ATTR_PORT])); - } =20 return 0; } @@ -1216,6 +1210,11 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb= , struct genl_info *info) if (ret < 0) return ret; =20 + if (addr.addr.port && !(addr.flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) { + GENL_SET_ERR_MSG(info, "flags must have signal when using port"); + return -EINVAL; + } + entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { GENL_SET_ERR_MSG(info, "can't allocate addr"); --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829629jah; Sun, 16 Jan 2022 00:18:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgchgL67PNvdfogJthFmorYj1Nw80mIC6l8nVu6p8L5YEfWH8OmN1y0An5aCDIw03Xxuwq X-Received: by 2002:a63:9b01:: with SMTP id r1mr14442198pgd.263.1642321116456; Sun, 16 Jan 2022 00:18:36 -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 ot13si12142811pjb.87.2022.01.16.00.18.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:36 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3179-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=VHeSo5uv; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3179-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3179-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 ABE4C3E0FDE for ; Sun, 16 Jan 2022 08:18:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C05FD2CA1; Sun, 16 Jan 2022 08:18:34 +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 99ED92CA0 for ; Sun, 16 Jan 2022 08:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321112; 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=Edt1p9KSDoya75M6IGXtjEKGXl8SOfJIAkR/V+wo6XU=; b=VHeSo5uvzaNNA+MO9nkP+SXnaGwZ77nvSFpZx1+AHlOjr5+livgQpgCQgOYve+8dmrMpvp 7EH2K/BVgHv6DbEBDsU0l+n91ebswGUAl3LBjQsWBbBGEmQKS5URF7r8rifdJIyRWIhNpG yjphj8hFK60Zknoi8OTKy9pXohqSZ4I= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2058.outbound.protection.outlook.com [104.47.14.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-8-4jnrB83mNB2lUHhWUjErjg-1; Sun, 16 Jan 2022 09:18:31 +0100 X-MC-Unique: 4jnrB83mNB2lUHhWUjErjg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DOtBmedCr+rkuiayGI3edzDbLJjpwbGHwgh2nFYfHPXFI/gu7nE6ej9bv9LXDrD7r879XuFjm7ur2aWfr0CIxH4mbK+L9aaS8OFxwRbyI6yh4R5OBOsuNA4FkHqtNoSmsvRl+pW/35Enw++0bJD+s69wIYgrp3LTwPqkd6HcVjgbTrpPxYIKGn5pEH+GAXuAWkidXhPMI3xoMJerEmL44loCURUaylC6zYsN2wolVaXo39/AA4AxDSMjAA/GvOd95bbJXLbeshnO5zuC3XwRnheUuahaievAfjKtLOkdj3CbsT91wgy6n8EX66HeR1e4xeLaODxv3IAT8+NTuk+7UA== 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=w2ju45BwrOeaW84wTo2BgVqr4hubXPkYYwiKW/v1dwo=; b=huL425ydp9nrA31XUZLh4agsRJCCbgwMuT/DVnxObH8RALiH2M81rtjR+03FPbXZpl7nxLy9sV6SstTdrfUcwpMQBzqsLVoZUVFwCwD1hlFtJCTHZ5bOrE6xsq74p2mTr82RArGo+gwONl7N15Vh6zPbU3N8cOdIv1j2Eq+nivIHEX3dT9SPlPNaqMW6fp97yzwc5RkQm/Bl2AoeedhZ1TL1J3bCIg2JqyIaRvWMfP/+pPkUyFdM1kT31LGvZmdvCylkvp/nTOE94KL2wGOjMIFNfX48sh+0hdvshmLJn3qfYZf92C7Ry++G3RvBEjm2R8tXqO9Q6KNQhOlnSS6Ypw== 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 VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 08:18:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 05/10] selftests: mptcp: add the port argument for set_flags Date: Sun, 16 Jan 2022 16:17:35 +0800 Message-ID: <850e0c7ac121aa9392de828a326c70ac87df953c.1642320655.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0047.apcprd04.prod.outlook.com (2603:1096:202:14::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: 86cbe13d-b0b2-4e39-e6c4-08d9d8c8c78e X-MS-TrafficTypeDiagnostic: VE1PR04MB7472:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1850; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /+2m9Z1/HPehEy/1MZt11y7J7e2HVPzXiXgXMprlvFzI6Cx5ReHcNO6TDrTN0u1SZVw3hLv6S89FeLTB3ounP07aC/cAqZQ0i8yc6WZvEqK7Ws57/B4BglbWNqvmLZ+NaL83eNbHMW43VbwM+dn0zmwnB2enuidNVL/sB1aVFIVOo6Csn8C9vBX925sEwYBl+SLEy/z5tk0mqKbwCZw/MS9ZEKGfKzfAcCDKJHSz1975fpcoOvY140I94YZKhfyBMYlpLoIOGasF3VlPEiqUA0bQ/lI8+vkFQQvboA5j3OkwkRTroVDSZfcY9dFid6pPYXLH3JLmjIq+zkskI7dfKaDG9YJFXz9ByrOOrbUeOSGWKIhx1hCGD2Ejv3zav+VUmNy4CjKVawRVBfuy8OS2JPafvfYz5IPjtyUZFvE0tIdCHk3wGjKya0x5yXvQWNReugINWKaXnsmTvelOU8rH0xckWtChknFNjzBEWDFXMr82hrBwi6Jyp246v9oh7E8UFX+fchRW+bBpZCbCjZJoAQbuVPs6RRupWiRL7e25isakiNCNdIFMxtrqp9ljw+HYLfokCPVl6wD8jWrQMb24Wj1UXkW+uDZcnEJi7u3PJmee7myev+NMfLnq7r9nHT+u8OI3PoZYeBv7L8Sxjqh6AjkzXhhdET5kPqBzZ8Id4bvO3nrjgItX4N1s21uC6hnP 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)(5660300002)(107886003)(38100700002)(2616005)(44832011)(6512007)(316002)(186003)(508600001)(66946007)(6916009)(66476007)(4326008)(6486002)(36756003)(83380400001)(8936002)(2906002)(86362001)(26005)(6506007)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GyJj5k3zF+6urDmYoy4iTLRAioeQ0e6ZGQ02+UZXLM6W1W8BPPe+Zr6Wo1Vc?= =?us-ascii?Q?XgeJFpbevOlWX5d8gYVGgUmfpjdS5+MCcitglC8K7orAEiWIg9KaMu2M4SUm?= =?us-ascii?Q?9ZaHXJW19uLUNrUkd5qc2vd2skmeHu4NKEfB83DD3CZ6iCcCx73XnoCHRbLw?= =?us-ascii?Q?w/gtKlbFCbEu/Y5a2UXd6tWccwYvQiAP/0pRGLOTUUxbzGglQ01XFrXlDAbo?= =?us-ascii?Q?hsJyhznl5nR0I/Rnn6qmLA4lKQcwKLH7MdNBAJPg+Urq+LbpGrKcQgcPd9aY?= =?us-ascii?Q?l36df6yn/K7J/vFnyEFcjuWY3JKSduihhNQ0F62Ca489gLPZwf6k9lf6nkuS?= =?us-ascii?Q?0PU5uYJpDVbt9Lmjd/tUTe07JwSg85+7EnXGljHzPcuTBcxDLGXNOQxdr4Us?= =?us-ascii?Q?x8uuahm6ndi8clMkrkI+Wv9ArGyORrKnu4L8yfPrjcc/sT6oJZCmPJMwjkkh?= =?us-ascii?Q?8MMvkVK8j6lFCUj8Xbtffpj/a5uoSqkzJstAF792BauMmX6q8CvwUVQIxnTl?= =?us-ascii?Q?E+fndNPiQ4RrbumepYxgcFZsca6ErP3LVTsnV1wfj7wVcL3i7jprRfdC7lY/?= =?us-ascii?Q?esewQlmKIhksYhy2eAGN7Y3pULZ4xTKR4pCTAAkqSyAzeqaFM9oQOrQeGB2j?= =?us-ascii?Q?YD1iMcCD2tqyxH1e3YuM314nBtN5N0jjNsyMXMvQxOerG66nt1vsydK5FUJf?= =?us-ascii?Q?BNFpC2RwkXEQJjd2L+0nb/47aKVLbVpPQSn5IMKT4khWJCc1qH5EYTnekOcQ?= =?us-ascii?Q?x/SAp1SDzAE+OjHTGzmgMdPG70V3+Z6+DDEvC9B3PD8MLS1xkoVONHNrkCYt?= =?us-ascii?Q?ACAPA6s6fWB/p3biCkK43/p9m78YIOXhJNSKDV1WJjuYlNxGka0ZVH6BGU9F?= =?us-ascii?Q?qekZnh26sa4NbabRrkp6FC2/yqpRmFesVKaT4il79QxpPc/y5ELMvm3dSlT3?= =?us-ascii?Q?7iUypVhZePdjfI1/40CxG2Bn9Peu6r2+YUptPTwvsXZOxhSl7dtDRyeMIvkt?= =?us-ascii?Q?awbgey8GUh1Iob4aZnX/EhJRzRJixjy11V4Zt4t8khVOTARhuhaB4sEQZzzK?= =?us-ascii?Q?wW4Je/2b+WNWeraRewcWJLSF7B9lahGlmt1CcDL4xdq6WawQAqNnCwEPJbCA?= =?us-ascii?Q?J8bBe4H4cMQPOcqzTBhjHDF8mx5NK4B8y+vPm2wX3aDfQV5kfk6bZzFUUvsh?= =?us-ascii?Q?0IybiZ1uc3Y5dCIS3vr70M+54QO26W2eJAPgYwToTmRn1+EGYL8eMPcBiiRN?= =?us-ascii?Q?atU0FdsliPVNMLPH7lDS6EOHBv6erPWWBSxAXW0bpDOaW49u4dViK9WssMVE?= =?us-ascii?Q?aa4j0tOMh/X7sXWs+xpbaEn+nxY6N1qCTwg4r06Vrc/nbcuEzz04u45FRq6n?= =?us-ascii?Q?jpqzAqHu2Y7UJ6fqgpHAFKnqOvseD8h9vU+u5eM/wMXqgNLIpIt0JzX03hJN?= =?us-ascii?Q?Pe6vTM8eA1xn/H/JCdoPW7jH0HEEyJn9nijQp7nkc7Ol80Pd0knFln0eotFF?= =?us-ascii?Q?T375PhUyvxPgqRutrUnbjXlACvhjo5qcD8x1fKyAeIXXRuzWY1kIU5TGumQL?= =?us-ascii?Q?vA7dhpOhfspQaxpmvOPh361Vx6aa4hQFzDRWBbn8HKRQTFS0Vo2EtlCckZqt?= =?us-ascii?Q?NJ+/YKb6cazu/dqJBlyY3ag=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86cbe13d-b0b2-4e39-e6c4-08d9d8c8c78e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:30.3663 (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: 3WxHYwekff14/K41jEkFVDseD4cKYg1uNok4c1bK2WClyEul8REmhSP0nP/sgGPdOziCujw1tWVNFygk+YpoWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 Content-Type: text/plain; charset="utf-8" This patch added the port argument for setting the address flags in pm_nl_ctl. Usage: pm_nl_ctl set 10.0.2.1 flags backup port 10100 Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 9b6db9d77223..3c449158d821 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -28,7 +28,7 @@ static void syntax(char *argv[]) fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); - fprintf(stderr, "\tset [flags backup|nobackup|fullmesh|nofullmesh]\n= "); + fprintf(stderr, "\tset [flags backup|nobackup|fullmesh|nofullmesh] [= port ]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -722,6 +722,18 @@ int set_flags(int fd, int pm_family, int argc, char *a= rgv[]) rta->rta_len =3D RTA_LENGTH(4); memcpy(RTA_DATA(rta), &flags, 4); off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "port")) { + u_int16_t port; + + if (++arg >=3D argc) + error(1, 0, " missing port value"); + + port =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_PORT; + rta->rta_len =3D RTA_LENGTH(2); + memcpy(RTA_DATA(rta), &port, 2); + off +=3D NLMSG_ALIGN(rta->rta_len); } else { error(1, 0, "unknown keyword %s", argv[arg]); } --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829691jah; Sun, 16 Jan 2022 00:18:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnVkViIXGsmipneiQLNEnaHPcCVz1xIVsdafVOxeRwg8ZJ2rEbMAUWftXsTVij/UUUD3Ke X-Received: by 2002:a05:6902:351:: with SMTP id e17mr21720600ybs.205.1642321124176; Sun, 16 Jan 2022 00:18:44 -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 b9si8027062ybk.381.2022.01.16.00.18.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:44 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3180-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=HVIRqyxh; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3180-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3180-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 BA1931C0D2B for ; Sun, 16 Jan 2022 08:18:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 774392CA1; Sun, 16 Jan 2022 08:18:42 +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 57F6F2CA0 for ; Sun, 16 Jan 2022 08:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321119; 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=pW2WbTWE1Z/NUikX1Vul1WEr2B2yqqo7fUEprdKYcFQ=; b=HVIRqyxh3xPVr77rq24mgXfyr8WDVWIzEVYAt2zQV+X4SUGvJETzkrUpAk+vM1DBoIoWTG MSFEZk1i3yS8rqW3/bzb2tCAyLrZRzlPuIkPeI5f4IzeihWo0SGEBh1JX82q93oEcsZGmM HOOxWN4PbJK+Wg91ya2pmOSjuZauQoE= Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2053.outbound.protection.outlook.com [104.47.14.53]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-10-oDiTcnCcPXezUbhY68s1Zw-1; Sun, 16 Jan 2022 09:18:38 +0100 X-MC-Unique: oDiTcnCcPXezUbhY68s1Zw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZMzATatt+4s9enTF1qiqlBys4PbJezkD91IvufR6rJL8SUtgjGK3nt/FIykyuubJC2EXwZStRxSiMOSIeniVx/Wk7T/QdLwncwUhIrdqLXNokPHB/EHByTBKop2MQ42Ih9ZkV9oD+bIYuLX/5fNZL7GYFYQmwwQUCHcLgOAmj3vbrYQMd4vfOTomEPotVUZmQy/tPwejb/58b9phasVOFVWips9I5gfTaIsuEE6MVS9GJOuOlVjUzRtFdRW2IQrbcQmweeM8wwji2EbYh78ajjjeaoJKFrBitLJCQqGqSum9jieFMJIaucjSJrOtEIbfZpSWcIBtlDrzY+sosw4UJw== 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=Mg5mkMauIUC15oHSPLzlPAiWflO2Rm62cDWgvgLwCvw=; b=hRBYugHj7TvP5A1uft+PhaIRA3SQOT0NoUHQgx1/k5Lj9Rjrf/yLF4QQ2vw4OvqP43qQevskpuksVtY3GtV5yRGZ+EU0BaVrAwI7Gpl0U34z6mdYFhhUkuJ9w9nRwR/zk9JN00+7STkLb1+QHZ+4Bm1hN2atQBJGYfpqxju3NJ04SP6Y+3KtXHMpMJrsKGKHikVaTo3cQwSDV3Zt1WYAGholRk7U/HGoTwIPvMruyEqW5JYU3ZqfyijI20Ivt5+GBxWtFOhBPtdr5vr9fBHV/VjzSIjAU70ZCBMqm+VpxiPmaC2r9Dp0w8TLUwtQ8I7qq4H46l4mLdGPue7YJt3Cdg== 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 VE1PR04MB7472.eurprd04.prod.outlook.com (2603:10a6:800:1b2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.11; Sun, 16 Jan 2022 08:18:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 06/10] selftests: mptcp: add backup with port testcase Date: Sun, 16 Jan 2022 16:17:36 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0045.apcprd04.prod.outlook.com (2603:1096:202:14::13) 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: dd9d1c9c-63b0-4b44-54b8-08d9d8c8cb7f X-MS-TrafficTypeDiagnostic: VE1PR04MB7472:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f9FjwN5rtsDJkZEwU4MiqShAZeUoWhKCEGrml0Lqk1RBipjz+220ABOJbzVotZX0fdY4C4dqwT8tP5bQkUlDC5/XFlLCZxlXy5zB9LXxNQQIgrZ8FczlkMxuxPH6+ZlDt4vO08tsLgjzM6Ip9nW3NcT6WWUcguywc1aEYN+4OzevOWvcJMqBMJHmMeJ5XnRbH7Uqw7gcyghDIejA1klpwKJnHnbLvP9eUyJDpdEO1ZaRmhmlPYKg4vPade+NeGUy3IoEG1ATm60zH7A5C/Mpu4z0CCtvNKiOnJCCVyO0wN8X2/zNQptb+G2t77KHzsUNNGFdQVbFkwyb69A6q2VWZIJnEa9TR8MWh7nXglY2B6bX6I6YMTgKjGv0Wa9ZRh+/hdcbIVkhN9yyzfbgRe+0PerBnsn6I4pW0fWz/UG71yW+iARATVC0ygdGJTsiGlvmkGuULb9K3UJkWJ20/xxwRXX/k8bLKatvSIy/rHlhTmoLf29k7a2LViLLPT7Cb0c9ONFnOD1VOh2cLHnCVsaDyAVlDGr86/zooAq29CCuVDpnrNikUqu9zGS31RRBhB2eU8d3UJGe2CWDgeVVB8s+L4rqwHEv5zmXX3l8rSls9cFAXVWg58DLYKag6B7QB9q3XhC6SqSqFv2dqmqfM3pMFsiroAS5G2qOmqi5vBb/4NL5ZgqKRSnSV2bc1xNgb9Dj 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)(5660300002)(107886003)(38100700002)(2616005)(44832011)(6512007)(316002)(186003)(508600001)(66946007)(6916009)(66476007)(4326008)(6486002)(36756003)(83380400001)(8936002)(2906002)(86362001)(26005)(6506007)(8676002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PXyLhHjVkFYtZEXc5JBZpYCh+N+Q/3iGTLlIgrpbPSEaY4EA8/liuUss+8Fa?= =?us-ascii?Q?09V2F4vKg/pSlEXY/X0CgnkgzebFwtVcJ3RdUvRpRJnFasPxp63+R5Au91RM?= =?us-ascii?Q?lshBpl4SPgvGQA6BbfT0XZqLmy0NuB8q4V/GJP2KLVAirMZe0L8vi3BtUuny?= =?us-ascii?Q?MFv9kmSCTqwoHp8gL7g/D6zsdvrKhcwc2Epdgg9e5Zc61ZTIV2PqbmOF/ArH?= =?us-ascii?Q?VeXnqNNvnCDTDLobu69rqxK87iubCsfBlg89+JVdAI6jvHpfWzy0NA6l0nhM?= =?us-ascii?Q?dIcL4gdz4TZGNrCRVeQKXyvvitJf+5LFjoHeqhjjHbc+69PPMgmU/MencJF2?= =?us-ascii?Q?LxxwpWe+lQgLrU47LC3vk0VdkXtEcOLw74W4F7cd5MKeWFqeOMD5bY/5odrY?= =?us-ascii?Q?hgOlHhTfdorhq/gsZFNecv1NFQLcr9IyYYJhwZIO0XG2YmxYJlj7C96iDXVB?= =?us-ascii?Q?SN7A2qKwZUT/N56XBf2Hir6F/E8nZdCL/iz644Ton7HsyndsxshyHXuL80lw?= =?us-ascii?Q?ZJUTz3DVF61wYeb7zONvJ9OYVRElJQaAyhJF3Jo1c1Zc+HeUtV7pvCt6GFAl?= =?us-ascii?Q?ZMmwN2SFfVfMS02JS7MWFOMuxSp3j05KcoDwasyDXlZ7QuMSAq1ttKcjgv2w?= =?us-ascii?Q?LBJPjoWebzKJw10N7NF8+7g+gSZdMx5Lr1A9dyC3COl1ZMgMjuxF73RyCDTF?= =?us-ascii?Q?b10o1wMfD301qyZYkHhoRlZLh4jlke1ef1gvk1Ova1TKZe26aDdO9VpbNCzp?= =?us-ascii?Q?vFctvBuIKeekS2O6zweLS6p1CL960ILBcpzWXvDlQ38nTZ1p1WgMvBCyvbuC?= =?us-ascii?Q?N3slU49P1oNa12ddqbvxMYy0iTJo457E2jIybTXiqGf+JMVHi9gRmbRqXAqP?= =?us-ascii?Q?mCKP01EifXJ2fb+MQ/Wg+3rvkyx3QUFHeSCS+NbweXTqHT0Hf+hGVgt+pA7V?= =?us-ascii?Q?VPjpz9RgJnU0N1mLPeLBgIHmTBLwm1oTn2J7CY8g5YaPOJjl0jhxdBCD8y++?= =?us-ascii?Q?rg0TglcBd7Pi1KBICJh+CYcSJTpUsZXne+x+LuShizvKZ/z4orUaf4dPf+yg?= =?us-ascii?Q?8YYMymu8PNiarz1jurmFDKHDuI0ZT32jGH3wY0JXz25D+Sx2HmRXxI++z2TM?= =?us-ascii?Q?kK0gEQJS+Mvpc21CPH7rU28DFXxBQvOtHwF/PwhmnvUnFddTF301aVaCTgFv?= =?us-ascii?Q?iRlwMFQQ/jYwyklk8+CiqBVeLWk0rZ/kL+DGV1dbCy5Hz8ezk7oRhGcnESPK?= =?us-ascii?Q?MzD9xazdcfr5USY+HQsjOIGbgSuRiNAhTqowBgbAb5e1SqWBdAPQprv78kIc?= =?us-ascii?Q?b9RwFMg9+h3lL0TQGROlB19ufl+JBkeKFLT3VBYgFyxm2CCeENPaDMJwpnTZ?= =?us-ascii?Q?RR6BiVu9buF5bul9pIEvwKqdh9WEhkCwPdPyVp2pVsAwumY5ZkK37z28lepV?= =?us-ascii?Q?Ts2fN4mdO+MH5pLHfQ0g0NFIktPZXMMfS6LjuI4Uagdah0ikq1X2cv0PZrck?= =?us-ascii?Q?ERm2t/aJwZ3epfLfQWZz7iB838AMTQWQ3Pv2yDHfZRjGFfRQgprdC7bq0zs/?= =?us-ascii?Q?PjtnbM+5/VFnCgFpd8zi5L4+6jHIl25MvDx2KGlEz6bqFSkidFyEUoSNme62?= =?us-ascii?Q?wvy25bHb90D3P8Peq+TOWtM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd9d1c9c-63b0-4b44-54b8-08d9d8c8cb7f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:37.1626 (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: kKRsoeKGl6yLQ1hAlZ5A+nf90ltP4jYisf55o9HCYcoBtpipDHoqHF3ZvMv+j+oB6G50LmdggcgCaS8pQ+PcYw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7472 Content-Type: text/plain; charset="utf-8" This patch added the backup testcase using an address with a port number. The original backup tests only work for the output of 'pm_nl_ctl dump' without the port number. It chooses the last item in the dump to parse the address in it, and in this case, the address is showed at the end of the item. But it dosen't work for the dump with the port number, in this case, the port number is showed at the end of the item, not the address. So implemented a more flexible approach to get the address and the port number from the dump to fit for the port number case. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 44 ++++++++++++++++--- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index dde5ccc8ef75..bb5fa814c05a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -247,6 +247,16 @@ is_v6() [ -z "${1##*:*}" ] } =20 +is_addr() +{ + [ -z "${1##*[.:]*}" ] +} + +is_number() +{ + [[ $1 =3D=3D ?(-)+([0-9]) ]] +} + # $1: ns, $2: port wait_local_port_listen() { @@ -472,11 +482,25 @@ do_transfer() if [ ! -z $sflags ]; then sleep 1 for netns in "$ns1" "$ns2"; do - dump=3D(`ip netns exec $netns ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - addr=3D${dump[${#dump[@]} - 1]} - ip netns exec $netns ./pm_nl_ctl set $addr flags $sflags - fi + ip netns exec $netns ./pm_nl_ctl dump | while read line; do + local arr=3D($line) + local addr + local port=3D0 + local _port=3D"" + + for i in ${arr[@]}; do + if is_addr $i; then + addr=3D$i + elif is_number $i; then + # The minimum expected port number is 10000 + if [ $i -gt 10000 ]; then + port=3D$i + fi + fi + done + [ ! -z $port ]; _port=3D"port $port" + ip netns exec $netns ./pm_nl_ctl set $addr flags $sflags $_port + done done fi =20 @@ -1657,6 +1681,16 @@ backup_tests() chk_join_nr "single address, backup" 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 0 + + # single address with port, 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 port 10100 + ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup + chk_join_nr "single address with port, backup" 1 1 1 + chk_add_nr 1 1 + chk_prio_nr 1 0 } =20 add_addr_ports_tests() --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829792jah; Sun, 16 Jan 2022 00:18:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpXggbEgQiv0QH4rib9YQFO+Wo4Qci6lSrEHk/HqGIk1jo771xcQRfZmnKY/+J7LyrjBk4 X-Received: by 2002:a17:902:d48a:b0:14a:67ae:3e18 with SMTP id c10-20020a170902d48a00b0014a67ae3e18mr17294824plg.75.1642321136653; Sun, 16 Jan 2022 00:18:56 -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 ip12si3047630pjb.96.2022.01.16.00.18.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:56 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3181-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=CQ22grnS; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3181-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3181-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 CDAC33E101E for ; Sun, 16 Jan 2022 08:18:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BCC4F2CA1; Sun, 16 Jan 2022 08:18:54 +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 7FA6F2CA0 for ; Sun, 16 Jan 2022 08:18:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321129; 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=HHcDEPxnyMnKV3a2BtZEZGz+vRw7U3fSeeWs0CJJg4c=; b=CQ22grnSKw/9XDa47B4PDSz8FtntuihGjsaie6bzkxG5mtidLVslFRQB+t1uF0sNH0jBzq dRU2gzN3ZniibyIk/Xc7IbN5wgC/6iUQ0yfl8jDly2qNEWqcI1LTnrofrOyyn/inYcjS2L sF6tsPk9ptsWRSeXdR1/c00ISZj0Aa4= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2058.outbound.protection.outlook.com [104.47.10.58]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-3z3phdYlPmSOjsPZCzIzYA-1; Sun, 16 Jan 2022 09:18:49 +0100 X-MC-Unique: 3z3phdYlPmSOjsPZCzIzYA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BJ/YHw2DrXqhZNH4OzorDpMptSnTTmOMfyWSQZF/XX+x9iltUqq9ljtzD5l9uxo+a/akVdf87gvip+mgLK1rp0ugYwOxRVjgEUJt1AjUb3rOCJZsO5sNpfknD6Y/goGEwBs3QffiP3YJCKuZKteIANJg1OnqCdlyt2XA4175VGVe3fJ/RcCW+fzYdltCNGi5xt7s/wAieUSeHJy9E4xinIfGj3B9MiSqZ5f/h8ltrztnq03414eFwvQOBjjfJihGFgWwoAaUmNzed9ZWJNryd4ArnpO/fwAlPn4kVFrI81Nb15j8VKfB9aIQIRkJr2w7E5yfW7SSYgBV0iZoYSIcPw== 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=UpEVVoQar9bpbrhxJy6bKqqlBRlQR9Fo95MEDyi9Q0s=; b=IhZtU98mV2EnQABaT+9V2lqHyVGTGvVeQhsk5KeMK7RKDDJTZiuJ09QHzFkS+9B5vIE26Fa6d5av2FEz08XbX4KT9nbVry4JeJoa13WOpgE3Of3u46lf1k3K9eZ3XERh2OVB9Brjd610wUZuN3EqLYNZFuyl8Cdg08KWwZhIz02Mp1hqSZKe/SMmYJ0DrGzJDpDvdDc+HTFXTK3VRlFy6QhBhX6DMEzBe1gKzZ1QXWRY1WNUbo0FK2Ep6qwrVGVaKjmof5P7hE7X/CRhW94LYnI7VqQ4mmpH6slDsHz4ZV33bCu53HOiZ1aaJE2TBuT0xHjHVfP/I9K5e8KQoZnwtg== 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 DB6PR04MB3047.eurprd04.prod.outlook.com (2603:10a6:6:a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Sun, 16 Jan 2022 08:18:45 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:45 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 07/10] selftests: mptcp: add ip mptcp wrappers Date: Sun, 16 Jan 2022 16:17:37 +0800 Message-ID: <34b264a811f34963d8bdf7377860cac8376d9267.1642320655.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0172.apcprd02.prod.outlook.com (2603:1096:201:1f::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: a5e35426-6cbd-4ef1-dd3b-08d9d8c8d030 X-MS-TrafficTypeDiagnostic: DB6PR04MB3047: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: 0uZbzWH4alQlSdPty7Z9ax+HWPUDhDAukhDBKWcbao8QI+XClr7aJWuQVRqSG2d2MNPsV2T7ieGwP4j9f0awLYpOCGth1Q5NbPnABh2GojlMdvRM83N1RWoblmHtXnON0AV0IBDssu025J9eVjhuApcqoKL14EeaJF4Xhrsns5gObJhts5KGde9nImb4mOZWaC4IhGFmnt+2bKsal+0C9mvz4XaklF/ymSTmBEdsUmS+GJro5vl5lE61lp0aG+xnfAvXpeJqjPG3cALIZm9zLEw4E/LqUyPuIpAdOYZjyw3sF+U+kyEeNiRnj8Vd+qQWnvOJN5DTf4Yn0Qwi5yds+i3UoeUj+/xIbgz6Fx1V7C6ZbLM8MgiuncS03hyz85+tKVs+7tkz4plXxPa4derCeXu9p0ZQaTiaZfQHosZ+qGF8t0SB5/q0Jg3IGavEn6b2x4gcrGpGKWUNT7dWk7WxhG9iv13PEYuCFfV4MkG81TKA3TZ/A+N2dMI3m1B5BaDt6cY7gMdz9Sw+Z5M+CKIsSuGEfTaUL8rt/Yls1sgbCwuFZnIvTFp8c0oltqHZtjIGJHBCYGNOKgzxxgWlCzfJrLE+zE9ovaZKVqd/60jzy7V0DpWAvlEkccwiWrjavYR3Nu+jSCtGDRJS9m4HE8/xfVe1Ln3B82J8Blz5UKj/Yx0fIcQ5BYHAx+BcIRuqkxha 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)(26005)(107886003)(4326008)(8936002)(6512007)(5660300002)(6506007)(83380400001)(86362001)(508600001)(6666004)(6916009)(44832011)(36756003)(30864003)(8676002)(66556008)(186003)(66476007)(66946007)(6486002)(2906002)(38100700002)(316002)(2616005)(13296009)(579004)(559001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JCdIhcFjhdO4xuCzxRbVei5G4anaL0qfRRl5+QFo5a4tmt2dgCG17RpuD3YK?= =?us-ascii?Q?I3XcBhgs9GGSR9jOO03KlTZnro7TbgcfJjGFkDbb5QZKihWMWGaG/SSwxsA4?= =?us-ascii?Q?wl9aiP2MGr9jMNhzJwd5pSEosmyKjexr+a5ynjioOioK6ONoC+9Cj2bmGxlq?= =?us-ascii?Q?5lIYBNQCTESkJ0WuwxyIEh2n5AcG6GwKSnaNvYZopLb6D/lCdxe63JJzYBsM?= =?us-ascii?Q?9K6y59LSQFOvmO34XuVb+Umoc78JwUb6WCfBbW9wySLf8jbEvCWfQXGvsYTY?= =?us-ascii?Q?JUuRptiFbJg5hw1zDxQ/+C16QFzcVyoGQDOUIiNFbATBFI2iWC7Sm4XhiXWc?= =?us-ascii?Q?QO8feriF+649v1banEDstepQcyJj7JS8PirqSeZJUl3jnRWonr51fEbSvpsz?= =?us-ascii?Q?zNQFpyrOCZNTt1ohIbqe6tBhNfQ9I55a/4Qe3uY5VxbX4OQO01fEvAISCpc4?= =?us-ascii?Q?uWMfRYLG8CLSg7rmZo/tPJrL2aHtu5vPzJB2zz2UF81GmTd4afiovEA8QmBd?= =?us-ascii?Q?JKsFtwz0TJFDxb2zu+BYKN+5qaoyu7bMmWtMlBJxY7OuZ1NnbM6viNWcN00B?= =?us-ascii?Q?a/1H/8qeUk4JC4kfv6ZvwlfdCtEp8X2z3BPolQLbl3QnFzIIXrkx7p+hO7CA?= =?us-ascii?Q?6Qbw5ol9i0ngsHfa1XeizEE+lApPFHWFGss0CC6SXdCG6mnR6aHpSOeZTJSB?= =?us-ascii?Q?J3sgkZf3KZbe58Wj7PX4eU0qs7jc8WbMpxAQUo62cTZgQexEhsiWyvOD7cvH?= =?us-ascii?Q?4W7G9cEePoTNgdXtBL3U9yunQffh6gxlVM/cep4/9aYLuelDk76zrC3yO5/K?= =?us-ascii?Q?3CcPhA5Nz1R71Nd+bZ8b8IdGgvaFiLyJHne80DETQBXu9ZHMLnhjb0gZBtZT?= =?us-ascii?Q?dsGbFjEw76n2Q2NBZQ+vjGW7mnoce2HC9EtYFrmPpRDKRqcFas70NU806A0T?= =?us-ascii?Q?LCddVrdzB+5wVOUkHHHa7m04DjB+g3hMb9+MtRiB0fx1hf3G0sQ5PZEa+q1Y?= =?us-ascii?Q?I/gwo8Tcyt4GTg1HizH3JzXkYKqXI5wY9lA17b19BQERXKWrnZnHTUtH6W7G?= =?us-ascii?Q?3Mk5A8vNHC7vSJLjcNM1ANDXDD+Gbe2uV6sHJA89WHF/kqixMIJaXkwEFqlK?= =?us-ascii?Q?PgOM73NCYAhzSv1niTBSAFsBdRHz0VZw59kHvnqB3hR9bPiBx7NGhIIZYZXT?= =?us-ascii?Q?ZLVWRtm1fhatsloIGEgoRvqm9mcw+EOgwN2NyUNo5VzURIiv0w8M5TIllWaY?= =?us-ascii?Q?DN45d1MYWPLMOAw4ZHXrc2YnvRejEKK/KkJ6H7vCoRo9hRGwTU25cJRrDMYJ?= =?us-ascii?Q?pH/MPIAfiw18mn2rgs8fC9Xqt21yWGCoC0ke8X8+j9HA1by2yZyXctlpK0Vg?= =?us-ascii?Q?Ox+ZjamlffFCvG8IFWfxHIgT9PfdN7pRAg+FFDxg6haI2V7mDxCRJxoLwtVJ?= =?us-ascii?Q?0n57ESGmruar6DVZgEXx3/Q0BW9TpA3WPfAjSAe9o73YS/evFUcM0r3lmis0?= =?us-ascii?Q?OaaZ721lOK3BIe5NBlUE534ttfjyZ+j4fnuQnyEqDkI9oRvv5Umiupy8nkGo?= =?us-ascii?Q?BOL2Mnm1waS6h1z3jIXlLEJ8zIFB0PNs62HLl+3laFEhFkGBRerr68Fv9GE5?= =?us-ascii?Q?XEwAgIYThnTR2nHtWJa8AIs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5e35426-6cbd-4ef1-dd3b-08d9d8c8d030 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:45.0995 (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: NPlYHVlgdvegJ8hhsna4R5dBRs50FnahCpiEHYhKbxKAZ4+L9VCWjfbiDFbiCp2u2OIeAYwzUapTWOHoLPNCdg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3047 Content-Type: text/plain; charset="utf-8" This patch added four basic 'ip mptcp' wrappers: pm_nl_set_limits() pm_nl_add_endpoint() pm_nl_del_endpoint() pm_nl_flush_endpoint(). Wraped the PM netlink commands 'ip mptcp' and 'pm_nl_ctl' in them, and used a new argument 'ip_mptcp' to choose which one to use for setting the PM limits, adding or deleting the PM endpoint. Used the wrappers in all the selftests in mptcp_join.sh instead of using the pm_nl_ctl commands directly. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 773 ++++++++++-------- 1 file changed, 425 insertions(+), 348 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index bb5fa814c05a..143cf1ced488 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -15,6 +15,7 @@ timeout_test=3D$((timeout_poll * 2 + 1)) mptcp_connect=3D"" capture=3D0 checksum=3D0 +ip_mptcp=3D0 do_all_tests=3D1 =20 TEST_COUNT=3D0 @@ -296,6 +297,82 @@ wait_rm_addr() done } =20 +pm_nl_set_limits() +{ + local ns=3D$1 + local addrs=3D$2 + local subflows=3D$3 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp limits set add_addr_accepted $addrs subflows $subflows + else + ip netns exec $ns ./pm_nl_ctl limits $addrs $subflows + fi +} + +pm_nl_add_endpoint() +{ + local ns=3D$1 + local addr=3D$2 + local flags + local port + local dev + local id + local nr=3D2 + + for p in $@ + do + if [ $p =3D "flags" ]; then + eval _flags=3D\$"$nr" + [ ! -z $_flags ]; flags=3D"flags $_flags" + fi + if [ $p =3D "dev" ]; then + eval _dev=3D\$"$nr" + [ ! -z $_dev ]; dev=3D"dev $_dev" + fi + if [ $p =3D "id" ]; then + eval _id=3D\$"$nr" + [ ! -z $_id ]; id=3D"id $_id" + fi + if [ $p =3D "port" ]; then + eval _port=3D\$"$nr" + [ ! -z $_port ]; port=3D"port $_port" + fi + + let nr+=3D1 + done + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint add $addr ${_flags//","/" "} $dev $id $port + else + ip netns exec $ns ./pm_nl_ctl add $addr $flags $dev $id $port + fi +} + +pm_nl_del_endpoint() +{ + local ns=3D$1 + local id=3D$2 + local addr=3D$3 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint delete id $id $addr + else + ip netns exec $ns ./pm_nl_ctl del $id $addr + fi +} + +pm_nl_flush_endpoint() +{ + local ns=3D$1 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint flush + else + ip netns exec $ns ./pm_nl_ctl flush + fi +} + do_transfer() { listener_ns=3D"$1" @@ -396,7 +473,7 @@ do_transfer() else addr=3D"10.0.$counter.1" fi - ip netns exec $ns1 ./pm_nl_ctl add $addr flags signal + pm_nl_add_endpoint $ns1 $addr flags signal let counter+=3D1 let add_nr_ns1-=3D1 done @@ -411,16 +488,16 @@ do_transfer() do id=3D${dump[$pos]} rm_addr=3D$(rm_addr_count ${connector_ns}) - ip netns exec ${listener_ns} ./pm_nl_ctl del $id + pm_nl_del_endpoint ${listener_ns} $id wait_rm_addr ${connector_ns} ${rm_addr} let counter+=3D1 let pos+=3D5 done fi elif [ $rm_nr_ns1 -eq 8 ]; then - ip netns exec ${listener_ns} ./pm_nl_ctl flush + pm_nl_flush_endpoint ${listener_ns} elif [ $rm_nr_ns1 -eq 9 ]; then - ip netns exec ${listener_ns} ./pm_nl_ctl del 0 ${connect_addr} + pm_nl_del_endpoint ${listener_ns} 0 ${connect_addr} fi fi =20 @@ -444,7 +521,7 @@ do_transfer() else addr=3D"10.0.$counter.2" fi - ip netns exec $ns2 ./pm_nl_ctl add $addr flags $flags + pm_nl_add_endpoint $ns2 $addr flags $flags let counter+=3D1 let add_nr_ns2-=3D1 done @@ -460,14 +537,14 @@ do_transfer() # 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 + pm_nl_del_endpoint ${connector_ns} $id wait_rm_addr ${listener_ns} ${rm_addr} let counter+=3D1 let pos+=3D5 done fi elif [ $rm_nr_ns2 -eq 8 ]; then - ip netns exec ${connector_ns} ./pm_nl_ctl flush + pm_nl_flush_endpoint ${connector_ns} elif [ $rm_nr_ns2 -eq 9 ]; then local addr if is_v6 "${connect_addr}"; then @@ -475,7 +552,7 @@ do_transfer() else addr=3D"10.0.1.2" fi - ip netns exec ${connector_ns} ./pm_nl_ctl del 0 $addr + pm_nl_del_endpoint ${connector_ns} 0 $addr fi fi =20 @@ -1042,51 +1119,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 + pm_nl_set_limits $ns1 0 0 + pm_nl_set_limits $ns2 0 0 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, limited by client" 0 0 0 =20 # 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 + pm_nl_set_limits $ns1 0 0 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow dev ns2eth3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow, dev" 1 1 1 } @@ -1096,28 +1173,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow 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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow 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 @@ -1126,9 +1203,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 @@ -1138,7 +1215,7 @@ subflows_error_tests() =20 # mpj subflow will be in TW after the reset wait_for_tw $ns2 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow wait =20 # additional subflow could be created only if the PM select @@ -1150,16 +1227,16 @@ signal_address_tests() { # add_address, unused reset - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "unused signal address" 0 0 0 chk_add_nr 1 1 =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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address" 1 1 1 chk_add_nr 1 1 @@ -1169,59 +1246,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 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal" 2 2 2 chk_add_nr 1 1 =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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow 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 + pm_nl_set_limits $ns1 3 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal addresses" 3 3 3 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 + pm_nl_set_limits $ns1 3 3 + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.14.1 flags signal + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal invalid addresses" 1 1 1 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 + pm_nl_set_limits $ns1 4 4 + pm_nl_set_limits $ns2 4 4 + pm_nl_add_endpoint $ns1 10.0.1.1 flags signal + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_add_endpoint $ns2 10.0.1.2 flags signal + pm_nl_add_endpoint $ns2 10.0.2.2 flags signal + pm_nl_add_endpoint $ns2 10.0.3.2 flags signal + pm_nl_add_endpoint $ns2 10.0.4.2 flags signal run_tests $ns1 $ns2 10.0.1.1 =20 # the server will not signal the address terminating @@ -1241,11 +1318,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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "multiple flows, signal, link failure" 3 3 3 chk_add_nr 1 1 @@ -1255,11 +1332,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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr "multi flows, signal, bidi, link fail" 3 3 3 chk_add_nr 1 1 @@ -1269,11 +1346,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal + pm_nl_set_limits $ns2 1 2 export FAILING_LINKS=3D"1" - ip netns exec $ns2 ./pm_nl_ctl add 10.0.3.2 dev ns2eth3 flags subflow,bac= kup + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "backup subflow unused, link failure" 2 2 2 chk_add_nr 1 1 @@ -1283,10 +1360,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup export FAILING_LINKS=3D"1 2" run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr "backup flow used, multi links fail" 2 2 2 @@ -1298,10 +1375,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr "backup flow used, bidi, link failure" 2 2 2 chk_add_nr 1 1 @@ -1313,38 +1390,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal run_tests $ns1 $ns2 dead:beef:1::1 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 + pm_nl_set_limits $ns1 2 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 0 0 0 least chk_join_nr "signal addresses, ADD_ADDR timeout" 2 2 2 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 + pm_nl_set_limits $ns1 2 2 + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 0 0 0 least chk_join_nr "invalid address, ADD_ADDR timeout" 1 1 1 chk_add_nr 8 0 @@ -1354,28 +1431,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 1 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 @@ -1383,10 +1460,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 @@ -1394,11 +1471,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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow 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 @@ -1406,11 +1483,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 + pm_nl_set_limits $ns1 3 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow chk_join_nr "remove addresses" 3 3 3 chk_add_nr 3 3 @@ -1418,11 +1495,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 + pm_nl_set_limits $ns1 3 3 + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.14.1 flags signal + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -3 0 slow chk_join_nr "remove invalid addresses" 1 1 1 chk_add_nr 3 3 @@ -1430,11 +1507,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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow 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 @@ -1442,22 +1519,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 + pm_nl_set_limits $ns1 3 3 + pm_nl_set_limits $ns2 3 3 + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush subflows" 3 3 3 chk_rm_nr 3 3 =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 + pm_nl_set_limits $ns1 3 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal id 250 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.4.1 flags signal + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush addresses" 3 3 3 chk_add_nr 3 3 @@ -1465,11 +1542,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 + pm_nl_set_limits $ns1 3 3 + pm_nl_add_endpoint $ns1 10.0.12.1 flags signal + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal + pm_nl_add_endpoint $ns1 10.0.14.1 flags signal + pm_nl_set_limits $ns2 3 3 run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow chk_join_nr "flush invalid addresses" 1 1 1 chk_add_nr 3 3 @@ -1477,18 +1554,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 1 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 @@ -1499,37 +1576,37 @@ add_tests() { # add single subflow reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow chk_join_nr "add single subflow" 1 1 1 =20 # add signal address reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow chk_join_nr "add signal address" 1 1 1 chk_add_nr 1 1 =20 # add multiple subflows reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow chk_join_nr "add multiple subflows" 2 2 2 =20 # add multiple subflows IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 0 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow chk_join_nr "add multiple subflows IPv6" 2 2 2 =20 # add multiple addresses IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl limits 0 2 - ip netns exec $ns2 ./pm_nl_ctl limits 2 2 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow chk_join_nr "add multiple addresses IPv6" 2 2 2 chk_add_nr 2 2 @@ -1539,33 +1616,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 dev ns2eth3 flags subfl= ow + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "single subflow IPv6" 1 1 1 =20 # add_address, unused IPv6 reset - ip netns exec $ns1 ./pm_nl_ctl add dead:beef:2::1 flags signal + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow chk_join_nr "unused signal address IPv6" 0 0 0 chk_add_nr 1 1 =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 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 dead:beef:1::1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow chk_join_nr "remove single address IPv6" 1 1 1 chk_add_nr 1 1 @@ -1573,10 +1650,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 dev ns2eth3 flags subfl= ow + pm_nl_set_limits $ns1 0 2 + pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow 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 @@ -1587,76 +1664,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "single subflow IPv4-mapped" 1 1 1 =20 # 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal run_tests $ns1 $ns2 "::ffff:10.0.1.1" chk_join_nr "signal address IPv4-mapped" 1 1 1 chk_add_nr 1 1 =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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 "::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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 "::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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 "::ffff:10.0.3.2" flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "single subflow v6-map-v4" 1 1 1 =20 # 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 "::ffff:10.0.2.1" flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address v6-map-v4" 1 1 1 chk_add_nr 1 1 =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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN with diff families v4-v6" 0 0 0 =20 # 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 dead:beef:2::10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "no JOIN with diff families v4-v6-2" 0 0 0 =20 # 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr "no JOIN with diff families v6-v4" 0 0 0 } @@ -1665,18 +1742,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 1 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 @@ -1684,9 +1761,9 @@ backup_tests() =20 # single address with port, 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 port 10100 - ip netns exec $ns2 ./pm_nl_ctl limits 1 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_set_limits $ns2 1 1 run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "single address with port, backup" 1 1 1 chk_add_nr 1 1 @@ -1697,28 +1774,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal 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 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal with port" 2 2 2 chk_add_nr 1 1 1 =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 + pm_nl_set_limits $ns1 0 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_set_limits $ns2 1 1 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 @@ -1726,10 +1803,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 @@ -1737,11 +1814,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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow 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 @@ -1749,20 +1826,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 + pm_nl_set_limits $ns1 2 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10100 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple addresses with port" 2 2 2 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 + pm_nl_set_limits $ns1 2 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 + pm_nl_add_endpoint $ns1 10.0.3.1 flags signal port 10101 + pm_nl_set_limits $ns2 2 2 run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "multiple addresses with ports" 2 2 2 chk_add_nr 2 2 2 @@ -1772,56 +1849,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 1 2 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and signal w cookies" 2 2 2 chk_add_nr 1 1 =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 + pm_nl_set_limits $ns1 0 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow + pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflows and signal w. cookies" 3 3 3 chk_add_nr 1 1 @@ -1831,29 +1908,29 @@ checksum_tests() { # checksum test 0 0 reset_with_checksum 0 0 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 0 0" =20 # checksum test 1 1 reset_with_checksum 1 1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 1 1" =20 # checksum test 0 1 reset_with_checksum 0 1 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 0 1" =20 # checksum test 1 0 reset_with_checksum 1 0 - ip netns exec $ns1 ./pm_nl_ctl limits 0 1 - ip netns exec $ns2 ./pm_nl_ctl limits 0 1 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 run_tests $ns1 $ns2 10.0.1.1 chk_csum_nr "checksum test 1 0" } @@ -1862,26 +1939,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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "signal address allow join id0 ns1" 1 1 1 chk_add_nr 1 1 @@ -1889,28 +1966,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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 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 + pm_nl_set_limits $ns1 2 2 + pm_nl_set_limits $ns2 2 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and address allow join id0 1" 2 2 2 =20 # 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 + pm_nl_set_limits $ns1 2 2 + pm_nl_set_limits $ns2 2 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "subflow and address allow join id0 2" 1 1 1 } @@ -1921,10 +1998,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 + pm_nl_set_limits $ns1 0 4 + pm_nl_set_limits $ns2 1 4 + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh 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 @@ -1933,9 +2010,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 + pm_nl_set_limits $ns1 1 3 + pm_nl_set_limits $ns2 1 3 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal 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 @@ -1944,9 +2021,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 + pm_nl_set_limits $ns1 2 5 + pm_nl_set_limits $ns2 1 5 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal 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 @@ -1956,36 +2033,36 @@ 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 + pm_nl_set_limits $ns1 2 4 + pm_nl_set_limits $ns2 1 4 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal 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 =20 # set fullmesh flag reset - ip netns exec $ns1 ./pm_nl_ctl limits 4 4 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow - ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + pm_nl_set_limits $ns1 4 4 + pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow + pm_nl_set_limits $ns2 4 4 run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh chk_join_nr "set fullmesh flag test" 2 2 2 chk_rm_nr 0 1 =20 # set nofullmesh flag reset - ip netns exec $ns1 ./pm_nl_ctl limits 4 4 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow,fullmesh - ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + pm_nl_set_limits $ns1 4 4 + pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh + pm_nl_set_limits $ns2 4 4 run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh chk_join_nr "set nofullmesh flag test" 2 2 2 chk_rm_nr 0 1 =20 # set backup,fullmesh flags reset - ip netns exec $ns1 ./pm_nl_ctl limits 4 4 - ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow - ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + pm_nl_set_limits $ns1 4 4 + pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow + pm_nl_set_limits $ns2 4 4 run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh chk_join_nr "set backup,fullmesh flags test" 2 2 2 chk_prio_nr 0 1 @@ -1993,9 +2070,9 @@ fullmesh_tests() =20 # set nobackup,nofullmesh flags reset - ip netns exec $ns1 ./pm_nl_ctl limits 4 4 - ip netns exec $ns2 ./pm_nl_ctl limits 4 4 - ip netns exec $ns2 ./pm_nl_ctl add 10.0.2.2 flags subflow,backup,fullmesh + pm_nl_set_limits $ns1 4 4 + pm_nl_set_limits $ns2 4 4 + pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh chk_join_nr "set nobackup,nofullmesh flags test" 2 2 2 chk_prio_nr 0 1 @@ -2007,9 +2084,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type prevents add_addr" 0 0 0 chk_add_nr 0 0 @@ -2017,9 +2094,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 + pm_nl_set_limits $ns1 0 2 + pm_nl_set_limits $ns2 0 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal run_tests $ns1 $ns2 10.0.1.1 chk_join_nr "userspace pm type echoes add_addr" 0 0 0 chk_add_nr 1 1 @@ -2027,27 +2104,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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 + pm_nl_set_limits $ns1 1 1 + pm_nl_set_limits $ns2 1 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow 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 @@ -2056,9 +2133,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 + pm_nl_set_limits $ns1 0 1 + pm_nl_set_limits $ns2 0 1 + pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 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 Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829796jah; Sun, 16 Jan 2022 00:18:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJwIM91D0qDUqVCXkAHYTWLOXMz1bb43ih21HgmDL4EnIBvAXlMmMx1Y92wIy9s1kxZ7qx4I X-Received: by 2002:a5b:281:: with SMTP id x1mr20516232ybl.41.1642321137799; Sun, 16 Jan 2022 00:18:57 -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 l190si420358ybf.461.2022.01.16.00.18.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:18:57 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3182-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=OEDacYBp; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3182-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3182-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 705311C0E85 for ; Sun, 16 Jan 2022 08:18:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6B34A2CA2; Sun, 16 Jan 2022 08:18:56 +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 417BD2CA0 for ; Sun, 16 Jan 2022 08:18:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321133; 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=5hq5TfBwMB7L6nO+L/oifUm//GUOwXDS6xSG6XfrvEg=; b=OEDacYBpO2BmYQhiWln99Zk6zW4VqxXl2T7kAuSkKLWSam3teuaYNjKcgmbULC7PPF/JK3 x8awunOJb56zrQTwvndbt4nGl2CC936g74GGdpl/hDb35logsl8FrOVmIs4hico/QexOkD R5tbc/TH23hbJRLN8I+JWZ4kaN5Oi2A= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2059.outbound.protection.outlook.com [104.47.4.59]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-5k3MCSx7P16cD-3L1GEUSw-1; Sun, 16 Jan 2022 09:18:52 +0100 X-MC-Unique: 5k3MCSx7P16cD-3L1GEUSw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Sr71s6FSpKywQQw+vqkwRZCUJMQwjuOrBvYw09iLtCDGOgRn7Pprr8eXbnF6IWer/mlyepSlEpnRxIz469CG/ZLW2wOAmX378nISRehbicPr1+0kNJ74dM1R2f9XgJU38qh3FtCHEguJT2pMm0LlVug009gc44U2dYUIM+YTulBHS0GyX38FOVKL5BpdNmro2QSE9p9shlvDSxc8esPciYpCFrza//gCxGLxKMaQ3ni21qProt/I5JseCCaI0N21L/LwlRCIPQpV0TP6GNUSOGI4mRfiIfLN0fDhnYCbLq+WKzsJNs17Qpq+MQxo/z9EdI/dXLih7YJUT/jkbxDwFw== 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=L8mezQIrL4XNxOglZQa+gPbornlne0UZcZeCzafcduo=; b=gA49YhkaZDxuPomEGC7gAfzm9kru+/dU1sypfP1AFsk99lKVE4cV8bYPVRApj/VjxGwK/hr+mOjwjemr6Wmvcj3YtkCQm5UTkXVdYN/p1PSpH6feG17c6AM+8oRl9MM3q+CCCK586cUv5/oCt9OMt29gmmsAWn02jq91EW/RHI/g00lIUd7pRoKSKWh0PrOweD8qWX4VnA9NYsC58/HNap2+1LH5GjIO3YZjiOJ8o7LtH9/iJ59LXXaD4AG5afYtTVNRLM2Kl7x3jUPscyBgMuya/WJgNglxCODcvgaz+n+247MQ1kJk53bSGFn8V+ZjxmaiCkJr43qQlSD4aw/gZg== 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 DB6PR04MB3047.eurprd04.prod.outlook.com (2603:10a6:6:a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Sun, 16 Jan 2022 08:18:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 08/10] selftests: mptcp: add wrapper for showing addrs Date: Sun, 16 Jan 2022 16:17:38 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0159.apcprd02.prod.outlook.com (2603:1096:201:1f::19) 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: 0816bf76-7319-4e92-721e-08d9d8c8d428 X-MS-TrafficTypeDiagnostic: DB6PR04MB3047:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: U1LhGlssWyTxR544EWYWM6Z2w4nnn8XNqtyRFofSsANCWTDYefygX2qCk1tWYcCGQZ6sFBOH2g/xRA+F/zKA2C0yRpqjL0a8PDfUg5Y00uXHXNch4BklWi651cuBm7rtVAzZPUGJFNmhAFzV5GJOAyrST9npUWHoDvmdJzAC2XouEiOKLD6oZSKUrrgtHkhDa9IYCRNyfvOQf7c/eriqBhMUifnFyfl68E37LtxqULHt218RcfQ9lyJXXEWgv6db2vKirCunFMMoz98Rz6kxpaSJnDN6jMmUknj9oc+HmfQCS9jpmbizddS8nqzJrmEkA/xwRR8QPe9fYM91AQZ51LV8VOop4+lqNlKHIRakg2Yk27TAPbwK/zOx3t8AyepxAWSM0r0bBroDt9NBYxSNjTD5yNsu7OOmy7323R7Aeo5f6BlIo1eaRRE+zalLBd8oZ5H4I2Z7xef7/iE8+56goxNUMwuzOy6ZHc4WqKdvHm3GxIDnpZKnWrx5nOhiX1oNjuwY7LpwOqV6WNzERN3zzjCbIKvjb176jh7VJzJt5ynjGvUdkIQ34HgFA2C0z64NJQ+tixWdM1K0+7MxMR0EU1TEIUwR5wW4gxnKBG4mh36NMAcQ5865mEMNWDDFFnnqMrqiY5zj58KtS0TiFpF1ZW/30xVoH7tBIt+40jfI7nukEcMTzUamDOinjOEeu8cn 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)(26005)(107886003)(4326008)(8936002)(6512007)(5660300002)(6506007)(83380400001)(86362001)(508600001)(6666004)(6916009)(44832011)(36756003)(8676002)(66556008)(186003)(66476007)(66946007)(6486002)(2906002)(38100700002)(316002)(2616005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?IrdAR+qgTXNHG8m+UpqlA198eXduL+F+4RBEUlXwxvTUjJT6zS02YNJXpVGu?= =?us-ascii?Q?eDpKqv/k/2s62zGaER8NmaPia+bxDgzc9kaDelz7HkEdaRHHdS9w3jsVYRWL?= =?us-ascii?Q?bn69IM24h1SSIPg71MH/fFnj8HcOqr6S32vcV8c6xGB5zFfiZb15oJHECKQ9?= =?us-ascii?Q?nGQ/2Fm72dledcTpK28WGZ7u8e3+o7SyTQS5Z7we39DeaN/ZciNEhXv11x/+?= =?us-ascii?Q?U8lc4iGKbrPIGBenu91zGNE34kfR5W38ywl3iQZHrMwdZzSB41p2Lt6uYXdX?= =?us-ascii?Q?pzNK63v19tC5EDZlWNCqTik4xBLrvJF85D7bdwgF7+1nh+I/Lk8U+sb1TmXd?= =?us-ascii?Q?3gH9gU8Wk5xsuD6ojdyglG4O4CZ+MvxoA8sz+oBUIVJbIkpixQC3U3TjcLJI?= =?us-ascii?Q?EychuKeGu3epMeFHChJRtwj6nedrf2zSdjqMIMUeCVQV5RJz8vZZvYMXPhsK?= =?us-ascii?Q?ceik/mYNOSUPjQ0EtreT6lSP8cKma/zbG6DdXHJIDP0VK22gWNAt/9H79WyF?= =?us-ascii?Q?jz4ee423OCLNnIclC9ZjzLX1/taZ7FY5I+lER+AimQR67rSMhFWCwNhxOPK8?= =?us-ascii?Q?aMZ/1D64rmQp8HV8rUT0aH9GfLoydNIKXGXGXJf/LKMgILRf79pu25JS4AsY?= =?us-ascii?Q?I4ig4twNgzswKq3CWkQ6Ni24Q0Ofc60uh9XZ+uBfalJsj3vUxrzX5J0ZkDNL?= =?us-ascii?Q?qiUwYJ8ERcQ9o6aI0jyI5qoZaMmDjbjg4BfuFuroI0IOzvwhnnYgBkyiZVuT?= =?us-ascii?Q?3FyF+nnHDccEi0IYfzPoPVOS52EoP1s8XoqtfYx7C0GeZjKu0YvhDiZyROw8?= =?us-ascii?Q?1kPTO6O82DfIHfW4eihcjhbgkkltqaK0rp8f1/4qblKrjhXLMHtHTUyBZkkx?= =?us-ascii?Q?utokAsjMyoVmccwkFRQmJv+kaITUSW5EC6reOa3f3SWOu2GBeJyhFwut+uEC?= =?us-ascii?Q?fGISWPTNDVrbHhSuJqaaQOOvXM1+AAtqmGih3jmzU5iagE5Yp44yCoADEKLs?= =?us-ascii?Q?+KPe7VYtznNyqv8cpoXMIsyqd9a+bW7IV3SS1wbhHiS0TCG8mE5gNgVvLOWM?= =?us-ascii?Q?F3xQoioVjcUdQ1b1e0IwNm1kw3DtgOTtGrxIPde8Kk9p5cPXoyvLrpgkdX9t?= =?us-ascii?Q?XubqGawdEaxgr+nI6USsLiMWIUl6sMCMR0/Eo2DyQlAIWhqwMriiLFVyMPlK?= =?us-ascii?Q?Gw42eSWnkycCGrGQLpUI2fLt6j99shBLzUXWRDyXvpG9HB6HzgmgnzB1inRJ?= =?us-ascii?Q?CGNu4m7mSOJYtnsGKGq4V68EouO28Bkc9H5vaPbeGjeph4LTjlcW53lqz/+1?= =?us-ascii?Q?BwCXgAkpZzOgr4NR+V4fBDvZTju5H5Wr+HMkSeReqGyFenUGkKwvPy1MWIPp?= =?us-ascii?Q?Yf7vO7iZfZ2LEh4PweaQ4V47ReJ4DC1XxJDlDRVoiT9Y6MRWTpXGgaSMrqc3?= =?us-ascii?Q?fIeqYa7sLD9/gC+UiiK+bOEoeliFlR8v7k2sga01Q2FN/kQBBd55U79hZtxC?= =?us-ascii?Q?d4JOfbzjKbbyvToZUsn2dRk6b06BkXs7LqNeFLehDljM5cU/IpJJWAZEyj20?= =?us-ascii?Q?Puyv67v9lThBC/JepqJajnFt/AczMtVdlnJ/aW/g1K6dS4kfEXUezmRXzbBf?= =?us-ascii?Q?wGeBKnkyoy/zDKawIW7Obs4=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0816bf76-7319-4e92-721e-08d9d8c8d428 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:51.6927 (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: JNHOXYP+q1zLKvBFFwMAaa+bfH0z5lvEBhMSs2gjVsG3ej2iBvMXUPqAmEH1NpfzqwsnOBXxqPFSVkUpM8hAFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3047 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_show_endpoints(), wraped the PM netlink commands 'ip mptcp endpoint show' and 'pm_nl_ctl dump' in it, used a new argument 'ip_mptcp' to choose which one to use to show all the PM endpoints. Used this wrapper in do_transfer() instead of using the pm_nl_ctl commands directly. The original 'pos+=3D5' in the remoing tests only works for the output of 'pm_nl_ctl show': id 1 flags subflow 10.0.1.1 It dosen't work for the output of 'ip mptcp endpoint show': 10.0.1.1 id 1 subflow So implemented a more flexible approach to get the address ID from the PM dump output to fit for both commands. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 78 ++++++++++++------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 143cf1ced488..84c03267ea9f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -373,6 +373,17 @@ pm_nl_flush_endpoint() fi } =20 +pm_nl_show_endpoints() +{ + local ns=3D$1 + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint show + else + ip netns exec $ns ./pm_nl_ctl dump + fi +} + do_transfer() { listener_ns=3D"$1" @@ -480,20 +491,25 @@ do_transfer() elif [ $addr_nr_ns1 -lt 0 ]; then let rm_nr_ns1=3D-addr_nr_ns1 if [ $rm_nr_ns1 -lt 8 ]; then - counter=3D1 - pos=3D1 - dump=3D(`ip netns exec ${listener_ns} ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - while [ $counter -le $rm_nr_ns1 ] - do - id=3D${dump[$pos]} - rm_addr=3D$(rm_addr_count ${connector_ns}) - pm_nl_del_endpoint ${listener_ns} $id - wait_rm_addr ${connector_ns} ${rm_addr} - let counter+=3D1 - let pos+=3D5 + counter=3D0 + pm_nl_show_endpoints ${listener_ns} | while read line; do + local arr=3D($line) + local nr=3D0 + + for i in ${arr[@]}; do + if [ $i =3D "id" ]; then + if [ $counter -eq $rm_nr_ns1 ]; then + break + fi + id=3D${arr[$nr+1]} + rm_addr=3D$(rm_addr_count ${connector_ns}) + pm_nl_del_endpoint ${listener_ns} $id + wait_rm_addr ${connector_ns} ${rm_addr} + let counter+=3D1 + fi + let nr+=3D1 done - fi + done elif [ $rm_nr_ns1 -eq 8 ]; then pm_nl_flush_endpoint ${listener_ns} elif [ $rm_nr_ns1 -eq 9 ]; then @@ -528,21 +544,27 @@ do_transfer() elif [ $addr_nr_ns2 -lt 0 ]; then let rm_nr_ns2=3D-addr_nr_ns2 if [ $rm_nr_ns2 -lt 8 ]; then - counter=3D1 - pos=3D1 - dump=3D(`ip netns exec ${connector_ns} ./pm_nl_ctl dump`) - if [ ${#dump[@]} -gt 0 ]; then - while [ $counter -le $rm_nr_ns2 ] - do - # rm_addr are serialized, allow the previous one to complete - id=3D${dump[$pos]} - rm_addr=3D$(rm_addr_count ${listener_ns}) - pm_nl_del_endpoint ${connector_ns} $id - wait_rm_addr ${listener_ns} ${rm_addr} - let counter+=3D1 - let pos+=3D5 + counter=3D0 + pm_nl_show_endpoints ${connector_ns} | while read line; do + local arr=3D($line) + local nr=3D0 + + for i in ${arr[@]}; do + if [ $i =3D "id" ]; then + if [ $counter -eq $rm_nr_ns2 ]; then + break + fi + # rm_addr are serialized, allow the previous one to + # complete + id=3D${arr[$nr+1]} + rm_addr=3D$(rm_addr_count ${listener_ns}) + pm_nl_del_endpoint ${connector_ns} $id + wait_rm_addr ${listener_ns} ${rm_addr} + let counter+=3D1 + fi + let nr+=3D1 done - fi + done elif [ $rm_nr_ns2 -eq 8 ]; then pm_nl_flush_endpoint ${connector_ns} elif [ $rm_nr_ns2 -eq 9 ]; then @@ -559,7 +581,7 @@ do_transfer() if [ ! -z $sflags ]; then sleep 1 for netns in "$ns1" "$ns2"; do - ip netns exec $netns ./pm_nl_ctl dump | while read line; do + pm_nl_show_endpoints $netns | while read line; do local arr=3D($line) local addr local port=3D0 --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829840jah; Sun, 16 Jan 2022 00:19:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJwiztbJmUHjHZVUREYXsG+tK5VAv18cWalUJ5TSoVOnNhzc4TgQocnMfOosPHYteBu1MV08 X-Received: by 2002:a05:6902:1025:: with SMTP id x5mr21752188ybt.525.1642321144983; Sun, 16 Jan 2022 00:19:04 -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 x14si7593127ybr.531.2022.01.16.00.19.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:19:04 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3183-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=Vu8Vfyf2; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3183-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3183-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 8F3F21C0DAD for ; Sun, 16 Jan 2022 08:19:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E4A62CA1; Sun, 16 Jan 2022 08:19:03 +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 DEFB72CA0 for ; Sun, 16 Jan 2022 08:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321140; 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=mn33dTqazdkzJodIth9TiRKaZaLluMeczHDht9qxAuI=; b=Vu8Vfyf2rUx2rBi5wXjx3BVNbkcurRTSIvJN9g3Zz31SDCNMb5ux2yxmm44O5l/HI/KyFr YVy0nZbCp2PdTT72apFBNyu90Fi6pUYVTjjirVBlNdd8to109PRXJStiheKbzK9bQFN92i q6SXBvBSoZUlze4j4aRn5jXs/ZnplO8= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2055.outbound.protection.outlook.com [104.47.10.55]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-22-0GtXhb_mNL2gB3_eM42IvQ-1; Sun, 16 Jan 2022 09:18:59 +0100 X-MC-Unique: 0GtXhb_mNL2gB3_eM42IvQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mtPlcEIexLpEXCPmNxj9bflVFC0NKO8a1ZzICNXaHXOyZIs+ldllJpaJLVJUB1ZUze/8+mVq10k+zRTlM6uGTq8xNm7SZ7lJUfqWQ+Dxac8akubzbSAIvwUwLsan3crtZHPvVAHcv30nBUdPcJ9dG5JkyoQlhOMARCMmzZQrmDqzGRc5sirN5S+ZFfZho82LA7ATHABsssi48O2csB8Y9ZA2TdJc8y6PbnNW0Tk4Vfr7YFGGEAHGaqV7mdJoRtnP3Zmm6NdeVvPeHVaQ1iXGvRdkNI84VbkIeKj4uDAl2jIYuv1iKZ/99j4xsvtGCDgyvaM+gFunAPH0HP2MPCZ3Yg== 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=ytlFxzOBosESGWXeT4xjih6cfuIlrBnM9mHCSe4Chpo=; b=SDSaIRrElAgdiOeumLYwEMpRl8SPQHRra0+5EWp8VqLjO9yFgIJCxdOE4BQsu/UYXGhMXb523DIbLPtdCyaTdTgpTo++9LA7G28h7stS03ZIgpA9zWdgLzcrvR1++LlBgQHk5XsWc00jp0sYbsZgOM7KW7y1c43Os4UjWsSvczP5aM6mXq1pwzdW+Cmx/MgZ/1el26l22HRvlTNMqJ8pkNJpzBR/ICzB5L6q4ERgJBkO9Y6Yud76COW+/cfyszTuQaZk32QLDzYehRPMVpcBbd78WIJky3MXJ9bvaXCPd5gNyVleh9e1T6DAiiR9XiuaRXHZsoWtSL9A4qZ0qRkE3w== 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 DB6PR04MB3047.eurprd04.prod.outlook.com (2603:10a6:6:a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Sun, 16 Jan 2022 08:18:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:18:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 09/10] selftests: mptcp: add wrapper for setting flags Date: Sun, 16 Jan 2022 16:17:39 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0075.apcprd04.prod.outlook.com (2603:1096:202:15::19) 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: cc82f30c-ad80-4fd3-b928-08d9d8c8d811 X-MS-TrafficTypeDiagnostic: DB6PR04MB3047:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ouKSQ8WssPyywg7MnLcFWGyjbpOouoqdtkSCXGEMtAewWQptAplqY97cPYigZ+zisLFY8VKl8VULVDvZlE2v+y5Y8TwloyTZB9kFM7ba3OBrh6yZVxNFWdS+5nABHSj6R+zG5uP05RBtqyUA01VNgMwULjPK20iCQyuykhAbUDaFXvk3BS7hs9JGNxrh8IfY1EAFhFXNc7msMxLIPbrnr+iwlrAGYBAIvwSovWMsq9YJj8QclWcOmS157/MBGUGLr0LQsZo+b3qvUHy8LEXLXkahNO803bqQ6cPXwwF9MJG4OyPHAEirDHH7dG2wm0eXhXekUsYZsbkegAJzu9I0Ho2ebY9Xj9RmAY368n0A6bJDld8rkq1WUpGnkNfbPRnt9TEvkKApaqPcvV3qMxReDp0IEyNSl9HVO6NpZiZJdKj60Q/hi7711dCZjvbnMqSS27dm77hG6TuzmfkhK/fsWqU+KJKK/UIwLK6cMvuIvEpy7D2d8dnsBOq2Mu1rqIfjdzVdQ1jgqIO5LiqHxrRXbZYrObuzKTNhqYQJ35Nhe3T5sdk0DQBm629CEtUN5frEQbBYHvOUCQterbBNLGuaOMRzNKJNq0bw/0OT3bZeNooRx2nXp3aH33mFaeFvG2p2WIVoKEZe2xyRNhYgC/hiMWsL3et/y1dYbovELZfoN1d9gNzVd3p/L2s6oE5v6+x0 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)(26005)(107886003)(4326008)(8936002)(6512007)(5660300002)(6506007)(83380400001)(86362001)(508600001)(6666004)(6916009)(44832011)(36756003)(8676002)(66556008)(186003)(66476007)(66946007)(6486002)(2906002)(38100700002)(316002)(2616005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SBllOlJ2+mzA0PiJoY7GLpQcBYLE75brrZ4Pr1X4z6szks52Rj77w+O7TgcP?= =?us-ascii?Q?csLG5BcLIzelexa3taE2Y5UGKm9P5CROBCgySej8SzNAH6r1A3Tm6lwkCxFY?= =?us-ascii?Q?5+8xjxfETaGPOUZoAA9A0m4Gdtip5yBzZfvFb66LhypTsGTa14JLlA1/pL8a?= =?us-ascii?Q?VMLFd0cIDmdLwTI5OdKw2QN3//wNdbZS/BAlyMS9XE3y2bFx2W4Rg4yOoXlo?= =?us-ascii?Q?CbOTxFzMiTUxyG6PBphbewSPDC8vhskDxB8et5HONfEa+0WYHcpQv00aNUkO?= =?us-ascii?Q?blX/st4OGdNRXioLmd5ZpLcltZ6EOFpcNV1jGFtshgvryY+Z9Q+IqSoPEiw2?= =?us-ascii?Q?ZhO6l+u89L0G8mzhT4Pyh4Q8ElosGCCLd5w2yLVyL6qT+YvBUgT2Poql9Vq4?= =?us-ascii?Q?9lOXO7B4cLlb7Q6IAQdqGSMGmWuz5WxGyr2CYh8ZOwBnji7Vmbm5nRxPHK2S?= =?us-ascii?Q?oA3qU3V4cHWb89x7tS4fdRV0k7ka5CwmP3qCxq4trXo96SymfHhoMpTseEGj?= =?us-ascii?Q?VtZF6MBbqa8B7GR2eolJOal5bF6xoXF6Kozw3tJsmEYtA00xPPhIy91933yd?= =?us-ascii?Q?0TUolLCkPt+Eu0amwHsRbs/PEa4bb0rktyGmAm4NlUq5REU9Eb/tdnq+CB+z?= =?us-ascii?Q?jKWBu+p9K5eVW2Sw00tBha/rkdD+IF2lEANqV8HRomSZ9HAWRTUgNyZ0DsD4?= =?us-ascii?Q?EoKKtgltdfGwKyR57e5T9RnNCMBV5Ds8S8eYm18w7wEryKxDRFFU+t+kPHJo?= =?us-ascii?Q?UV34dZwMWUO+bdb3JF4dx+39PzmSZLJLrjEKhNEJXV1iqpJE0vAbLqJxFMOe?= =?us-ascii?Q?NZsvO06PZicUpc51jd4ese3XblSDQeIMB+BVx3hQjlnbXX+l1XN8MCnnWN4o?= =?us-ascii?Q?qnCBKq5Mg37i+SBIZeOft0YCCreXGdjwNJhnGnDmkJfgKltkndDMvUiMvDgv?= =?us-ascii?Q?tVxob5ebOsjV5RDY4KcWnQx2ctEle9HlixK8Oj2Hh118KoKXTT76GHOoda2w?= =?us-ascii?Q?LG2wdREZ2EhlAK3oOZH0buhB0WZbsEMN4kbkaSxKOsxECUe5W/smbQ8CX/1R?= =?us-ascii?Q?54bmIg7KYQqB92weHYAF+/yE+99/4Hzk3JYCVrZgrBj5kvPYe7EeUtz13oYJ?= =?us-ascii?Q?yx2pGEpz7uEj+djnBU3w7uqNbFeuqrsL67BqJYza+Dzi0BySUr9LTUfoXx7Z?= =?us-ascii?Q?qgz5/u/hYT2vOlp5pKTo/SS3wH/aSgmcpXgZIX+4sR+5xqr1vpxAxnfR56hk?= =?us-ascii?Q?sUKQhgHmJU17mfE6UZjlkyMNZG75IoPsBEkMTtd9r4td831WFPe0GSa7vxTP?= =?us-ascii?Q?lEb97lscdi4Qu+Dp5tAT060rhd6hUfaOwW0pZwMrSFP2I7slkC1inB4JLkAC?= =?us-ascii?Q?DlvKchPkyrGFjaiedo7HZp1fO1l8NihyLo5yr7LH6ejViDH7kXTo321wtqEp?= =?us-ascii?Q?vuLbGdNYmKyGfxFt1RAzXEXx4vivdwQohJl9j99XJ2DEKT6cFrwx7uMUz62N?= =?us-ascii?Q?8mHg90mxiJmSM5tIuOewrMQgLcbj1iN8W4Ham6WIT/wFxsTzRsm37Y3gmenE?= =?us-ascii?Q?W8tPJ1DqIIB3hpL0SmpzI2F4ZJmSUhDz/JVIb5u9oe2FkCinsOdhI0AC+52y?= =?us-ascii?Q?KG7jVpeALQMUd8CNgcmVr/0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc82f30c-ad80-4fd3-b928-08d9d8c8d811 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:18:58.2547 (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: uDryONj+TKM1PT+TPFbhFMwDJwd8lReGED8/9Ds5qBX8GKazRge8DcPdDc718Qd5COI2Rg7WWfVrfZWsgr3iMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3047 Content-Type: text/plain; charset="utf-8" This patch implemented a new function named pm_nl_set_endpoint(), wraped the PM netlink commands 'ip mptcp endpoint change flags' and 'pm_nl_ctl set flags' in it, and used a new argument 'ip_mptcp' to choose which one to use to set the flags of the PM endpoint. 'ip mptcp' used the ID number argument to find out the address to change flags, while 'pm_nl_ctl' used the address and port number arguments. So we need to parse the address ID from the PM dump output as well as the address and port number. Used this wrapper in do_transfer() instead of using the pm_nl_ctl command directly. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 84c03267ea9f..681a72bbca9d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -384,6 +384,22 @@ pm_nl_show_endpoints() fi } =20 +pm_nl_change_endpoint() +{ + local ns=3D$1 + local flags=3D$2 + local id=3D$3 + local addr=3D$4 + local port=3D"" + + if [ $ip_mptcp -eq 1 ]; then + ip -n $ns mptcp endpoint change id $id ${flags//","/" "} + else + [ ! -z $5 ]; port=3D"port $5" + ip netns exec $ns ./pm_nl_ctl set $addr flags $flags $port + fi +} + do_transfer() { listener_ns=3D"$1" @@ -585,7 +601,7 @@ do_transfer() local arr=3D($line) local addr local port=3D0 - local _port=3D"" + local id =20 for i in ${arr[@]}; do if is_addr $i; then @@ -594,11 +610,13 @@ do_transfer() # The minimum expected port number is 10000 if [ $i -gt 10000 ]; then port=3D$i + # The maximum id number is 255 + elif [ $i -lt 255 ]; then + id=3D$i fi fi done - [ ! -z $port ]; _port=3D"port $port" - ip netns exec $netns ./pm_nl_ctl set $addr flags $sflags $_port + pm_nl_change_endpoint $netns $sflags $id $addr $port done done fi --=20 2.31.1 From nobody Sat May 4 11:45:10 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1829899jah; Sun, 16 Jan 2022 00:19:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdTq027SjZ7GNFkk6vBRBZgmwe7eXZA9eIEZQUXF5BUavnjCmyPkT3hFR+HFuKfBfJcusf X-Received: by 2002:a25:9b43:: with SMTP id u3mr21329702ybo.589.1642321151532; Sun, 16 Jan 2022 00:19:11 -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 a11si7221ybp.47.2022.01.16.00.19.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Jan 2022 00:19:11 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3184-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=JqHDRbMG; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3184-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3184-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 1E1E21C0CBD for ; Sun, 16 Jan 2022 08:19:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ADDCF2CA0; Sun, 16 Jan 2022 08:19:09 +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 8CF1A29CA for ; Sun, 16 Jan 2022 08:19:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642321146; 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=cqdcw5kG+kgYV2hEAxVW33eGEydeKhvXo9AEVt54lPA=; b=JqHDRbMGrMk9SjkbYobhSyXwHUK8tZ35TNgnGbr7yrypQLeq2L+6nlW4Cxog5DtnBopTgK wz3A5n9+M6SZ3i75ZmBQer8U3GrFdjxUW/BuKAqoNc+GGk/lJdTFEmLht8kBufTl0vPy8x gi91zRkIogorEn4p8NM+AxEHvIjY97o= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2050.outbound.protection.outlook.com [104.47.10.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-22-E18eGiS4NtKQS4E22OEKqA-1; Sun, 16 Jan 2022 09:19:05 +0100 X-MC-Unique: E18eGiS4NtKQS4E22OEKqA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GVr+bejvoHk8WIBw4A/cosyW+VD7qdWnLhcuj4HSoK28jSuOQ7/PBu3VNJZ3gOl14wRwfWoBRqlwKurpAqhufWNcI4U4+3tPDQOUmDLhjXMZNWqsp6kZQpsOrrD6TmdTaDyFd40DO4NU0EfNfrA3G9dwmY81sF2bhDPCKLyWPxEf5rnRRvQyb+fIv4b3mnVzQbYD1ZS6XyTVcdUSUbs1dHm2rrWy7uGhK56KPJeSy51PvPYlZc6TeDnTkHOE0PVKDTgvn1Yo6P5XIh4xBVfF0sOqxrTBYDQ771qLuJzk9+o2tIFA3rOb0vbShihoLoYfkYwQ/1lvsXcn1oysjTryJA== 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=ZvqZT1qqxUHkWSDfw+iQoNwAgbp2xEWqHc0Qca/Ln4I=; b=RYg/tmb/7tC2+futP52fK9FwJ6CgDGdLk0fwYCvtOEigL8k/tFHfKHe7Qgtax2xWeEYCbeGre/lwS3ULCwXZ73LfOhjVDMzq8bFFJrPglkXAIS0DKxAfSuQ8DN6SRCz7RtMguq7eTf5FNmWHUbP7zK/ka7qAzkmMDAZuP/aSNt7xnsV96Rv9andeHoQ/Zlewzz6GpUL4wVxUMdR/DL6uZDr1xdiQJev8uDHywnkO75xitqFuEdjj8a9Jb16duGkiQ7INL6RRo/JZWG/UbduEBPnQa/JbBtrP9bl8S7gVXSUP/4tKyExkOcPvhlO1QUJhIjEAkukZLp3+LkXlc9ppUg== 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 DB6PR04MB3047.eurprd04.prod.outlook.com (2603:10a6:6:a::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.12; Sun, 16 Jan 2022 08:19:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3837:57a2:45dc:e879%3]) with mapi id 15.20.4888.013; Sun, 16 Jan 2022 08:19:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v2 10/10] selftests: mptcp: set ip_mptcp in command line Date: Sun, 16 Jan 2022 16:17:40 +0800 Message-ID: <773f54907c8b2ced601abb57046f7a55800b417e.1642320655.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0068.apcprd04.prod.outlook.com (2603:1096:202:15::12) 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: b5fd6af9-0f3a-4c39-9df4-08d9d8c8dbf8 X-MS-TrafficTypeDiagnostic: DB6PR04MB3047:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Mi2xaUi0YLdUS1Fc5oYV4Rz2zWd5eQ5XnOcVNPC6kYcbd0Noo3VJIhtmjlRKkihql+2B0Wc4U/IVm9EpHjf3d2BrLKEvKqtbyaNDND+Ff6IaoVF2tUdSPH7Lvdw7dCgnc6zhlD0bdA++zUOTWnQcgtUpoFrAnIRH6t1ClKu/vw+sq/qlqfrp//vXx3JbNXdUvFGqRPgdTfFF7UaqmIT4uyesGvkohw4uWoL8wu5csZL9RY70oAunU2ZXuULH/2SX8PFJNnXRngC9NbTA0oLMsZUroj5uyzhzlQNMMzLtO5Pk0NvR0lIKBF9HUmHeGBUBDn+cvrJ04HVaNEsj7DSy0SSufQ9gmVfoY2QCmaqlmI/86XeB9rlfKZl14ksI0ZnSyCs+ztWF3lgV2hERrKI06UWOyVexmVEGHunXyDqFXZ73//WBVqcijL7SJduYAIBGVjR7BEov8vef017f13s0VXr1Rr3lCujf6AHzUBE/gsZKPChmMfrloetbjZzQV1b16Ot1TIXmOzN/LURxhmK2CzW8MBRXVjwaoDvRHK26LJXy95sjp+fRRNWDJTp+61DG4zrmtbKxALa4+NkYqGXrA+Eyvr5coEd/WsXYtska78q9eebya85johl5561IXqZ65F5eeO19uOEp87aPJpSjZA5+LRIqpZ+ye0tlYosigtEW6WC/v+j3gUdGAbqrJFJl 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)(26005)(107886003)(4326008)(8936002)(6512007)(5660300002)(6506007)(83380400001)(86362001)(508600001)(6666004)(6916009)(44832011)(36756003)(8676002)(66556008)(186003)(66476007)(66946007)(6486002)(2906002)(38100700002)(316002)(2616005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Dyo59PTKL7JvC2udMO/2zsd9a4KlQDSCHyEAZ+EZ0jA7Q3sqFyBHgAzp861t?= =?us-ascii?Q?/1qg5xjU4t9/Pq5GfK6S+jEvprp9ThrHLOJfASlBT6sTLR76EHzUQzcsMJFA?= =?us-ascii?Q?G6c6VRXfSajSCcrVlrUk6f4Lc1OWpenADqPfbHgVG6ZjsAGVZ0lvZp+Hdc3Z?= =?us-ascii?Q?qmGTG4MBYhuaH3cs/PSZjDom2Awjs4uPn3t87CDfqVMfS9BfmEI+1+XtINgm?= =?us-ascii?Q?McfG5vzvbwYeiWcL2lFz+QNiN1OiNAmqHuQs2W/JCChlxDv8lgexYn4REs5R?= =?us-ascii?Q?3+ShobmjUve/zS+GyR/uRW02qBqMTW/YQemMKZRQXkcasQ8OGFPNhDF4nkAX?= =?us-ascii?Q?51BPxXnVz61lb7vnhyBvyRQ0FS8t6rX3Hkr6xQqvuC1PTucJcZHAfaC07iGx?= =?us-ascii?Q?lOgxGkkh/3882OtLxOBY1PXKquBVBBUaRfUKWVy2C6xjcfRievATMVMFFn9f?= =?us-ascii?Q?OcdRxAxgr2vV44n1qbPjylTbBWb1dYC6AASTdLTu0oxu4eO48v/aIy0rtwNg?= =?us-ascii?Q?5Et+avwMVOrr1P3pDC6IIhXTlza1fNmBzNTRWA48YJw+RsH2dYGK7TNbKHSJ?= =?us-ascii?Q?imzk+0NvcaQjRCTiuMF6Urf3orCI65ycqbjlvXhFngGDZxHzDTL9YqwdcnDx?= =?us-ascii?Q?nOXFzj1/7dNparicTLUVmeUPI+CgCOZgHl8xcf517Qh2P2ff/3w0M/PRruKG?= =?us-ascii?Q?nA/fy7XMbQIH+IxDdFwATw1yPzIPlNTdDXFzU+Ie6RqO/4zooDNxjqS1jzVI?= =?us-ascii?Q?SoRYaJ7n4oGz+QHD9ffQwfg9ishLWy2rbytr0PLDxjA2JCXL2Vg28Fg0dCDW?= =?us-ascii?Q?2TR1QU8cTAy9smWrE0u/OwpI70Gq5euqpwBjBzPhNM+fBk9aQFU1YrI7sxqN?= =?us-ascii?Q?WJTBTGJCiytRC4aNtxioG9KKByOKsR4TWxsq6JvyxFts/WfRAnTzkG6lSwFK?= =?us-ascii?Q?+ZMMrVpsFnI2i/+6VJlENEP4hNJRtmTa+m8WaGUtjXFhoFzB6Rub+YNJ/9gB?= =?us-ascii?Q?yyvN5viSGnTUTFaKBBP5lbN2MoqRO7LQCCT2bI0G2DLDST9CD2vYo1IbIPm5?= =?us-ascii?Q?p5tZzX7XbPDTfUL9vRg1m8tX4nvxl7OK+Ssuf1GWbvuBDrlYHKo+/K+hXDMq?= =?us-ascii?Q?bXOR6tbUdEWcI0uC4jxsz5TJUfft9thbpQ3ra6nzKcggcMTJjyf55cTBuRtr?= =?us-ascii?Q?NAGTjl90/1yEHq3nTliTn9PtZVzqLsW3Q1O6TVqyutQsl5FUqdgV/s1BhBm6?= =?us-ascii?Q?nXZjvIAQZc684PlhHyAYGSRW7xRyVF94fjULahIun4fTOTr8hQPRWtC+cwlI?= =?us-ascii?Q?4GKAIak/TPEuyLvsxRKVv4MKAte5Rhpu4L5TJD3rkB3f0i6Ps+12k95N8zcp?= =?us-ascii?Q?0Q9dEMlacRlL0bBlECNgXqLYlo3eAKIwLm9xdW6KNri2DRbAgvrMBGI3jMkY?= =?us-ascii?Q?x+SfbTyzX/P+FwqG0E9aCoaCH+EXtVfI2NNXP4Xzf/BNXcc0SIbT+c/6nGG8?= =?us-ascii?Q?oLb1T7m6nCTV/UDmeLceWwu2IW0KxcwAfPcsmbaHd9d5QwqW4ssTXWYVE5um?= =?us-ascii?Q?QW5C1soz6xB/n93erBg0jKPQqnL7cts4dV7z9YXXNMg9br4TeGzaZHCNi6mu?= =?us-ascii?Q?0UH5iPGGJ9FpPCr/6KFIrPk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5fd6af9-0f3a-4c39-9df4-08d9d8c8dbf8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2022 08:19:04.8166 (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: FzQZZBayt5upjxEyrXwUwsOWRSs8X/dM/Lja3zoYY2cqzg5+saValL9epIXiOUyPPAuI0FKOBswGSLCEjMYFWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR04MB3047 Content-Type: text/plain; charset="utf-8" This patch added a command line option '-i' for mptcp_join.sh to use 'ip mptcp' commands instead of using 'pm_nl_ctl' commands to deal with PM netlink. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 681a72bbca9d..51c0cbd82026 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2222,6 +2222,7 @@ usage() echo " -u userspace_tests" echo " -c capture pcap files" echo " -C enable data checksum" + echo " -i use ip mptcp" echo " -h help" } =20 @@ -2243,9 +2244,12 @@ for arg in "$@"; do if [[ "${arg}" =3D~ ^"-"[0-9a-zA-Z]*"C"[0-9a-zA-Z]*$ ]]; then checksum=3D1 fi + if [[ "${arg}" =3D~ ^"-"[0-9a-zA-Z]*"i"[0-9a-zA-Z]*$ ]]; then + ip_mptcp=3D1 + fi =20 - # exception for the capture/checksum options, the rest means: a part of t= he tests - if [ "${arg}" !=3D "-c" ] && [ "${arg}" !=3D "-C" ]; then + # exception for the capture/checksum/ip_mptcp options, the rest means: a = part of the tests + if [ "${arg}" !=3D "-c" ] && [ "${arg}" !=3D "-C" ] && [ "${arg}" !=3D "-= i" ]; then do_all_tests=3D0 fi done @@ -2255,7 +2259,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCS' opt; do +while getopts 'fesltra64bpkdmuchCSi' opt; do case $opt in f) subflows_tests @@ -2309,6 +2313,8 @@ while getopts 'fesltra64bpkdmuchCS' opt; do ;; C) ;; + i) + ;; h | *) usage ;; --=20 2.31.1