From nobody Fri Apr 19 01:58:04 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp3675268jap; Tue, 11 Jan 2022 07:06:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxYUsgwGA++ZTITsQuN3GDpG+Ts8brXEEPEleGolwoAS2hnKtYIDAj4zaxlOXz1QX2dU34v X-Received: by 2002:a05:6214:1761:: with SMTP id et1mr3923168qvb.131.1641913593489; Tue, 11 Jan 2022 07:06:33 -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 e27si736170vkk.167.2022.01.11.07.06.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 07:06:33 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3041-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="VvU0e/hG"; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3041-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3041-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 BD8373E0EC5 for ; Tue, 11 Jan 2022 15:06:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C5A662CA3; Tue, 11 Jan 2022 15:06:31 +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 4CA7C2C9C for ; Tue, 11 Jan 2022 15:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641913588; 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=LQ150jbgl+Zcg8nPbjSC4I8hrD3bN28ik9AaUB4kV1c=; b=VvU0e/hGd3WRvB785kQXqbnxrItmKzWj3L4K6oGuvdp2VL1GitR7JXNtQ7ZKRts3geaRjX lVP2x4364OrTrOnjNNLml4kazjRp4EoPH9IulBMd2aBhDB/gbblPNZ3f6PgLY5eT8fsGUC Zg7q2eQ64vzafGG0aeygagweub3AcWo= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2108.outbound.protection.outlook.com [104.47.18.108]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-18-wqJ7JX8oOBuQdBNHPJjC4Q-1; Tue, 11 Jan 2022 16:06:27 +0100 X-MC-Unique: wqJ7JX8oOBuQdBNHPJjC4Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oTzBDCpa4WafhtyBv/Le5JTbK17YoWDEUP2ldykERnjCufJH8oMlI/Tu6umYcIyCHnwTw+49+5qNySw03avc6a95LgklSzb/iNtEZ9ZtuKNDCFRQWZUbvp8pEVQCTyJl7H4akQFaDlqhgaS7BdYjVyzQK1jilhDDIqNOgK4BOJpZCufisJ5akmnxrkcg29XK/1QjwXNNJZmFF+7ccAKxyn/o0WLI//Ke4Aty+9+KPbYkAKX+SHWU5xGVKRj0wwlnYGo8ZaWNdLRKVbJUNbiYC6K37ePEv8IWi9WEaXcWeoz9bB96yRt0MpECM0P+Bocf6b66/PdoMzYx42mu5Mk7fA== 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=C0TG5l8hUGwcBBFxR9xkrGpbK2dNO3Q/Ay3//bdapoo=; b=DsYDCZcAj0deYTvJcwTA6d7lbpDYoSB/3cI/5e8SBFQemP6Vl1cN6R0R3Lr3SAa/gWLQ9Yz+lnX22eizU0PigxlaZcr9dSPCnxTgymTCm1aRp9J7MqrIssDQQVaRGkmkLxTsDXvbtK3XreDf99TbS5MwNcZEudqaSQoIEtzv2HaUn6j7ZdziRBbQbFR6fiKaRKnCA9ItS384RqGLOHlizECmqstRWCNPUCu/JVJz6dC4QgnUtMcUhl1vHOctdZY3St4B2Z9DepI5rWbpaAHCFwEIEDXXQnpfTDwuyJvBXRBCMXFLec3bDnxWYcyPWKjHbmIbr6Tuec30VtpxXjEsWA== 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 HE1PR0401MB2458.eurprd04.prod.outlook.com (2603:10a6:3:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 15:06:26 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 15:06:26 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 1/3] mptcp: set fullmesh flag in pm_netlink Date: Tue, 11 Jan 2022 23:06:10 +0800 Message-ID: <6b320b4a008759cc851dee72ceba693c8ff7bf52.1641913113.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0131.apcprd02.prod.outlook.com (2603:1096:202:16::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: f5bab8dc-275d-4d3a-3703-08d9d513f07d X-MS-TrafficTypeDiagnostic: HE1PR0401MB2458:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3968; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jdOg/loho5x1SkLkVh5Oj7c8+DK3jRB/Dw0K3lha0H+vb0/bbMAA4b1oJoi80II1b6iDjYko+FJrFo2a4LT1k/ndZRDrgT31pWF9y95+9SVqc56roKsABXqNGhllvW0XOHYz5WfGCqd+KmCUQSN0FJIgvgEIfBonCvE+phARPLne23PZCy3AfXSLXyXosn26toKbT1zMZDS79wm9Nv7HcK7Mx59OgOVgKOb/fcn6/Gr1wZ1Y485fhJWDymkAXEUuWFfcRq4cZ3rYGnpIvtNK3IUliJND54dOOTXeihsiyhsZjMDRtX+jhpYqozozyHPPBcakmz06qh7Cpjot6QwkMgalAha/TvN2F8kJtJH/DrmDF5joCN6g99luN4E2KQCC8l/BQrBAjsE4HLxgvpSd6V8K7Wvdh7RA2/EFSJ8M7SFSa7/7fb+knE+tnyPI2+iRKtMt54JXKKZm9+8jsWge85YZE9+u3icUkmBW88bfKNt1uyHPEZlA0td0zoPpJZziIgSFTxHN9zfUySF3pcz43PQpKfCalabprOWjPM1HSjQVQzXVqcK7XRqeHNfZY3l12gQ1C1JJQu3cJ78780oaWCTwJF0M3KSikQ0NUftS6262bTdLDjJzoB2AUFpJ5kZImBF0066IXloe0YqW09M4tg== 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)(316002)(6512007)(66556008)(6486002)(2906002)(6916009)(66476007)(38100700002)(4326008)(508600001)(8936002)(5660300002)(107886003)(6666004)(8676002)(44832011)(186003)(36756003)(83380400001)(6506007)(2616005)(86362001)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oZ1ZyqtQaGjwa0c6glUpzi1hiRauZ9YlaAnNUioznbgSYmV9LNG+X49YuOlX?= =?us-ascii?Q?w33ZQyE7zJ7pmPthgw6gjooDjypPe912ypG2b/HEaWBmPqLAI3dEDhgI2CFD?= =?us-ascii?Q?06f58QmfJ+MP48w9oCE71UQLH9BWtCl13xrQz1vJL6SrwAvXKJjy37KDDRM2?= =?us-ascii?Q?QRV0wMB1S9bUnVugul8nWz4HMPfb5s5xseeMilYq31eewEhd2agFuCT5WwzW?= =?us-ascii?Q?LRhWNstpI8Va/nVFo/jrcQGqann4feO36sgAnLxQZylmfoMy7+cSADTzoSMc?= =?us-ascii?Q?sR8DatfU3AU67P8zEWvqxNuySXY3Nc3NSS8blTNnTAJs+1WjHCJImVIObutW?= =?us-ascii?Q?okdi+V6/K9bZbT8HhKr3u+PzTO7gIrHotJpL2FsKI88juYBwO6yFq9prXO4w?= =?us-ascii?Q?dkI4X5mD/uIJKFRLP9ee/kIJiqIdI2zP230KFV4QW+tvy2RHwcCijQUXdkLH?= =?us-ascii?Q?J9QjOEs7ralLL6GWR9FjPx/RAi20EPFpaRHMcykNrme7gcrioB6EY9YSE6RF?= =?us-ascii?Q?ICxcYfoG4sczveVMP60xAVVOUTtKLp7FO/wJ1ry1fN3pv17rLLMebv4XvI+u?= =?us-ascii?Q?7an73uC20DDJPCouZku6cczKC9Kk0nEOvYrLnJVOLUjYfJXo943S2fR0fode?= =?us-ascii?Q?tJij+5MOB37Bi8ES/6hCrl7lYlGUdJUHSac1xV8iwZVlqSS49rXls9mjzr00?= =?us-ascii?Q?n9ANs72Fi4ENVyP3mUyUiVSoz1o9uU62paHtfL3ylNiNA04KOlkcr9bzCyX5?= =?us-ascii?Q?wYqBaMvh31BtSHzyz9sRPXIc60iRk8/gWRcq/QyGqENeiEHGNyHPwmRBKMbM?= =?us-ascii?Q?Jc3UHWKRC1HSwVR7W706C+JWsdJYDSJeaQIot9hpps7eJ4Bkpc+5K7T6lBW5?= =?us-ascii?Q?O1LKb/Fvk/VTLpL26KrE9XkJV1X0jwdJtpLheGwVULkVJYJzDFL3Z8h7TQd7?= =?us-ascii?Q?0FGEo6qV7pOWuRHLT7TukEwbOPIM6VngqcWo0rSF+E0NokKRj9Pg5swh23H/?= =?us-ascii?Q?ixXT/NbSH+RvGbkSSveym/HkQ9C069qKkWaG1W1oBT6lwHqlJbs2ddwWULKP?= =?us-ascii?Q?CM1gC/tc/SE33R7GukXkZatFuOr+Kb2eO2Wz3nlmvr94Y1/XO598jzaDNTjD?= =?us-ascii?Q?/GpBF0qzer1JGnlEUiFPum1JogRhjMWCi/ab/1oFc7wODc5dIijI3bg+L8B/?= =?us-ascii?Q?/874P0ShxnCASVZ3UPpBbTNVMZVDKz7wlnVoRfKQ/CDG59TnUrOJo6qvEeBc?= =?us-ascii?Q?cxL2D1Z2ysKcDYFET+CjW5gZA/zFTlSRe+Ua8MBhheS61cVyLr5aCvJbTODL?= =?us-ascii?Q?MMe+mRvzCF1nCg2NclhiOR0L4zacP8Tg0hO8g7AxzduBIbDOS9aAHtizMUYu?= =?us-ascii?Q?IMsmwR2TbH4OSX+9wbVR1vs0NMFz++zUJaschomZm/XlpHhF6RxsIZAGZAMd?= =?us-ascii?Q?4BvlOd9OGyl2HPX7klPe6EVvX+3b9k6XQ21bilTadECiqHfJVhKYNHCC3RhQ?= =?us-ascii?Q?N6CocYxe3M1lDdrYL5xIsQO0ZT6j2bm1oPoly4RWgh9rQ3+ZMDxS4gZ92hUT?= =?us-ascii?Q?Z0Hd+zDYeNrRHXfEXEosMOfCksEsioVlDiAeVGK9TL134GRg1shV2Ea4hHM5?= =?us-ascii?Q?Z/bIrDMFBUHT7q2j0egfxvhRWrfA77UqUyIGKzfUiASmzia88PXVFQFM31LO?= =?us-ascii?Q?D6hXFEUMAf3o4rC6JLGYGNwszt0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5bab8dc-275d-4d3a-3703-08d9d513f07d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 15:06:26.8905 (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: kWbUHnOGpwBpJ9asyIcp2Qhc0YnVdaSGsGKjK9KH8iOfuH5L8lYQv2nTy1mV1s/+K2L96gKJ2dYcAZK/r7dCKg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2458 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 --- net/mptcp/pm_netlink.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 4c06cd6381ef..ef1d58373ef2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1722,7 +1722,18 @@ 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, +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_addr_flags(struct net *net, struct mptcp_addr_info *addr, u8 bkup) { @@ -1739,6 +1750,7 @@ static int mptcp_nl_addr_backup(struct net *net, lock_sock(sk); spin_lock_bh(&msk->pm.lock); ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup); + mptcp_pm_nl_fullmesh(msk, addr); spin_unlock_bh(&msk->pm.lock); release_sock(sk); =20 @@ -1757,6 +1769,7 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb= , struct genl_info *info) 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 fullmesh =3D 0; int ret; =20 ret =3D mptcp_pm_parse_addr(attr, info, false, &addr); @@ -1765,6 +1778,8 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb= , struct genl_info *info) =20 if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) bkup =3D 1; + else if (addr.flags & MPTCP_PM_ADDR_FLAG_FULLMESH) + fullmesh =3D 1; if (addr.addr.family =3D=3D AF_UNSPEC) { lookup_by_id =3D 1; if (!addr.addr.id) @@ -1778,14 +1793,25 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) return -EINVAL; } =20 + if (fullmesh && (entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) { + spin_unlock_bh(&pernet->lock); + return -EINVAL; + } + if (bkup) entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; else entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + + if (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_addr_flags(net, &addr.addr, bkup); return 0; } =20 --=20 2.31.1 From nobody Fri Apr 19 01:58:04 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp3675391jap; Tue, 11 Jan 2022 07:06:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJxGdb27oSYCnw4SVOUG8qK4dkxcfF7Mm5FlSD2O5yQJIt8fGFEu4uK5wPiNvrqlRvazwxap X-Received: by 2002:a05:622a:1105:: with SMTP id e5mr3959031qty.404.1641913600037; Tue, 11 Jan 2022 07:06:40 -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 l5si4037669qtk.610.2022.01.11.07.06.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 07:06:40 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3042-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=ESsDRXlJ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3042-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3042-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 A64781C0B3D for ; Tue, 11 Jan 2022 15:06:39 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 316412CA3; Tue, 11 Jan 2022 15:06:38 +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 BD55D2C9C for ; Tue, 11 Jan 2022 15:06:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641913595; 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=ESsDRXlJ/TNHwzdZWxzuvTseo/jnYEaXfnu12bMs6B/v9NRlb/h+qhaYpLYvQEKqwFJcyb OT0UhUNwPIyV+BSfZTPTrnKCn3TkCUyMejnXsxG+XynsbP9nvMPYyuKnXFqBiFTh8TjBvg 0cqnBMKK7AmlSz9xHFZ7To5Y/Kz2wTo= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2057.outbound.protection.outlook.com [104.47.13.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-PHsdvVXNMbiTBFV4jZIjDw-1; Tue, 11 Jan 2022 16:06:34 +0100 X-MC-Unique: PHsdvVXNMbiTBFV4jZIjDw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TP1WvraoA76WuAiaS0RWgPS3Tga5wXjsSGxB2sTT8NwkDIN8h8zBf4uoRJDdfNsbbIm0rTdm6DfzFZ0OjRosskLOQvA4oy8+6tmlifYRsySUlnUvoFyakl8E8TM2Ij8NozcpCZQY7jcsC1Ze/CsgEKUq6HLPMUS+qIW6PStunAFczRvygVyyX2dyRQ1L/C6P5J2f6LPzdaA2nK4p6h3EsbnOUwnu62dePf0qH8wUERbCI741Xs6Ft1Ne4UMNkpt9Wc+QfQrFPtCbUT1JR2YCT+IrBkS8LYPOQpqeVgxwvdG279HweM1IrSPXCfp9IpSxDyLxIxxVfG6CBTSdZUTlhA== 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=VVlrZ6Rhtlc1e7mGlDHLPjUPPywrhj3YvTLI8AJiqUFh9fkfBIwORtLSoZ5qnJSU9me9+n3HVF/PIVTmnyIqW9Jj/l8LnVOgAaGPyZmNh6ScxjcC6JrMWXEPUwHF30vRsNZ6ltVpvyscY7Pct+UYMrXmajXxjqoPQ+MLKbRvORc+9Be5ytdKxoR6lAudgg8kx5pHncdaD8qCKHMvZR2kbAxGh/5dOjgxA16qdnRn4oHXP0o6XoKGt1lrf2DAnqHH+Fa8nl/mjGQUiyWghepVTj31aBQuJ4ZwDA1vQwmmQD+vwoYa2rM37k/FxBfWdO8scIHiA9cqWkpDD9aZJPm2Qw== 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 HE1PR0401MB2458.eurprd04.prod.outlook.com (2603:10a6:3:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 15:06:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 15:06:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 2/3] selftests: mptcp: set fullmesh flag in pm_nl_ctl Date: Tue, 11 Jan 2022 23:06:11 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0128.apcprd02.prod.outlook.com (2603:1096:202:16::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: da01303e-b0b0-4cc1-f2c1-08d9d513f47b X-MS-TrafficTypeDiagnostic: HE1PR0401MB2458: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: bEu0iSc0N+MLcuZvk1k9YC1AwJQlf6lwSEX5EuQDITrSF9hZaPo6w7pFzEunOrXCo7z3R2ZdtJQI3c8DjeA2jnYE48jJGRhQOMS+u+QJnbWr5QVSt8DBw032G+x1PY0qD23Rx/8lFV0wQjOabT0nO5LgXAOR4K7gile/CkQl7OidhAyLFdNBiTNr8pkQRoqGTFrCbKDHCzb4Af1K2bizOSys/1KJHuLdbxEyZzOXjwzWknnvvgnbiVhmyQOEJXIJqevT0h++QPD8palJH35rAEUBoV0iPPK5nRwsnu0VupPAtV0I+mqEsn7QY/gwBpuFaPo/zNrDbaSrShrYFB1U/99brFONLaKIs++FtD0PwcUWQssGMdLCdF49sfWAlWAy2X2cp0PiqqKO+SGB8CON+anz8I00auKmZ5qS3bwSBDCHzqtwChSLF4wkIb0Qa1tB3JUySY1LxRVl8/RamZ3ScpcqJ5rzeGT8EcudGc3wepf8/uR0LHI+Z4JdJ4Sm1OmGJ1Fn7M9OF2Brcy9G1oF3DS3NL2lD50Dog3usfaA0bbVs/R3b7vI3I98eb9P4FxZQ9TlpJe0b3erRvlbEcGtApunP1BARddgM9RQF8iBN2o4B5RCJ4GKji7yOm6mFLuKBHGvFwK5m9+uQr9FpxniOTg== 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)(316002)(6512007)(66556008)(6486002)(2906002)(6916009)(66476007)(38100700002)(4326008)(508600001)(8936002)(5660300002)(107886003)(6666004)(8676002)(44832011)(186003)(36756003)(83380400001)(6506007)(2616005)(86362001)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DeSc+gjViR+Gnl3pk3uF+WRO5Xp7mCkv/+291WdZWVDepIrZGo8Gx3jbwY9Y?= =?us-ascii?Q?gdmT8x+FPkeBxgCxWCc+Eh1HqiSf0Y8vGtwDgFqHrP6lmeofSNlDcDslZvy8?= =?us-ascii?Q?K/HW0USlbGPQDKdbMoj/w7YZMsYDNZpkwfMiptmyHD+mMXjon/vOASRRHcFX?= =?us-ascii?Q?hr8cIjnutMVfX1b1irx3A/eMtlRRy8O29oFBwxMXOP/Omzof+Vodr8tvn6pM?= =?us-ascii?Q?ZSk6DqdXSaRT7OcYWx9Qm1IclGQw7sICfZ/B4nn5urvT8SxUpeooV1w6LPw4?= =?us-ascii?Q?y33lCcOWVZNQAg7aEKeuRqE85L7wWFenVZNzRSaskhK2A7uT1XDhkpL38H/7?= =?us-ascii?Q?SO0QVsh362r/yguE+8zvi/gO9uCOS7Ell3lq+rBVkQtW7sUphRtx+Y7QXjW7?= =?us-ascii?Q?NCjFBCzhAXkuhkV8fnru0M7x7TJqLduy5BNJbmKi9Sv5qj8b562sfzKOQHm0?= =?us-ascii?Q?Ah5mFYTjHYohlsPqMimby4MHqvalJ1x8YGiE9jaSTvNyc2WVRedUTU2L8sl7?= =?us-ascii?Q?D9+2rWtyrZsubWlzHi6qx3Z3fokkIrKlgdJ5ZRMxVvP+vEVbW3NWL/PTd9lS?= =?us-ascii?Q?kCRqirtyWjOFZialB4nkVDLmS9l7FX+qKRbKth9pmXtAJVG/i5DWU9XwYOh6?= =?us-ascii?Q?mlxSQ9ql6Xl1fdAORjy4MgUUKw7awwo4CG3+YGOq89zqe/3kDyTyqKYpMwI+?= =?us-ascii?Q?I/gpm50kRIW3+MHZBF3sVDnwsELkTK8SPfsxPJQ0Vh2eUUQnlu42wtgxKXau?= =?us-ascii?Q?04M/QOxz5E24Lqlzaus3enwHlA5dV+vSbXefJgiAO/jQNXDZcxxZDcpTyrwo?= =?us-ascii?Q?5O0wv7MK0wWlH3hccCSPb6HCyX960NftpM47u2OfaySkdwomIFMDoDxbtuSN?= =?us-ascii?Q?LlH7i5f3x1Ft3hm97nzwJ1ct0nlWGZjb6gPcDRrx3fsp35hRHKHnSMJM8xbG?= =?us-ascii?Q?yU9H7F4jiOv0FYeuFpe3QnnSXTo4UjdKpioh3zuz1IF3X1WqcNueB22mOyqQ?= =?us-ascii?Q?CU/xoY51rjlBhB5ZKdAcH/5PR4O+oEV3OZKrrDy/lncXObdsvWE8D3D91Qns?= =?us-ascii?Q?vfGVpr6UdTl7UO/5UCr9QUme5Jt/8haF7gkCJ/CX//5Dbs5uDKTX2qe8rFVh?= =?us-ascii?Q?8lwfVGUl79Sa0dt6WwSBjIPHi2kjWvozK17DrFlpZT9Vpz4maFVA4T7/eL3w?= =?us-ascii?Q?DCREgxl3BrM4y9iwLUalxWEyR/fMe9RWjWjf6GbHA0KgPFcLHEDE6ilw4gRa?= =?us-ascii?Q?pITPNk82gt2qotfAzBTaRkt0ZF2HPpAtEh0bxd/t6RA+tIjrzQ6Ag9YEaxQJ?= =?us-ascii?Q?yDNUfUMig6hByBhIolm33ozFiPxeFbOw7e8slN/HLekJWmjusizx+gSKRpIn?= =?us-ascii?Q?PN1gQ47iDpn6A4ca0SKy3bxQQKvInhR0MPbLuEbPFunqYXOwjWMN+NpqGV8f?= =?us-ascii?Q?+FbWI0t4qDzqkNXgtxuUwmrjOiJZ+ZjKx9IlXOG8ifmN2dLO0GUfybcwn5ie?= =?us-ascii?Q?Qg6B16eb2fhGFUoNVa/L6JnFs2u1SqcHcfNvuXw4kojpjwW8/z0yE+bQW0Al?= =?us-ascii?Q?BBxfr/1QoYbrKyFq7nwaXq7paX6sQfxydD51kdWDGDyiwmTs+FuFBAMArDC8?= =?us-ascii?Q?v7pC2nBY1wDKRNKsBaEn5V0xC5oXJA1auhhKRBNylSaGemTUOl9JtJLVIXKT?= =?us-ascii?Q?EDP7IBAfmPPRtsQKIV/Q/io5UyY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: da01303e-b0b0-4cc1-f2c1-08d9d513f47b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 15:06:33.3588 (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: xt8neRi8duYH6mlrmbD4ymmnvRa7SA+YLJxjSUR7ixJTpCvFjfCGd3bfpObi0YjwIsOY8hnghQNTdSjEdn4i8w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2458 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 --- 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 Fri Apr 19 01:58:04 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp3675509jap; Tue, 11 Jan 2022 07:06:46 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaY17v46/Rw5tfTuegDwWDDPo0wJiYYGctRDbFvThiXOZHTC1Y2KjUs1YBqEqywaV3no0x X-Received: by 2002:a05:6602:334f:: with SMTP id c15mr2430374ioz.19.1641913606716; Tue, 11 Jan 2022 07:06:46 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id e13si3768475ile.114.2022.01.11.07.06.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 07:06:46 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3043-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=H+GKyCFU; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3043-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3043-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 E785B3E0F04 for ; Tue, 11 Jan 2022 15:06:45 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DBE692CA3; Tue, 11 Jan 2022 15:06:44 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9538A2C9C for ; Tue, 11 Jan 2022 15:06:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641913602; 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=5TVkC7bV2MUh2xAPGf+/ZDKfS66v98p9dgi4fjYS63A=; b=H+GKyCFUvCeR3YJPJbggRO/C/ry0q2X89u3tcolE1n5/1A9Q1AnSZAS2Xex/49PH2ba0t5 eX/eqvKs3uQP5WorMKztxG65AgBQpxnCgb6KBQOcIea4tjjf9dFoR+LTJPYpnvVZsfsC9j b4yRFZ9e9pHGi9XZz/Q37cDLktH1M1c= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2110.outbound.protection.outlook.com [104.47.18.110]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-12-dxYnV0jhMi6iHPjyZTvGFw-1; Tue, 11 Jan 2022 16:06:41 +0100 X-MC-Unique: dxYnV0jhMi6iHPjyZTvGFw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GeSMBS3NeGV88nvB+13c3yOBHASkBF48F9HDHu2/rePJnghhWHTtn7dLM1oZpvPlZKh+oP7nVzq+FocuMXp7WtQhk6YNaipsfyvkf6huBVCIw1ctVg0K7GTdMEyOhXnfz+xubj+OlF+rARkW0SpgdukwncsWKiBPhWSBDaLYNG1bp9Z21U0wspm8SFJNUWWlT2Ejxm6Q+o+pl4N2GT33JL5iFGJ3Xdb0CA5n9RgyhGlEE/zY7/i6xzXFBHcoBbByIBacojAVzxvt9QNUC8vHlFfh3UQFG5D/lauTijVEIFlx1Eb9rbDFVkcIpuw6zMJgzZhHpNLL9mg6r448DGpBIw== 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=0XXeEsixw78gM1tbU3VOBaEwG4prjpx9drFEfzV4mGo=; b=Y9g7+aly4FbLp8OlFTtsO1c5iRBjAoRrf7Jaja4C/LaE5K75ufOiCaF5wAKhaQqY7CcbQj7Ao8k2L1B3RIivIrSVV4OjFFrwwkOgKnZgIk8LkHnDDQykz0GDrYkhRC047n1yi/oNTkqHIbhTF7za18TbdkV5FwY21rSRhFKHbpHBxqj7prg+Y3GpTHpGtO3XM/9zM7A315OY8IzOvv8zdh6+nhX5IBFWQVAvKEjDuhIywbssQi2PwaICDy/3dBUQRfZYfjhgKvNJ3D55VqAQpqRMA9m+q2w7eoHT6wfm/bbqfQ8qzaPCjbwp+U9InaATugHirRZDYcY8qqDa0FOmpg== 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 HE1PR0401MB2458.eurprd04.prod.outlook.com (2603:10a6:3:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 15:06:40 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 15:06:40 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next v3 3/3] selftests: mptcp: add fullmesh setting tests Date: Tue, 11 Jan 2022 23:06:12 +0800 Message-ID: <8c0845ee8eadbb70bf9bd4a263c23e64e530d986.1641913113.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0192.apcprd02.prod.outlook.com (2603:1096:201:21::28) 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: 1f88a667-1340-4bf0-10de-08d9d513f87d X-MS-TrafficTypeDiagnostic: HE1PR0401MB2458: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: P9shk6psUotoakvX+4c1hL7/6myK5LtjspBA6GK81r+cjyqpWeHEya7ZnrTuNWj+El/OU7ybQC7XJxZjIxWxXWn1r8rVbziyMeMM4+Q4dCFgo96ClQo3xcGSWygEdMUKq044z56GZIFIS1VurKRZQKfUs3fJwUH7PaV8TpUYyaLNecED8TPjQ3tETpTTmibKQn8OfMrykFVCZaNxBPeCE3V1HMHTNV929+4FD1xoJXhsX8WPcKg2sMtLfR0hOBIC/IGEeQW6Z67gVyKVHUq0wKlROxvfYyojmBJSw8GxKsbRBo7weMi7O4TUjUCgTCESOAJpudoJ6CV6SxQG3N5UsO/c3izSOxnqKjmb/T5iT+K2hb9EM0ODTisnjFYD+HWTiO7Kyhjnm0K+HaakjJZr1CmzLUVoUUZaTk7N+OFGblMW0RGsbH6oC+Sl1bYwyHPgXx+UG8GPBex6riSU96yPEOGYdwWaEbLP6irnVfOir7SU9uag7M4k47QLXWE7FmOafUvIWrezfDoMibd0W2BiA0n8vZfJz8qaRD7rj0FRNUQSUcYWyYlQ2HeixlZPoxLJ1YAy5Xt8ydsxI/TbRGcJxfjqNMva7S0gwxrK0QwXmXl714ygZmnZXyi0fAz86XRwzE4ApwG+y/xFKtJn1dFClw== 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)(316002)(6512007)(66556008)(6486002)(2906002)(6916009)(66476007)(38100700002)(4326008)(508600001)(8936002)(5660300002)(107886003)(6666004)(8676002)(44832011)(186003)(36756003)(83380400001)(6506007)(2616005)(86362001)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FunjvTVJZI2BrEaGqRPyNP/PPHeU/z7yr6KIdgiikQQuSxHvzMXfWdopuIxE?= =?us-ascii?Q?cYPHlHG66pnVo97cAVsDJQPdT8OMY0TDC72rl6WzY7naSj0N085PpdQ7oyHU?= =?us-ascii?Q?qJPL5F/yP97+p3cfxBww63r5T6EbHhprn5+IryyJkJxP06Kt0oB3YURUDDd1?= =?us-ascii?Q?0EmLIFubBp+2RIO/OZd/hZM8refKRuo6/gPUQieHI8513pphSl9w7S1Ehzth?= =?us-ascii?Q?AtxbbjvDGCGVxyTPdpwaMbv4pwDWWRticU72efJqUC47EEbBz7RVgUgQTLzF?= =?us-ascii?Q?CStXIsm6d4X4i3TSAaQG5VoXvqCzZoQSRBLHaV31PGVbdnyQi203NfBlXAx0?= =?us-ascii?Q?j6pLp6Uafupy9iGqTQmY5DYWcLiNdeSHQkXaj72i5jg86tiuB5HF0EFSXQqg?= =?us-ascii?Q?NU3a8db/9FhGiDfJb1EvF6Yrk3+h+EoAxz5Wm26D6sC+jmkmmGBryDxbxhni?= =?us-ascii?Q?VyUGZvTsGUY0HBfZc3EXSvVAEImfmlYJQp78JO8x4kJ7MBH6xa4mMkaqLO+8?= =?us-ascii?Q?f9U/YA3HKoMxV4GHkieDQVFBa+suS8tNz+y31CphcdUOulfXUNNoE9mprucD?= =?us-ascii?Q?86msCW6Hw6kGs5CXf1/oVd/Yd9WEa5Udfxi6UrB4j4pvbOU74LH7xjqGW7x0?= =?us-ascii?Q?3aYPkdXT84MNbF33CyGiPI57xyrCpvTSY+tWbWGVHNhOkvYkBTcHmw/NZ7q2?= =?us-ascii?Q?YOUiOxG2KEwLBUHPNWXKEQXQpW6XD+unpJblUzHAwsJ0cNp/W7OI7fjCbSPN?= =?us-ascii?Q?wE4szgk3Fr6YXmyKsjd28wB3MbyvLumhVT0W8UBf6/9ZasRtFfVnCghTaBP0?= =?us-ascii?Q?fycURdw5mxm2O2El3U1bduXgQ7Cv0s05fYbJIHJE8jrpy0fweth7MAfEHwLY?= =?us-ascii?Q?X68wCc/xRa7I6XX42LVkNaMf99J85UcMlKSdhOwDylSJdTk2IongCkPTXRfK?= =?us-ascii?Q?KTwkTZbCfkx2vtzHdZtVkVAdiGAwXi4MGqJ3fCdaq183hB2a4kbpvx8PopXi?= =?us-ascii?Q?/QAFySE38L9kCxXKhKmdoJdZIeHww18AHwJiJGEkXwPP7lz+M7WNDGXEzeRx?= =?us-ascii?Q?wHWcbor18XpVhOwBB4vbx1G+dX+5vW58R2dmuxC500ppnROcg+0rJxUcGqJR?= =?us-ascii?Q?LMx92Aosc2D/dcfFykwkyhq18KtkUpQvMs4s16Ats/2CMFB0KWVhWYXWc+CL?= =?us-ascii?Q?q+zLKR1STPnEhu6JoG4vIym/w8TQ8LzKYosI+5WHVZInXys2j2ieHS86tcas?= =?us-ascii?Q?BfLydB7tt2omVrJrVmBvpuYsX5/+iNYsGpUOFcPRk7bNKsmhB5wAHsrFyEIM?= =?us-ascii?Q?w16A15AgujiMsqfpR9YXLhPgk1SQPuSivSyVoqdWXnTDsiGaYCM9M3dYAT8F?= =?us-ascii?Q?nF8THiwSiEBotGJqEkVO1BuQ6N2DEdPH3OZLSxVkePPE9Chl5NIXLARfg24k?= =?us-ascii?Q?9BNLszrfoxoN+Vy15zFkeMyeFeMiLq6GWEBKRGICJVrlrlIKIE0pLEnFOVQA?= =?us-ascii?Q?FYSFkTs8oZueRlYlqLAnLMb3LlFYSQRDr7+EKNHxfP0vT7woXojhfVxyIMvE?= =?us-ascii?Q?kREpFNLtPeSR1yXNrStE3UTJnmDhYMYrDFb/ZtS4ghhD0xnydTAJ8pUkSnjs?= =?us-ascii?Q?sNnlLWjKMcrF2dj5H/m27kcEeRAI90RVBs001mtDeJj+hKe1JfVnILF0kdT6?= =?us-ascii?Q?iLlbjHU4XGb6PaXsBV9L249H6Tk=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f88a667-1340-4bf0-10de-08d9d513f87d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 15:06:40.2801 (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: 541KCqbDzXKRp5zI1OeBuTE1bETBMEplVRnLqatIqTTQWt5SXuNOj+Fc1jcAGUVCSGuOLRgwBbgR7A98A1Cdag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2458 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 --- .../testing/selftests/net/mptcp/mptcp_join.sh | 29 +++++++++++++++---- 1 file changed, 23 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..3060da3f7c04 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 @@ -1921,6 +1920,24 @@ 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 } =20 userspace_tests() --=20 2.31.1 From nobody Fri Apr 19 01:58:04 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp3675635jap; Tue, 11 Jan 2022 07:06:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJz4M5/5CdV8w6uaJF+YNy26LK8yqsYEsD9YAQzIgjey6P4XvpG5q+QrKfhHzQKiuy/8K98h X-Received: by 2002:a05:6a00:ccf:b0:4ba:ea96:dff with SMTP id b15-20020a056a000ccf00b004baea960dffmr4974267pfv.82.1641913613728; Tue, 11 Jan 2022 07:06:53 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id d127si9298467pgc.97.2022.01.11.07.06.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jan 2022 07:06:53 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3044-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=exHozEuy; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3044-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3044-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 0D6F13E0F01 for ; Tue, 11 Jan 2022 15:06:53 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id F26F62CA3; Tue, 11 Jan 2022 15:06:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 997FA2C9C for ; Tue, 11 Jan 2022 15:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641913609; 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=mCJfru4+unYcE3qUohDtnc3J8ORVCn12/N2ICZxZh3A=; b=exHozEuyBUGWhd8rLbOoPdbe5dWJarpPao+98nNb+3pUt1GpTk1jvkggthiXFXKwHMsIOt qMZDevtapd3i9umt3JU8odijs+FyoGBHoBmoRs+274aeC5iYSAF0GhFAzZLTWdSo3lV1DP DIWVugVdbyTnP/7SOMHChHsGDdaNYr0= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2113.outbound.protection.outlook.com [104.47.18.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-28-ZH6qJvwMMHG9GsXGPKHXKQ-1; Tue, 11 Jan 2022 16:06:48 +0100 X-MC-Unique: ZH6qJvwMMHG9GsXGPKHXKQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=blQav0r8BnUuN6qzZF4Xnu2+fCMTxhIr/g1LePKNZqKVP5Zsh+XGffQn6dHlVTQumR/8X+DMQodUsYyAQWrzXioOAxRgefBnjpHwmFDhohRS6Ku0ko+RofoyukOxYT5eG7nZNsxHp+5MqENPcQs9Rc9HxgaVF/gEQhgo9YoiTcTCAsyjaNDmBpY3N0I4yXGo9SkL18gOSMZLgOyqW6r3K9SaOg0mz6MvEGsjZyE5rr1VBgxzgWqXj0Jo8l6avelcRP0RnIXUTQT5TDIPVSYS9hZDWljbtUybsksbY2idsXNlLTCGUxlMbg+lMI0WTbAeECd1F4+3bkXKII61vilL3w== 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=bq5mrEP9IOuT1FwxMVbGxBs1X4a4b0Zv7UuitJ8cenE=; b=HLQFck5mS4e7IVnV7lJvag6fgq74qiH2ABegViC27VyPHC/p/32TZQB685bQMdTTebaA6cv0Kgn+4VTJmYlS/aFCDSwZklgnwT6siFYFtn/4zJSxVrXwV/a+zpTuAOBc0Kjub/lcv0qYM23dsh+5ixpg0HEC2//KtCq59StmikZX5W3u8bgYAU2sJHbwL14joUf4vnYiuF4RDdJy7NfZ+r/eKYy8YqQkOdwpIf34JocWRtJJGHOqAgTuJA94CAY9aSiJtbh2eVZMXYbV6yFUGEU+FwubFZqs8jvZHmi2yq/iLVeQzDeGY/k2iH4+UyxNl9nX6R38depupS+iLA+aAA== 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 HE1PR0401MB2458.eurprd04.prod.outlook.com (2603:10a6:3:7f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 15:06:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 15:06:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH iproute2-next v2] mptcp: add the fullmesh flag setting support Date: Tue, 11 Jan 2022 23:06:13 +0800 Message-ID: <8572578300cea1a3c3f6b4979c72c1a285ee4e41.1641913190.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0198.apcprd02.prod.outlook.com (2603:1096:201:21::34) 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: 2adeee2d-f51f-46e6-f17d-08d9d513fca1 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2458: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: Yv1RgK3Tc/mn1xM6Y+PWFUwtRxlEMOyue4PPo8wU5Tr9gAAQ7s2wMErjv9aLobmuXouY7RSnjhrM+S2xkubq6z2yWxr1YMgewzvPQW/tSDbnsTqYgRdI/7RNsNQGppwrd8VaX0DUqH21HKq8va2OoIPVevGdg3VoyztqQT6P4qrl6izWsJelEKEzh36QNp8bVA1e1aucM/sHA0cYfGHlZgUQg9jU17ZOTqvt3Kt9yV7FLYXFBX3W+sgILnJJbsLTJNwRgxwNvWxncuWCI2Xr+2o8tISuJ90JsV/SuXB9+ov2TfA+YaaLUHTyoKY4IbEutFSsm87gWRnHSYECK5Uqv99kZIPm0SC2ZuIg+h8o0o09j5GxQKIOZZ5nRC2PI2SciBopWGC9dWfD2bq3ikvpaJ7Zxml8s0tSL1+R0JICoAe5aECufIo5+xgohamlm4Nn0M0FAz0NfITgt3PT71SBNF51mWbtrhuRbjVU0QpJwB2gE4/5ls3hB0X8S7C5S14BrG+IHTKOPfP535NL/jqiE0tdVhUhaHMuYaLJ3e+LxE/aHT7UteB9NPiay3GYc+7czAcmCCSzC1OWHPJOZP3G8aNqBKhaZHAp1+lkm49wtWFWXT7x1shNuC87oNKRTiJdLTIVn+lwu8CBRVmf2DtHuQ== 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)(316002)(6512007)(66556008)(6486002)(2906002)(6916009)(66476007)(38100700002)(4326008)(508600001)(8936002)(5660300002)(107886003)(6666004)(8676002)(44832011)(186003)(36756003)(83380400001)(6506007)(2616005)(86362001)(66946007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5NvkFM3xgk4+406rsdpGgCAkh9Ihs1Y+X3tlxn9WZ71BgbRwHO4kxnsNfgiF?= =?us-ascii?Q?l0LHm+lYF6URZrpmxJL2ooD5k8s5K+A++vT1V5HLiHIlYkO6q3tghkTqAmx/?= =?us-ascii?Q?asScDdpEx2y4LzEOvUsyv/lK+OaAR6mwT6i6yEAP8NHRFMs/Qazivhpt9v0F?= =?us-ascii?Q?pfGSVa1Hogc6ZMGObJjLkOVvbBSgBfsvYEymWyY/8Db3sE30Br35HVSmO2Cm?= =?us-ascii?Q?TCVGzyq5EAxZvN11bXo45tOLJbKNkD7iBK/8mk3dO1I+lPwJnuTQqAy3CD8I?= =?us-ascii?Q?TgX2znYi8aQt8zMe1dbLlvTRu3zyKL4cKKKOz2B7ArXRGqxN2Sxna7xXOlmC?= =?us-ascii?Q?6/Ah8FPquNDh8n5WSPdoG5t+tQINU6HjApNc7Pci7Kh0Lkrw4sHIyX+6F/af?= =?us-ascii?Q?0OIHvRVPsqKlZ58smRuGyqz+ELTd8ZB8meX1dXcYGS30WbnAdiUntLwPiGth?= =?us-ascii?Q?/EhjxKBYVZHQg+xSwPaRtJwuTChpb1P2+hfIRFgbyo1CFOOIymYcIVSZakOC?= =?us-ascii?Q?Z1SRnjBGhYmnoHwF7c2fy6uVLMLc43Fr9GJ9YSeIhrq/K5APjon8Op04s08R?= =?us-ascii?Q?z2MVLk+o/irlWyN3botEGA1W1yeUYhKR/qUkODr0qz8uW4imX7xLAArj4RH2?= =?us-ascii?Q?Qb29o2PZcxKfARDE5v3M/wqgN3IqfAjusCxgw8WliVLVxe+FCh8ia3QejyVy?= =?us-ascii?Q?SktVMHoUB8+8mxkOr+65EB+2XMq7lqJ7No1vlSc3mqrztOEc62ADhr2W965E?= =?us-ascii?Q?RtGx2xVFQYY0v4LNpLErOY0XtqS6jt12Nr7RgOaOpPg6rcllaHKSIpsfd3mS?= =?us-ascii?Q?6QmRuyiPtuitgjp+ILuKDDaXzKtQGiMjbcIIeV0HQygu7/sA0D1rLGPm4fsT?= =?us-ascii?Q?Hny/wdGGVR8tQPw7/eRQl2fUVJ+mr+marFS2WfbwQk3iAERAXvteQDWuD6Za?= =?us-ascii?Q?P/WCBZqxDcsXwl7mKq1J0U72K+tkL5ylOhQx91/K7HtWJS2v7Nh9WtCe93g7?= =?us-ascii?Q?33Hans68/v6zAfdiv3frxK54kPne1wAxjco3+4v5aiOENikUzlkchJrpZu2O?= =?us-ascii?Q?zzjEjfgS0yofsLcUURcrNM/StV5tBUpcY9nNcQna3HmXvBAODDlEWbLidd5E?= =?us-ascii?Q?xmw6qb94YqT9mSpRnuz1DIlLiLuMbcR+1yVb0u3fvj2fHGM08tfriBxdrVst?= =?us-ascii?Q?qqJX34rduPHYBFpmy3UKTYH8ld7JdaO2FJydMZ45hUeOhsbqYb801gPIJfv0?= =?us-ascii?Q?BC43KZz/VeN38Qx5xbCcSwunYhLJKSKRpAdghcTFN9FJE/X1jo1/tMALybMn?= =?us-ascii?Q?fr0ja//U/BJOC0dyKfEllrIt7Phry1UjnRjsiltHqNuYjAsIl7ARdobf1WWM?= =?us-ascii?Q?xAHH2Bhmc9/Mk7pK8lviTGVFKm2ppMAARQoNHyJefP6GU6pJcaPgoMZfl89H?= =?us-ascii?Q?3d6YyP8Q6j+cJshTmaIJPs5RcltKtd9QM9w663JL4K1dv00GLY1uMMSWL97Z?= =?us-ascii?Q?9nS+0T+1i/JrET3zPg34wRPsmnuauJdgSxUuulF1h0J3mZD3RtST0IfGTWE1?= =?us-ascii?Q?9l9UcoZ9CDJfnbJRQIt9DTNLAs9bawPNdr6ZYyrnyhNWWiwJIf1SNiuOiCAC?= =?us-ascii?Q?9WuoNsAFpeDEvMKVIissh/6/w7WWV19lvr0j5CRjxlVkGBa+elZ5y7hm8QU0?= =?us-ascii?Q?HzHuWavKx4j6YC636oRxiesqX9k=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2adeee2d-f51f-46e6-f17d-08d9d513fca1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 15:06:47.2483 (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: kOCdqqzFag1zGRk+YC5MUHz0NEuthqd9+oHK8zQVfDJ+c4B5NqgpiKg1SmGjmpm12V0Rs121LSBVl6M4np1ciA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2458 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. Needs to apply the patch "mptcp: add id check for deleting address" first. Signed-off-by: Geliang Tang --- v2: - drop MPTCP_PM_ADDR_FLAG_NOFULLMESH. - rename MPTCP_PM_ADDR_FLAG_NOBACKUP to MPTCP_PM_ADDR_FLAG_NONE. --- 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