From nobody Thu Apr 25 09:31:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp526965jah; Wed, 12 Jan 2022 01:34:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyK9wcuczOJGI5R3GandLqX+ati1iz+slcnVIYaEUvTNr6G2jGXo3AKOk7cW2Bvq2wnbCBS X-Received: by 2002:a05:622a:1389:: with SMTP id o9mr4144305qtk.380.1641980052249; Wed, 12 Jan 2022 01:34:12 -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 hf9si630229qvb.476.2022.01.12.01.34.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 01:34:12 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3053-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=dgDaEWrV; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3053-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3053-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 E89311C09DB for ; Wed, 12 Jan 2022 09:34:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B28892CA9; Wed, 12 Jan 2022 09:34:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F0162CA7 for ; Wed, 12 Jan 2022 09:34:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641980047; 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=JhGQb7Y7WD3WS3IYirUqTQjx1TvyqzeALFQoEqvxDQY=; b=dgDaEWrVFdPV4UhV2Qu3PnUcVuhPlnU9dAuZhyZ5lgX6SmnbpIfQrSDj8MXUXtgWoTOroY kH1pGEfg3zRN2p9fvjr0kjD981wJ3J7FQdaKpy2/Fp/bjscSY4k84Z7LPQw2OFC+9ERtPP U/TgpVivzJ5EbWClhbwRxxt/7FoYQ4s= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2050.outbound.protection.outlook.com [104.47.4.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-14-SvX8gN_dNK6h2RYrnIThig-1; Wed, 12 Jan 2022 10:34:06 +0100 X-MC-Unique: SvX8gN_dNK6h2RYrnIThig-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QmxHirthxXgqAG1+U7GctMhc4sshaMFSHsgr9rGDe9sUD3I+YXLD6HTHh+M9b8Z+9HqlE3Y63xTirbUnR9UAUKjI24oH8jQYlCk0KfVpbpDMBwc6cOVqTB+HC8j5TA5QVOKT8ZF74/4lJhJtJ3PeTgQ3pPeOfp4bfHF4C9RXk0seOkrQlykYX0Kfdiss0avWFV+ACjd0PAPWn3Nzg8Ct+hfxCOWaKErqOF6NPOd6lMtPaNsonlIA5ycq7A/wHbTKUNNHue6T4/2nhX38AltlBaMRaE3h9zODJfn7utVDLELzhWVyht67L4hTaBlZwHMZFyJSoCMl2ZSJ678vNrd5iA== 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=SeOr+1THhDxx+Xo7b/ObILYl3AFL2NPHTNXoISUBRTY=; b=TZ1GMNzzsl3EHA7rSA2kevLIYoZ+mu+wO/kzUpIqJ9HZUmW/O9ChTCWsQQplUJUG6Fewx5B0MxEPOWlHEfM7NaoW+haIOsRdgiuF35PDKuu5Cdb0DltGvf2SwrDBmB0vIdabMk2a4PAxcQNwMWJn/3WE2tv1PR7KY6j7+nLlazmrAuQg/8CgQ0YW8h/fo+cMKBqFu15Rz222C7Be2xUoyEeEvGuSu8RYQX52hDYewknmuk2HXfRKkyKpmAb142ZW6yu+MkhHdVejr9QWRPa4lG5TplbvchFgAPJOBuw30896CUMdk8dBgn6UtyOWRm2PWGo94O2PWrg+JJrkHxElkw== 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 AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:59::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Wed, 12 Jan 2022 09:34:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%5]) with mapi id 15.20.4867.011; Wed, 12 Jan 2022 09:34:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 1/4] mptcp: set fullmesh flag in pm_netlink Date: Wed, 12 Jan 2022 17:33:49 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0011.apcprd04.prod.outlook.com (2603:1096:203:d0::21) 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: f27617e7-7f70-46f3-9cfe-08d9d5aeacee X-MS-TrafficTypeDiagnostic: AM0PR04MB4290: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: C5ktrls6lc6JsgmnDwf78cpKkiwaag2N3A/JBVhSbvG8woopxHF278nQTctMG91zHVFQjfxNH6zdgkVD5e0l48wKNduYPwfiOuQEy+6f3XG3Ar+eLJWYYcbu+iE6u+6zS6p9+oIOe92L0ZEO2b3+/tswNqJ4H8R7+sWicma41QaxhzPqk9t3cXHdhPSSO2OmZWU1G17xDRrrLEvSy+MZom74Qe23wOavbqpbF27sowhRgU0ncRJ33dvKbxr7XHZERzLpjqqN9Jvbw5UKelyIAe8V1dhYmDT6p3xEEd/39nSfHj4UZ+/sILIoGn0QLhpG4tR6ba0/zMnq9LHoYxA1xMmlI31dbBPiMIs4Jn5gqI107Q19X9UAuL+lepQkb70TuY15EpOj6+fa04UgEgmQnWqAgN51vVVSgTG6HIlaVfjMhQgv+4af0JF1m0eJUKfbIHXw3X4XWG6HoloC3U+37iRol5hJ7aDAYPiajPRcpYjCgLEA5heerZVj2+AscL3VKzj9RgzXJNiRETpzBAcTYXSkJRlDfhdvmCd5ok21si2hu2oDMHrG2UWMVbyybtKalcZ49Z9wfA75O/rpCDljyUqNSD/5i5l1aUiwt08DkD9lG5LH96SPF3iwqxIVA1nCll4s3qHxZA2o67GPOPvoHQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(55236004)(6506007)(6916009)(6486002)(26005)(4326008)(83380400001)(186003)(316002)(8676002)(38100700002)(66946007)(86362001)(5660300002)(508600001)(6512007)(8936002)(6666004)(2906002)(44832011)(66556008)(66476007)(2616005)(107886003)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qc8RIwAzKYdNSNdC/kqVkyq5YDCR0YWuNDzLsrXRQKAw/TbiO5ru2Z68p3is?= =?us-ascii?Q?B2yCQRiz23lXjv3PmplWSDXZrLRAlItpvYZ+WFQkgyIfiH4eCZNyLSfOKMJy?= =?us-ascii?Q?jHdZeZvA9cuFvZ30DKubN5losGYHD/tXWkvy5zETuAb6U10KBWaK2YaL1eTt?= =?us-ascii?Q?xqM9g0cV/MhLTpaa8lT3pEvMpq/J0cVTk96VSghwFfc3VJuKqLPIVzkssQyQ?= =?us-ascii?Q?4zbUub+fL+zIdSDI+1UIbdMxa/I8ULNZbPbJ75HM7ThMmK9zT/wmxJPJVTSR?= =?us-ascii?Q?XolXtYC18nRAl3i5LcvXFDjdF50c4h2Grc8XerNk7K1JzoXCT9hAHbME5roc?= =?us-ascii?Q?ujDMYy2APPld5pAFTwoI9U8rx6bgahUCMZfvVx8q8uAtlJozsmlnWhn9m6oQ?= =?us-ascii?Q?NCJbiBjPD5ORLwQGyIQowIYW5tKDvnvhsV5cj3Wcw8EDwzAVvegRRDedz01Q?= =?us-ascii?Q?qjeek3TNY6j+Z6hThO3kChKNNUXaFZKlfn+nzj1BMAyIFiDueEcBlYYcz/2d?= =?us-ascii?Q?46scUrcYwqym5M7CJBADcAb7rGu9ppSVMoaWiztlSaSsIZf3bfsaTJQa6S5d?= =?us-ascii?Q?pYc1lS3Sk9E5gbbS5cg9QX6QEF3hAZyc+kics78I1hmlFspIeNzCIH5+JSUg?= =?us-ascii?Q?hQcaQRyJqo/qFGe2YbGdsf4AQxrwcxWXkaNhGa4pATRB9QuFR83KHAziwkS/?= =?us-ascii?Q?XxNc6aU8mGiu47GBrBV2+h92SP7EQBuFOe71XS4ESgu6570L3MT2XdDnC5Nz?= =?us-ascii?Q?h4aObkeIgGWPbDLqsdGoN3eZDwD36gSvzER+TSzxFckZwrSX1iA9uHMQcyEX?= =?us-ascii?Q?J8OAnvOWOUu/Lc/ixeCrtV8AnEE4f0f9OppuOU/jYHEfrYOrCkvaGQ8Pquo2?= =?us-ascii?Q?a+nvYRGSwaYp4LEaPYgfQ+eLPMP14S7iC+upwZA/DaoGW7OkzOf+nzMtnnEH?= =?us-ascii?Q?Hj8z8G32iAFlvlJwNSVXb41XCnTMqNwC9AsV+SEihZu7l8qRguc0GqcbhSdt?= =?us-ascii?Q?lRNHcWvjKOk5Q+/ObJ+gaVLHE6jvmdCtISXRRhqFu6X6sNSPeXklHEWEcVYS?= =?us-ascii?Q?N9JiTIEpGDqrGPY0TLL/YTA72Is8crxgu8P/FQfSN8S0KeqFkcv0syIzX30b?= =?us-ascii?Q?Pv53AfLx6TM5Ya0Y2jBN03Dbp4DVzCEMFYaZKYh4OFRDM3VFuxypXpuUdnv6?= =?us-ascii?Q?mFSfDhJz3QYfhEjhcTqH3CHPrK9yTc7zb+dMcERAlX0KPPY0BHBwJqtfsBDI?= =?us-ascii?Q?miMWNMl4Ht9eLVT3Hl/ptqY114yOpXg2c4HV2hYfuNPaB69i6KzykHB93nkf?= =?us-ascii?Q?6jFsviMEQ5dOFY772JgT5KsPHOKQ8CMkfljSc/4E703zCGi2bz+TISnTse+M?= =?us-ascii?Q?zFKn470MUtkg/O/ewKLLOwTFVkhMIX+gYgPX+Tty4A2aWh30yl8O89jZaUk9?= =?us-ascii?Q?So3PJA8nqfJUWN4ww4Z/sIDXRTJorwrmWXQvy8WHb4kAtS+zsFG5+1c7D94+?= =?us-ascii?Q?VszV7yLNNovtx0ogWNQnThiSlBwWsP26O1UGIx2CtFwRaSnCfcnuiFsv7yi5?= =?us-ascii?Q?Q/o53dXFeKP5bfJ+i3H79j2TDLOCq3p9krGovURMNhDOH1LSR+/rfiYielkd?= =?us-ascii?Q?TMX9nIAXf7ZyZQUSETplLeA=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f27617e7-7f70-46f3-9cfe-08d9d5aeacee X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:34:05.3542 (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: Q8dlT3usnojAVY7WZKlhpPfuNwnLhMczrCDClAUirwh0B0I++TA8PGGoeJ1vHHqBEGPWdye1ASjgsQZwogkOLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4290 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 Acked-by: Paolo Abeni --- net/mptcp/pm_netlink.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 4c06cd6381ef..8c5a4be21e3d 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1722,9 +1722,19 @@ 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_pm_addr_entry *entry) { long s_slot =3D 0, s_num =3D 0; struct mptcp_sock *msk; @@ -1738,7 +1748,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); + ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, &entry->addr, + entry->flags & MPTCP_PM_ADDR_FLAG_BACKUP); + if (!(entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) + mptcp_pm_nl_fullmesh(msk, &entry->addr); spin_unlock_bh(&msk->pm.lock); release_sock(sk); =20 @@ -1756,15 +1769,13 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); struct net *net =3D sock_net(skb->sk); - u8 bkup =3D 0, lookup_by_id =3D 0; + u8 lookup_by_id =3D 0; int ret; =20 ret =3D mptcp_pm_parse_addr(attr, info, false, &addr); if (ret < 0) return ret; =20 - if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) - bkup =3D 1; if (addr.addr.family =3D=3D AF_UNSPEC) { lookup_by_id =3D 1; if (!addr.addr.id) @@ -1778,14 +1789,20 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) return -EINVAL; } =20 - if (bkup) + if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; else entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + + if (addr.flags & MPTCP_PM_ADDR_FLAG_FULLMESH) + entry->flags |=3D MPTCP_PM_ADDR_FLAG_FULLMESH; + else + entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_FULLMESH; + addr =3D *entry; spin_unlock_bh(&pernet->lock); =20 - mptcp_nl_addr_backup(net, &addr.addr, bkup); + mptcp_nl_set_flags(net, &addr); return 0; } =20 --=20 2.31.1 From nobody Thu Apr 25 09:31:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp527038jah; Wed, 12 Jan 2022 01:34:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXUz//sXJ5bIL1Xt/TcksTbGn7XUaK6jei35kkZ/pUUm4a+wUpaRYaXRPaYv4TjgUFFOJg X-Received: by 2002:aa7:8154:0:b0:4bc:a467:614d with SMTP id d20-20020aa78154000000b004bca467614dmr8322106pfn.48.1641980058591; Wed, 12 Jan 2022 01:34:18 -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 u5si3007420plh.341.2022.01.12.01.34.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 01:34:18 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3054-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=ikH+rlfR; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3054-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3054-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 CFED53E0F33 for ; Wed, 12 Jan 2022 09:34:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EEF7C2CA9; Wed, 12 Jan 2022 09:34:16 +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 CDA262CA7 for ; Wed, 12 Jan 2022 09:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641980054; 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=ikH+rlfRRzUl33NF58gpG1bG053UXTOcE0GXE2d/qYrO4nSp1hRIBFlRVooi6FKbD9UlGx L55MdAvBVPMKkSqFuoSO9kNf+JeRwPbpgCJ4bMuBagYIH/glueSXrjKO4PMQOZFq5lK7yC 6MlOjTDpMDUPAWW7kbEdASUtbfkB0CU= Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02lp2057.outbound.protection.outlook.com [104.47.6.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-30-hisTuzINM82bM2a2fjpqfA-1; Wed, 12 Jan 2022 10:34:13 +0100 X-MC-Unique: hisTuzINM82bM2a2fjpqfA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ncK9XU2y3FpPtJCVlObMa36bgoNLmmxaY3Fv2IDOofvjFfx3hhlS6RQiTEIaayl+DCh/aZ633kW2P+QY7n9Lh8LCUJ6+AyBWyDxNdaFoIb5YqxTKm8bBKwVifj5BaTXzUrRf5+NMjHR181vdXwhM9r0TrEU3HP0C6gM63/F/xc76kWySuKZJ3i30+5g/GZ+gT3dJ+MDXNbG7PwAcTuiMdGnpdRqUUjyzDaG2xNpoX9yIY9vw4FvLeDcGwPViPPcUX+BpYaCIerPpKFugVrwpAGFRoKpywbZDqQpToMHGSp7SHyo+xUwuiKR+Cjlk8pa87MI9st4TAuYVWkRB0i+dEg== 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=fX9cO8/jCuSFKrum+I3PD7f89L9J90y3JYQctFNeHIwVw/dzuVi5LtsslRYEf+JNGFJzjhZnqCA08Cuue6+TZ7j/j6z9A+5b2G8/iqCrIAH5tCOaUyc/HWXUEszu9zhgyluYvDGzjxIe8NslMsmy7jbAE5HvnaSnnlZDXw3LRi3l/+siyiysEshAp9zOiocHHKIjUqbdLxO46LyqEAN0MKvv9hOo3rLiylh5YKCBYwUJF76s7VhTATd1oFtutMu6Az8bTU1IuZpKWhrVeLEB9SVMZRSGqY/Um8yp7uzIADhncS6w9Apkeq0wjiaMfIQDI3d9N3d1GwfZEQcbdEiBrw== 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 AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:59::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Wed, 12 Jan 2022 09:34:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%5]) with mapi id 15.20.4867.011; Wed, 12 Jan 2022 09:34:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 2/4] selftests: mptcp: set fullmesh flag in pm_nl_ctl Date: Wed, 12 Jan 2022 17:33:50 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0017.apcprd04.prod.outlook.com (2603:1096:203:d0::27) 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: 88f6ce2f-992d-496c-7e21-08d9d5aeb113 X-MS-TrafficTypeDiagnostic: AM0PR04MB4290: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: 92hvjIqw5zCv9lqoiWuZgtFppQBT5DhRSWW4F9yzspOE+q77x9iXIanhyzVqK+k6YG4NYQqkP4c93CvvF0Lg18HW5LnCDzaVyJPmDudWGEBersvpj0iXe16kxVBUYq6ebybjCXYQvaoXueI+G0qBlsdoaNYHrrAa2BFtPLtlGUW5dkxh+E4EYUq8ky559VLTcF4FEJ/VhGJZqexjTFm/fauBCai3YB2srsykr8uFBHDMZdVE3hezsCi5aZ67mhaCvs9USWB5QqhfuLyQRAsK7ymUmy2Fkg0h0bmRJ/w0+HO5MmYICtzCX1Ccbmvy6YpMKHSPxNALbiXrpqCPF+J+MxZOEoweLVRUo9WI7mz4QPnPJpFUffn1buo3oQfOkFSk/Jn0Qb66X5GSMtm+iS7ciWrRgGhWFWqn5fjnibIFzQVyLSIryIjvAI29H0jMnHPYWdInVlp2pRV3imw7ZMX9N4bzMsjBb4nig+bRmdi2+0vXoNZ5K8Q63jGiifcvq/Gc2V/aarSSb3hWnR5iIN7heQdBscy2Btf7IHi7PUbbitSlacYAnxIco6FHbff64ZGg3TPClwqQmGLvPQ/Ql95b99pMJsJE269E2Trwfjz1/FFJOagYtw5iw6EbvVW3ICXM3UguObwCHaS+iOjGXkXdYA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(55236004)(6506007)(6916009)(6486002)(26005)(4326008)(83380400001)(186003)(316002)(8676002)(38100700002)(66946007)(86362001)(5660300002)(508600001)(6512007)(8936002)(6666004)(2906002)(44832011)(66556008)(66476007)(2616005)(107886003)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?eNlG5Eg2vgqdEHAygdenK5umdXbwENS8yJSi6nBNCRuAtvG/bF5C+iYVqS0W?= =?us-ascii?Q?LB4iFZ11gmwwMfxWnb8VJu8b7hbJFLpKihdyfOHEuklgkcxZ+Ca3Twm9tc+p?= =?us-ascii?Q?LM9NQVO8S6HrB0ko4KKMTy9oB3NmZxPRhotNYHkHsTtGi2Ksi1F9Klpj+arg?= =?us-ascii?Q?1XX5U4azDLeR4kQTdrphYEPI6eaoEzBIGliG6YRN9vUVJm217NRue91jBtEX?= =?us-ascii?Q?TJiWVypnDd6Y3aHXHTDu/G+45jDdiU9sHE9JU5ewwVMvf0hpPY1LtXuNZ8Ef?= =?us-ascii?Q?Ryv6IhtssdQr2QmfbNnkECUuHrn/hImc8DaNU37jAiq8/ApDyffZuxe7NFYX?= =?us-ascii?Q?KwBMf+II0tjt7mLtKc7jI7QaWQTTLz4v4qxZG045mjt8Z+8LWG1oBPAGcpX6?= =?us-ascii?Q?9JNFXw2OelzF1oMXRmWLkzZHYfUxm61ttiAUQcHrXAgelKg9yxj9bl12NmCJ?= =?us-ascii?Q?OL93IUddxfjlfSQEvOJ0Ff1NAdF2hixDXchLDmuUvBtJQppNPqDaE+tvNO6a?= =?us-ascii?Q?PtXlDdwR1gRw3Uu4bydkPB1hw2ZFEbFZ15NhOYiJGlCGLQaLa/hVW2RTageP?= =?us-ascii?Q?Qiot7hHzCcpgYFcO2Q+C7Ir/r4RcQjxwzrFl3xLOLL20r8iuwgB5MZ1YdSQ+?= =?us-ascii?Q?p0tE8DVxanSLbF6zUbvmtvNY3gOPBUt8sAesBTwBc5Moyq+I2Fxhf4Uk3r9K?= =?us-ascii?Q?S1DMZ2BSFrhTEMho9hA3DLWQPAsNr7eCChlm7yaIR6flLd3MzFhgpge6UoW2?= =?us-ascii?Q?sHygVqtYtomWcSB/jpE/nsabcI2JVaQHKuzwH5+SqapeAUYplOMkTUVxAbnN?= =?us-ascii?Q?9yX56LrlovUt7ylukPOPilUV/BwUCMHIEJVKEuDlir1sdUdJp9t2uYtpXIWu?= =?us-ascii?Q?EK+MCtdDINfLLmXtJgBsnyuyIIX6haTPxAVP6CoYE/7d3Q2QTZoovJ5z26IP?= =?us-ascii?Q?CLmzTCXvNlv6g+PRWfRXYi1pHtym/e7JjTIHSLQ2TNEDx0jaDCqEZ/37STnj?= =?us-ascii?Q?/hEdGTtF7A8UOmIIXERKhUK1Sc9iEX1wEnSqZqxsQX8bXo/u0AMfHDwcttem?= =?us-ascii?Q?IOs5X8kRr8xA+zdB9yEq6YKmL/svNggPIk0CEsTlzyKYAd2uVd6J3TPMb952?= =?us-ascii?Q?klAbeXhbj5BFqDERsg8N0S7mG9jFW51id7wR5QAQ7kqxwsTKZVHwzTpqyEG0?= =?us-ascii?Q?iynKs9ZhZH9CEFsXw/xbtTE43yTKSBLsJZsCl4VZQKw3R8uGoPBx2d8nsQz8?= =?us-ascii?Q?iMB4OkWXYh3Lt/92S9oyVnkeM59/BUIrepcD8e1N6F19GQ7gFSNDl+s5DDRt?= =?us-ascii?Q?fHRW9QCV/0a23o7ylnKozTAJ+F3tKKygKQ8Dm0OQqNXv9K2OmaXbwmbv3d+j?= =?us-ascii?Q?YTQwp9hpx+XB0NooggNVkaXv6ZZPpPMoWGcRL2i3gMokPJ0INouyETUbH+a5?= =?us-ascii?Q?MmXZb8cmJz44n/at1HNZJpyOzMZ6rSnmOZgc7sNBDBflPRncbaK+RgcI7sdt?= =?us-ascii?Q?PTalUOrjvGQ7/xR2YQyVARmNLAyqeVwMfUxcg9GA+8ynC8i3K7X196RKf5ry?= =?us-ascii?Q?NgFuFF8qouJEUxLU30Syjci9+SluchfpOrdKw/jXbpLzP8hE7py9+dxQVhe+?= =?us-ascii?Q?nBTSflHcLY8DGWZkygOE0lg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88f6ce2f-992d-496c-7e21-08d9d5aeb113 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:34:12.3693 (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: 2Zg0Y/1dYIlovOQh23QB1j6NDnX93If505ihgpqO+lb/v4qYxa3xrTXgp14Jx80afPD34NGTmhVXHV/vGNcF9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4290 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 Acked-by: Paolo Abeni --- 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 Thu Apr 25 09:31:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp527134jah; Wed, 12 Jan 2022 01:34:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJwqadOSnrEt57nyYXaNi9Qn4ChsHs3A3ZTCawVKtQT64DTDeTIKyfjijd2mqvrtsze8TvAu X-Received: by 2002:a05:620a:39e:: with SMTP id q30mr5858703qkm.163.1641980067347; Wed, 12 Jan 2022 01:34:27 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id v14si5064338qta.62.2022.01.12.01.34.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 01:34:27 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3055-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=BJHgiYlW; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3055-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3055-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 16A0C1C0A22 for ; Wed, 12 Jan 2022 09:34:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9F2CA2CA7; Wed, 12 Jan 2022 09:34:25 +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 53185173 for ; Wed, 12 Jan 2022 09:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641980062; 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=21iFVFM1j7k1KNRe+IyIJkYZqOcqfBxG0Pmd0DyatNQ=; b=BJHgiYlW+cZYOzLXETu2ERvbQEfiRFDZRda9yzPYDYeruL3a1KMzXhSioesCGPXye7BYTw LlqgB4s9i9attlUEcwohTSHUICF5eClgmLvExr32AKpdfoJbX/68fVCpOFcatgvD5vFBa0 obqr6yV9FJyLEOMvntgL+8DPAoLLhYY= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2057.outbound.protection.outlook.com [104.47.4.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-13-bAkx5AwWMgGr-RVR2oSxOA-1; Wed, 12 Jan 2022 10:34:21 +0100 X-MC-Unique: bAkx5AwWMgGr-RVR2oSxOA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N8gmDH1pSsLaiTWgKUPd4OCo6oMzeK3jKyA9Os0Ly789XlmlNa1PBzYppCqbKmKBSUIlA/Ia4qOTiZzMEYCWMtFh4lEm38OckKSeOVnsq/6dxfWARKhsIkK1JAjakzr+Z7BhpCBDF+SiDsIr5uTDZWzWyy/YCwvNxaiNjFv/UguNDboOcNIG5PyRqAGIlSh7JIOcHNDHTxzzny57vwve/NaLaPUoCcrQv30SkioAn13vPMBGr3NdpvIl7VjhGTN5MJ+4maEhOwnpTfSnR1i0W90QOorA4Hg6p5dcZu8sLpQHEmqibqZrxIQWtZnKWO3u0+ITTRU96/S+SiI2l/GbAw== 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=d0KUL35iMsz+zXxp5glPl+szQs8JW2VjbnKn9G7H/r4=; b=Jr4YhfqmRsPsHslmYc3b+CSxsMMRQ5yO7Wnngtq44bJWqgE31FgjOZPExYQAHnrnYPgavHOiposHmgGfDXoYl2UyH0Pk5X9xWl9e5nkT/TpbOnZyG7xHQ+uK3k3DsmTB/FkDajZXD1GkDrrF3+Uw++iPCtHQzd3rx9xciO6ss/puHaKE5HhQrwGmoN+qzQVyIVg5K1l4F+P2R0jNVDCyd/gfxCmsebkUD8Ln7FdjL9ZI+64gFYO/fhZX3nARSggRvZ4Vgq4pZteKkwKUh65xC0gkBk8xgcgc6JTAgJ6JjaNoP0Q4gZBprt/0wQvmGxKKTT4XSn3a9sR6w0b9sUVtoA== 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 AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:59::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Wed, 12 Jan 2022 09:34:20 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%5]) with mapi id 15.20.4867.011; Wed, 12 Jan 2022 09:34:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v4 3/4] selftests: mptcp: add fullmesh setting tests Date: Wed, 12 Jan 2022 17:33:51 +0800 Message-ID: <6881741312c5e16161a575dbcea19efe2def6e03.1641978967.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0019.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::29) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a5fb91d6-61f1-44c2-2e39-08d9d5aeb5cc X-MS-TrafficTypeDiagnostic: AM0PR04MB4290: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: zvCnr/WY6HKrmTpbJatQICFr+fRMkyQmQYwrJITp4G5w6g4JBM2Fb7U8oWBfqqpMdE3IyQuPl3X7E3Sv8HLVbysyVxfRXqyLpSnYH83NkqwmLoBRBn9VcarCFfT6Gl7lUa6Uqwj660Hpoatqmh+0jnc05MlDz24McOzuZLC3N9356AZFVvKy9PPReSkuHXj6PJ8suPYB6ZcYY2c47RbQc3DG2QA2HXuP5cvKek0N9yO6+dg8Iiqct2aeqPmlGRSqnsK/w6kaGReS2jHk4ar2emJzWjv9ultPR4UKI4twLVaknW2TEb4ywUzeJkhcuZ3sf8BlXMmpEc5lnJ7CheUVAwR5dpSzBuW+3DRIzCcW0HZl/XUlr9YrJdzac9kTEGLOs395YVksOwUQKZbyRYHIX+YSmHmp1Oj50R4PBziTsXAx2gJQZwpwWxeTHV+JkV2yISAt00UjeDS/PxQpZJPS/xe89uUPeXxN72skekZIO9EvrEiu+A3SaX7IwVJneH386NfOmOO5sSVymCu+/xE501TkZ55fTA4znmbtJHq6Qqxa8RI1ETP8HRhHzojNJEk19tgipdIbAuLUPzSWaKiu47VJ1E5+TAJRHrg0eag0My3T5Ptr3igJM29jwaOeWME5m0Pnc0VQi+7puhy9xapvAA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(55236004)(6506007)(6916009)(6486002)(26005)(4326008)(83380400001)(186003)(316002)(8676002)(38100700002)(66946007)(86362001)(5660300002)(508600001)(6512007)(8936002)(6666004)(2906002)(44832011)(66556008)(66476007)(2616005)(107886003)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dNwd6oLH0u8EJiTYTrh3BI0piGLX7UqRGEtrtGP3GxbcCZnBUOXe3UnW/C8U?= =?us-ascii?Q?7QmExuNGBtyKB0SgwEQbopm9K4UtAYRd4KLD8zluBQriiGzUBnvqAWynjaCb?= =?us-ascii?Q?KeTRhZUNzEUrNej+tkaOqRqa6TxCPe8UM1AquWaA2hVhBiA/gE36vAvjcxsO?= =?us-ascii?Q?RxMiRpiD6Y+WDoT+xWmmlp+D85tdS/gOkAhtbhkhn4GOg/SwxnR6rs1M4PGQ?= =?us-ascii?Q?ssLhdM5ATjmPMPM+TkcpBUeBRrCFSw6G45k+KOYMv0IJD+E6RIbjITB8FMZE?= =?us-ascii?Q?A4LL6qzGKNEJ2OPuv0oYVnXJBnlkRwI6gu1sGN4ulkVp18s/Wgvyc/yER/sk?= =?us-ascii?Q?ddqGGiJa+qvxK5dAL3coQ2PqJKGB6z2QalWfWj72P7GbpKi6sGYiGsxFptlG?= =?us-ascii?Q?tC4T05iBtXyU6vCPmvHSuQEQ53Fq/isUQmMwljoxEPnFsAFMtLMQSssptEyL?= =?us-ascii?Q?CXOnT/nw8JlsfEjnxIkZsM6qrC+jwRXCA7/FxB5wIeMcSQ8o8goSqj09Nn0W?= =?us-ascii?Q?hDo2YD0Ad9cSoc7FbZ/vMYv4NO5eCjTj93KmZ7fRCY/q9qDqKNuSLLBqI1rg?= =?us-ascii?Q?H6rMaz8e6E+AQ+G4A7LL3g1Ywxh+ww5YfPM/V0iH54CDOeiTtZOrBwdMOcDC?= =?us-ascii?Q?WDHTMBXPVCy5rGvePL4Kpu5uPQrd4VMHUbgBcHSjbukxHVLQg2/s3ZFyRX0J?= =?us-ascii?Q?dtIFiL64ns7Hh/Ktyca6JLtvAaxd4UvyrCvklie3K618cy9FNiLO8l2MJBXN?= =?us-ascii?Q?1o+v7YA5vRrCv2WdvVaV4aKUAD70972HhgE/2GVGPtvhAvnp9yYILhEjCXEz?= =?us-ascii?Q?kSNTinkssI+iquEiio/0sWel+/iX2qruJHKLsghYx1E9gkGN74g4mEtjSD4d?= =?us-ascii?Q?1YYn94QU9gmlSN8uEB4ovJeGIs3b/fsgR/fOuWdLbB9f3s02tWeZIXEvlZ7p?= =?us-ascii?Q?tNH9a9/6Ifb1+hg3fb42qNf5AIa/oX2dgJRiKzmozt1Vy837y071fOVCTs+3?= =?us-ascii?Q?x1rB1SIxUSPfDTSMRMnUdphFBY2IvNGo+LE7JWRypn/n6UbTGBBqF1IKUKNE?= =?us-ascii?Q?TQdBYN0YvxZVpA+VlweZ5I8odF0Du7xN0W85Cayu2D2JwY6EdarjqGpS4XXZ?= =?us-ascii?Q?cfDnA8IuH3SZsnmh+djR0l1ONK04NfxPAmg1tMOBxnHrw3D0svOA0dxhJWpH?= =?us-ascii?Q?SbowXp1EV7gpaDTZi0UlzCCmrqLDTr1cfpsNqeojdYF/BlANIDls92eoI5C1?= =?us-ascii?Q?vfSvCNYZZl1a7yxRxKbmmTNCbNfJRQbxlVxNSN3GdueAVKf8ErB5R3jtmjIp?= =?us-ascii?Q?007XbwP6tdZoMyfXlaI6mDX6KyWSibPhg+FMMa5xqHFx3gAB5yPTy9adhwrd?= =?us-ascii?Q?oECjdY+JcWlOZ+4yXTRKhfemebHeg1qEewnU11icE227yR+/r9Hqhcg192EB?= =?us-ascii?Q?bS7suhFhrmEH1RlPaAQ9eKQSQlSSL9Xi1jURcs71U8PYm9Bjg0rLtalW5uQ7?= =?us-ascii?Q?EsUjcBgrWiFqblsY5p89vpARQj1OzSx56q9ukQHRvUUrKCti1o2QNYMTRDTo?= =?us-ascii?Q?IzU+3+LhNG5BGtKvxFqodiUxl951fAddneNwTf/yDz85kquIHwJ3r2CdojNj?= =?us-ascii?Q?Y1cV0YEFTeLSA3danPJvXtM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5fb91d6-61f1-44c2-2e39-08d9d5aeb5cc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:34:20.4156 (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: seDOwSDrDaapZ6sM9O5Lb75hPjirTIUzz98OV4FrDLaWetXy0HAIL+9pYd5507TbuBcTZTq97UC5VWRon8CjNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4290 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 Acked-by: Paolo Abeni --- .../testing/selftests/net/mptcp/mptcp_join.sh | 33 +++++++++++++++---- 1 file changed, 27 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 e48ce23d2386..25725be98342 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -289,7 +289,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)) @@ -461,14 +461,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 @@ -545,7 +544,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 @@ -574,7 +573,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 @@ -1640,6 +1639,7 @@ backup_tests() 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 + chk_rm_nr 0 1 =20 # single address, backup reset @@ -1650,6 +1650,7 @@ backup_tests() chk_join_nr "single address, backup" 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 0 + chk_rm_nr 0 0 } =20 add_addr_ports_tests() @@ -1921,6 +1922,26 @@ 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_prio_nr 0 1 + 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_prio_nr 0 1 + chk_rm_nr 0 1 } =20 userspace_tests() --=20 2.31.1 From nobody Thu Apr 25 09:31:00 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp527221jah; Wed, 12 Jan 2022 01:34:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwx/qz6k5/iyEm2ZEZ/AWMQe9JPMw17CIkpuKZpIrKu5wZt3Ddkewk8a5ISNq2s+5oTp9an X-Received: by 2002:a05:620a:4ec:: with SMTP id b12mr5837188qkh.555.1641980075012; Wed, 12 Jan 2022 01:34:35 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id a21si5153080qtx.206.2022.01.12.01.34.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 01:34:35 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3056-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=FXaFBaGF; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3056-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3056-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 BADD31C0AB4 for ; Wed, 12 Jan 2022 09:34:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7E9682CA7; Wed, 12 Jan 2022 09:34:33 +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 19156173 for ; Wed, 12 Jan 2022 09:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641980070; 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=Aq8nMW/1tQbz/FX44tvpFPBERdCUYwyPrU3mc+zPPiQ=; b=FXaFBaGFLPI34RwrAjhuhowL2TmgPavcdZ+0ohOnlL2CRC8XpUZGPJhL5OA5mwt5bGpVNG 7FrhDV/Au+RxcuWz1BES6irXwBfcdHnjOYIvnjY2yrGKrv90Cz5QvgN+Ad7FDc8Dtt1FVF tGPqsI6I3RWHEYnjSkLjgupFInqD3pU= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2052.outbound.protection.outlook.com [104.47.4.52]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-aeip7qQQPvOTNZDOJ5jDsQ-1; Wed, 12 Jan 2022 10:34:29 +0100 X-MC-Unique: aeip7qQQPvOTNZDOJ5jDsQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JPFPSmhw4wc73DGN59ErFFmYdQLAqD71X/4xrQDBiCpMspcVc3x9vwK4ycDiQj15NUoTXVgzxVhPNSGhCCS2mdNXhGLqa17/mryvTA1JfLvR5ZW5A2IPFRAcZWAaLokTWKC/lmse0XQbKlSRSSwD77vUJgbPCyobPIY2vpgSCLTRHurjNyNxF1YavD+GpkVtbdd1xlbQ3aBXQNyGcvJKGIEOZH06C+PXCd8iqmWMq11kZtMNHOj2/KAc8APWbgrcp0JVBx9dAy7FmSqYXR3AZTind3ftVAiCVaqU7ADzqblEEIA7BIHsp81wOduZjKkm7H68SIeX+IHGL3dhdH4jyQ== 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=84S5/a4nKsAc0ow/Ih+/57+IBDMt6qgVo1q8fJzviac=; b=LnU8DUxrYK6M2524fadVSzim14yj5tUrkHxdaitzZ4cF71cK6mkXpqz9blcgEhIEpTzsIPVU3/9+5LeUvkt9KO73NK9/3PTNqjfVi+r5E0fBkt78OSjFcoRQbGwaoUeI2zTzPKx1Hb7vpSog6X6zJoI26UuZtexa8MoBP36omJUjogv5Vg2s2Fszq4JF6n5/YQvfq4kIaARrU0p9MakyyOYiwAjkZN1KvO/SgAvH60Homtx52KMTBooOA2zdPogdMUGyjjoJoyfOOHA3MNEdNA1ku3wZsFhbFQhRZ23OnlA7Fh7YDR41J7HdeSbWLYai1yMaY/POnsSmWWEPNn8Nog== 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 AM0PR04MB4290.eurprd04.prod.outlook.com (2603:10a6:208:59::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Wed, 12 Jan 2022 09:34:28 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%5]) with mapi id 15.20.4867.011; Wed, 12 Jan 2022 09:34:28 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH iproute-next v4 4/4] mptcp: add the fullmesh flag setting support Date: Wed, 12 Jan 2022 17:33:52 +0800 Message-ID: <743abd8f6b8311bd0f5747980982b511299e3453.1641979131.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2P15301CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096:202:1::16) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff45e7e2-6f7e-47b2-656e-08d9d5aebaad X-MS-TrafficTypeDiagnostic: AM0PR04MB4290: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: 7hPZtuTrZxXY9J98Qqj6O/1hxxIYhcaYAry9jtZ97wTNBPmCR4g4khnKU0fx+QzRVk1sfh+oCOf7yXL5Z2mEGg9z4FAw019QYaiYOvZ8yda3SLn98AzbsASC8ThretqjD674g7syDVsLUWJtG6++mH/0DWcRlMik3vtW42PokU5lthdJrLfWbKbWZz+fL2EperxjqAr/PhZ9tS5eibmnwT48dBBZetmtHrmQEb32shD0Uqo2iqoqznZbklo65AfGqpxS+MiHPvfsU75gVXDML4a3BKQw+eZXQ9yOBCUE87GJTCngCK0Db7NT3/47zzC2ng9/T0AvxXGnuf6VmxoQBa+zN3lQkTIEp5Aa7otX2YjmxA5CexFiN1ADwSvLSBwJlWqZ0xRNZT8eYDBEkaaShzf08RBR0+y/Jpz7fxUlqllemmEM73YL50x9MofaQCEnNrSbxlJK/cgSuSu3k7Hs6ad00Tuan0B35KAax+RP3vzxQ1480g/Bok0l5hw+xbH9naKwnm/7d82sX3EXk1Vr1FTfG8IL8rwewZaTcdMUCm5yVWrfZywV6Q6UbAB6KGCAz0u3GmXfxpyt4pB4BcJgJqOv0zYaziZMm2qUxMcHDRFlhmUU6xilSwJgXMqFLtLLOaXJJmc5rk3IDVEEvD6dBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(55236004)(6506007)(6916009)(6486002)(26005)(4326008)(83380400001)(186003)(316002)(8676002)(38100700002)(66946007)(86362001)(5660300002)(508600001)(6512007)(8936002)(6666004)(2906002)(44832011)(66556008)(66476007)(2616005)(107886003)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wy79KN2hPsErWAcN3PqTSL6xt++vQNfkg3T7rda8NT4DCQdUBwMRdChU6pPo?= =?us-ascii?Q?2WCoyk5IH1ajBrWtECXNZudcZRu5wOt8V6I6saedKKqhgUeSvUEQUKPuz9DT?= =?us-ascii?Q?6r5s2NjOhO5BpJeC981xHyCnlk3hDYeKtg+nJyKnT/QoZpa+QzAcV7K2BI0O?= =?us-ascii?Q?sQ691OJ9tEjt4T0929zLxTPIuXCtr+lXYyBABPJezXblfoDdfxB0VgLnB8xK?= =?us-ascii?Q?d701r4S3JawBNvyo3ElAXKFf+uvekAPC2/SrkxEKsOJTr7Se+bwALn+fk2UE?= =?us-ascii?Q?diwohrEuB5J+BGdPh6mvWEDqyTOxj1Zf0xhPKC/tpC2dichZVTSaEKCQr/m4?= =?us-ascii?Q?P9rb0ewsq6oGhQrWThJVA5LvHysNkCgcvaNq3LkXQUX8kHAqdUW98OLQuCwj?= =?us-ascii?Q?yDtTHYIND2FlRtajY0LC0ssLwokiSsspOY2PhcZe11MW91bgMy/Bmn7/tn9T?= =?us-ascii?Q?5Hn9qz/VYuZmCjx+xbdaYd9SNJ7j/xOSGp1h9rUtb38bIJsz9d+et1MO4Bu4?= =?us-ascii?Q?y+S1MX0y3menGGHq9yT9xvyrPdyJao/ZIRF5H1Et2zcpZaGCxFzyMHSOtgBr?= =?us-ascii?Q?0lKQXOJAVHJXX8VszHFcIBirkjJSw+GRYEKcjNH8SknIogam51uXUmprYOX9?= =?us-ascii?Q?JKf2vJPtsdZDqTqKo2mnhle0gMi/2s5Jh1UMYgXK5FOTzLmhk1BsW0qhW2Om?= =?us-ascii?Q?0HQ+DYjJ95gkvukGdQjYBZmdV28xRAydQSc5Cbw44hyUNbam35uzX9UVymgS?= =?us-ascii?Q?I7/mh3ioxueIN/gUkOO8rdiek6Shp1NgyFmaS2tcGovDFv8eUMA88FjusMwx?= =?us-ascii?Q?9nYJjS+yLVTDr8cHftVgC0THs4scc7BI/jyJZyKviHePIxuBDuuPFa+fimrr?= =?us-ascii?Q?/HcXAmBmu2RtggHZ3j+j6rsza7ctPOwrVZUlHFqYXTbCPI7eR3+WZy6/G0mI?= =?us-ascii?Q?DODwexbHFNdC+Hxi/R1MkspRxAvA3TNcAQnqqSwdSazE6DjJuDF9nkdSYxn7?= =?us-ascii?Q?Yb4x1uk+1eU81sdVYy7OmSnVVD6GjUbJ2q/Fz5e1PkDiBzyvOTMCdIUHnjsO?= =?us-ascii?Q?9XOs1PWi7BnME/bgnUsp9bR2VE5WaXtKSxIin+1gF45rQjOnIc3oc/vP3wzf?= =?us-ascii?Q?CfTCgvQETKuLWi4nfNvFgEE1aHYdU0blaOYyDe4y1QSrDIYQry6G7gtuxCok?= =?us-ascii?Q?H5qHmVbs5uaBCg4iAn7ykhHlt9YmZg7tUTzXF5QhW7DjC4wR/70pYLFZAFfx?= =?us-ascii?Q?WS+GuyimbsLdfs0PbpKvgIT+pSskd7U9/cnvEO3aJ+8uOfLBEnccOmvIN01v?= =?us-ascii?Q?M/Rj2LAOqhVmd7HP/nazYHoW4Pa0XM/8BUP+Km1XWjmo5873WblOsHraG5GE?= =?us-ascii?Q?KIfshP+E94D2Uh/7gVFTdlgyaQ0bn9/OkR8zEZxWjN8Th9EqQpbBtCL75RIH?= =?us-ascii?Q?29BPsOKYj9G/7fjD5scsdSgqufMkU1UNjR05FQZ4b2mYE1j+XFbKolMnh+i5?= =?us-ascii?Q?3Dwt753DMHwrLI81duAPv9KFiAKKXAFh/Y+8jv+DaZJroAStCZ7PVrX4WN3C?= =?us-ascii?Q?JI9pHFMKacAOvlkTfJ5EzkVFmSVpThBM8hpIwD1CKBxXM9dcEYnUZ0/3uRoc?= =?us-ascii?Q?auR8Us7WAUhQ9h0GEgjempo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff45e7e2-6f7e-47b2-656e-08d9d5aebaad X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2022 09:34:28.5868 (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: jwRji1qLRo7DdGSSZTMrdbTKb6/5o8b/leWehiFLSebrexnoY2exjkvx8TQYkXpMFfz7SF5b5tVrO7BJjSfGxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4290 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh flag setting support. ip mptcp endpoint change id 1 fullmesh ip mptcp endpoint change id 1 nofullmesh Added the fullmesh flag check for the adding address too. Signed-off-by: Geliang Tang Acked-by: Mat Martineau Acked-by: Paolo Abeni --- v4: - put into 'fullmesh flag setting support' serirs. - No code changed. v2: - drop MPTCP_PM_ADDR_FLAG_NOFULLMESH. - rename MPTCP_PM_ADDR_FLAG_NOBACKUP to MPTCP_PM_ADDR_FLAG_NONE. - Needs to apply the patch "mptcp: add id check for deleting address" first. --- ip/ipmptcp.c | 16 ++++++++++++---- man/man8/ip-mptcp.8 | 8 ++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index f85c49a8..564500a8 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -25,7 +25,8 @@ static void usage(void) "Usage: ip mptcp endpoint add ADDRESS [ dev NAME ] [ id ID ]\n" " [ port NR ] [ FLAG-LIST ]\n" " ip mptcp endpoint delete id ID [ ADDRESS ]\n" - " ip mptcp endpoint change id ID [ backup | nobackup ]\n" + " ip mptcp endpoint change id ID [ backup | nobackup |\n" + " fullmesh | nofullmesh ]\n" " ip mptcp endpoint show [ id ID ]\n" " ip mptcp endpoint flush\n" " ip mptcp limits set [ subflows NR ] [ add_addr_accepted NR ]\n" @@ -46,7 +47,7 @@ static int genl_family =3D -1; GENL_REQUEST(_req, MPTCP_BUFLEN, genl_family, 0, \ MPTCP_PM_VER, _cmd, _flags) =20 -#define MPTCP_PM_ADDR_FLAG_NOBACKUP 0x0 +#define MPTCP_PM_ADDR_FLAG_NONE 0x0 =20 /* Mapping from argument to address flag mask */ static const struct { @@ -57,7 +58,8 @@ static const struct { { "subflow", MPTCP_PM_ADDR_FLAG_SUBFLOW }, { "backup", MPTCP_PM_ADDR_FLAG_BACKUP }, { "fullmesh", MPTCP_PM_ADDR_FLAG_FULLMESH }, - { "nobackup", MPTCP_PM_ADDR_FLAG_NOBACKUP } + { "nobackup", MPTCP_PM_ADDR_FLAG_NONE }, + { "nofullmesh", MPTCP_PM_ADDR_FLAG_NONE } }; =20 static void print_mptcp_addr_flags(unsigned int flags) @@ -116,9 +118,15 @@ static int mptcp_parse_opt(int argc, char **argv, stru= ct nlmsghdr *n, int cmd) ll_init_map(&rth); while (argc > 0) { if (get_flags(*argv, &flags) =3D=3D 0) { + if (adding && + (flags & MPTCP_PM_ADDR_FLAG_SIGNAL) && + (flags & MPTCP_PM_ADDR_FLAG_FULLMESH)) + invarg("invalid flags\n", *argv); + /* allow changing the 'backup' flag only */ if (cmd =3D=3D MPTCP_PM_CMD_SET_FLAGS && - (flags & ~MPTCP_PM_ADDR_FLAG_BACKUP)) + (flags & ~MPTCP_PM_ADDR_FLAG_BACKUP) && + (flags & ~MPTCP_PM_ADDR_FLAG_FULLMESH)) invarg("invalid flags\n", *argv); =20 } else if (matches(*argv, "id") =3D=3D 0) { diff --git a/man/man8/ip-mptcp.8 b/man/man8/ip-mptcp.8 index 0e789225..bddbff3c 100644 --- a/man/man8/ip-mptcp.8 +++ b/man/man8/ip-mptcp.8 @@ -41,7 +41,7 @@ ip-mptcp \- MPTCP path manager configuration .BR "ip mptcp endpoint change id " .I ID .RB "[ " -.I BACKUP-OPT +.I CHANGE-OPT .RB "] " =20 .ti -8 @@ -68,10 +68,14 @@ ip-mptcp \- MPTCP path manager configuration .RB "]" =20 .ti -8 -.IR BACKUP-OPT " :=3D [" +.IR CHANGE-OPT " :=3D [" .B backup .RB "|" .B nobackup +.RB "|" +.B fullmesh +.RB "|" +.B nofullmesh .RB "]" =20 .ti -8 --=20 2.31.1