From nobody Mon May 6 17:27:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp3806478jad; Sun, 20 Feb 2022 22:12:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLXN+qSnIlglhadAJeOocnLvOlEk2VJGhRQRxTW63mdHKRTPmwX5pjyL+MuggDXTvq0b/e X-Received: by 2002:a63:a80c:0:b0:374:2526:2d68 with SMTP id o12-20020a63a80c000000b0037425262d68mr5292867pgf.572.1645423944309; Sun, 20 Feb 2022 22:12:24 -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 c7si14197990plr.251.2022.02.20.22.12.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Feb 2022 22:12:24 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3920-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=UTlU2sNu; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3920-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3920-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 ABF033E0E6C for ; Mon, 21 Feb 2022 06:12:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CE6B5210C; Mon, 21 Feb 2022 06:12:22 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35F4B20F9 for ; Mon, 21 Feb 2022 06:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645423939; 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=PkeatfizrXQIJ99/tdPYpVW3OtCAmWZ3EhQ+jqvxDUM=; b=UTlU2sNuwgKZ6azdSrwFPulb0MRZ8Zn2zdiCk9oRctjd/EseEdauJ5p4J1j977wCKIBOxY O3TiAleruOIAj502RKieWOkUeGmuzYW69BRzElU+1Uc5Tbm/Ts+ooUzpHgC8aQxfdm2vYW trN/pr0loKGyypba1+kOlGSd1Sb9o7M= Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp2054.outbound.protection.outlook.com [104.47.10.54]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-34-pACvGJNcOTqow97sxTkj7A-1; Mon, 21 Feb 2022 07:12:18 +0100 X-MC-Unique: pACvGJNcOTqow97sxTkj7A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g0Cn+UuXE8M92bvp6Rqu2GOtBNYXbsbbgFX1oDMfoTkeF2ZvgAy9J2/gaTdxPBEdB3VeYKPYP94jldBFIQsSMXSm7iZIrGouaxHBCiXfVU0SNF39+CqPL2Z0pp5LPEb0ZJfmJKtjwWN/aWpmRGGWIXnawo5+15jyt0u6fRSM9Kz7mAgfZFczIxSN6EzJn/9Y47s3E4hlJuSrhc9VdtdPX+9O3I2INXAo1b0YE/rSvDkgDlpeGyVnZwC8CSFfdnHkLgNHvYJnfNoUoPakPSR2qCEVm+TpikSJcJCR+vJbemgDu1cS7tHaxCU9IMxo4ToFeRRse1Apl+vzdU5ujgsPuQ== 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=V08zv6rkhHHKj34mR7Ygn/4fZ3xuwHPdv/RprAC6dWw=; b=PsM8G5EaSmqcdOApHcpsXWAs1COaBL97+/GylLege821mnwyuL7SlfnHh1IWnYvTDXR2eVv+rp9Vj6S5XejeQbOX8Kp6nexdNvSMQAQEYWdlR5EKHXQ940N0bFcR0Vm6e9zuZHFWn0/FaeDWXiKbKAB1mdnhZPWRFHjzhwRjzgQJ4qtQPWLYAEyevN/0LKInUhVjaUUEfzEoAAZo7+bQoZnXLpJTktE87dSjJFez/6vHXSxWbMryTKuKw4sHibNzDyXfOygnBinFsCJ/trXs0Jjm0eF2UqIhikNbATq432K2w3DyF+Ew+5yo9/SySYTyFCEStwMSpo3CIOm9J2jSpA== 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 VI1PR04MB3053.eurprd04.prod.outlook.com (2603:10a6:802:6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Mon, 21 Feb 2022 06:12:15 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Mon, 21 Feb 2022 06:12:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH iproute2-next v2 1/3] mptcp: add fullmesh check for adding address Date: Mon, 21 Feb 2022 14:12:36 +0800 Message-ID: <41e5b4267e4cdbac429e82504e1e47cf4284aff4.1645422873.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0170.apcprd04.prod.outlook.com (2603:1096:4::32) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a07dc35-9650-4913-8e56-08d9f5011b4c X-MS-TrafficTypeDiagnostic: VI1PR04MB3053:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BcFN17XaF7bq0qK4lfCid6vGxUOkX8Qw+ao7Qo0y3jMtXkr0m7JmokUDgYFCQiL/+U8CLyjHNwUfJHnpXTtMtftj06cI4qsb/Df7YRVPzDWdMT1337kMTgKGQXS6G3aqRQIJUz8E1KGfg0Z64lSLXnjKPY3hiYhD/aUyC8q2WP1ERVYbdPuc2dEWWV75vFttZvpKBAU4tGUBsLGQaS7Gi/S7mCAJgMUgP52SqoRWgPrJVn722m4wvSrV9qY2MSoPhgPpqCaEm0bT9LwXlvWWNo9+XTdTL2r2PQN5/gd0n2IlJq8HYjoiWdCuvPeLSWE3mG/bO1qnQTmg0wGeWPn26o2F3Erk1nMbjfSQ7q7gs6Uy6yVq2/zuXEDLf7IKT/LvZL6RGgjcz8czusSHVdn0M4ITObj8q5xET0MuAX2bPL3grRI/m3yX9d2I0vgdG2nsF1ORWM4WH/TulyPFzNT/75HNsZ0RV4Sm0y0NVQz7zhoqaCOKOM2TPbiVWTi06KXwAg7d+lCStUYLwyKkgBZELUwqVB5QADyI4SEBWYHHVj86fDswDYvvcnu8TovFWOpehlIzcQQS2JS2Fy6bWK+33+KM1wif6PL1867ABdeZWT5CyWzRxYh2x87bhfDm3oVN7e4EslOmnhfRAbhYARUzmw== 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:(13230001)(366004)(186003)(26005)(4744005)(2906002)(2616005)(38100700002)(36756003)(5660300002)(44832011)(8936002)(6916009)(6486002)(508600001)(66556008)(4326008)(54906003)(6666004)(8676002)(6512007)(66476007)(6506007)(66946007)(316002)(55236004)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?cS+iuMbDtQggaZXHfBgVDUrLgBDJ/aM1AIPHc7L9zE1K8G+DJcR0VtmoL2lI?= =?us-ascii?Q?gTAI0V1jOJmUPX3+Z3I2Vw3MnEXgwv2xvXAKaOkuxIK0y2BRf1pYmCxbFY+c?= =?us-ascii?Q?6G0Nnan5kdVS4Upv2opo7Hkkx9UUKLD3tvBvx86khtLQzqJ5NrsP/Rc/ILu1?= =?us-ascii?Q?aJmZ6fUL8bptB/Tg6AXdgSVC1cGCa+vaPuQerD+C3Wx2xUM9npv9dHSa8Klq?= =?us-ascii?Q?g3zNuoPKX+IIKU+SzG51AEIWkgHvOguvTy6nDGU5jZNUtyP9bLR//D3NBgM2?= =?us-ascii?Q?d+gjQJNN/9eGMo5lyu8c5IgbnGM4jIwdvTFiH8YLBfGqesxAUCbroZdH/59J?= =?us-ascii?Q?HwsMP0d8BVPKxlU+fZN/kHP2XB7wEsL5M9zjbtqUJ2t53HIO06VtFIN+sRA4?= =?us-ascii?Q?4AbnzLhLeWXXj0RLTaiqBl59H0B59hGzxrmISIC1kuLymWOM2/2KO5XSaqKJ?= =?us-ascii?Q?xK9I87hGG/WVu+iPKxIEWXWh8HZDG8C4UgRjrlS4M2seXczDvqpok0YW8Wq6?= =?us-ascii?Q?Qm4397cvtqolVkqlSFNb/xs3a6AHMplei+Uc5uqvgUymgdZwnvPDyCUF4Hr7?= =?us-ascii?Q?6Rae8dW3pkiaqRbyRJ3dJBlDRp5G1hlZ2292T4NzvsDOaG/4Iss7DKJYRxzH?= =?us-ascii?Q?rILNDO95yKWaZRKAB67m2AOzxCYwyMuRnUH+BDizXigCVSeGfGJr8mlf+AE8?= =?us-ascii?Q?ruglZDmRSq3tnqlVp8qjkT3hVq2kHbl4d4aBme6+wuf8l6wHlqe8ZQlVnXEB?= =?us-ascii?Q?WCPeXMr/qmlV/JSfeUfRJ+/gLoN+gct3LGDlC6hsAtrEk2m3gTsMhLj3/cIJ?= =?us-ascii?Q?5ZXT7ymT6OaOjQlVi4rKbEYs7ZzgU9z0V/85w1QH9j9UnyZgMwjuEEk+512/?= =?us-ascii?Q?NwzxaMuTPI0ANUx1XzNy8oQCanZCcOiLMRZn+KwB+0r8kFLsZa2RAWz0rFwh?= =?us-ascii?Q?wgc464K2J6mJ/crkzzJ4R5DNQ0KIfnVfhs4AOwVmJQ2Lyk7RZYbU6Ys/MpqM?= =?us-ascii?Q?xmZIiAzBgdNqsHOrKrk4YlgGZiExRO/j9ODeda+m3ktz0MsLeu4eHQdzi6mY?= =?us-ascii?Q?2mRIdR37SPUCKQCn8GIoNhQsc2BboVluHmpUB/Z9ZkiK6okbC2xzEfsXF137?= =?us-ascii?Q?6SR1DAKVH73tRxBjMCEJQpu1N2RsLH0I3j01gjGbVsaSbHUZyEKOdMV+qRba?= =?us-ascii?Q?J+Og220cThFyzjc5w2pg2VK3AMZBroAxxc6Rmrp9sdbQApmFsloCoqNqaj9K?= =?us-ascii?Q?iP+qrXUrKiChJNQprpXWh/UnsEHbjfp95cr2ALigiyrVA6XZlfqw4PlUlHYS?= =?us-ascii?Q?t5cPI/Lh1R6Cuj8n6CDusjYsJedWqIxBs/nj7WGd6ZBb4rEtIuCd8jEXnL5k?= =?us-ascii?Q?yBHQtQ5MVhhb7pxU1CqhvbXtduY1Tva2DvTq3ftHzn5z1EQgWpQ2Dpw8smAj?= =?us-ascii?Q?NpLyPPC8+uEcATRTbIIe7+YHWND5Jkvup/W2nj9Dnk2DUMWTqxehG6e9RgN/?= =?us-ascii?Q?loXEujg6EOn4fUnfcofwSgafcEhXOYtce2q5/mgY4RZnmt2K6plmnVpLdNFv?= =?us-ascii?Q?R3p5sfhZEKZNrYm34YUT3CAiftHPqT1/bt7rp7cfdaz+Q44OeyWxWtLvCgQS?= =?us-ascii?Q?vKPlVYmtMq5yEwA1P8NBCW0=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a07dc35-9650-4913-8e56-08d9f5011b4c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2022 06:12:15.2972 (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: AlkHpTfCtThsvfKSskdhSk+ENHsCs+M9WOFRG85AvimppqKFGzYvNM8XNcLFQ0SAzzkkaS+iuMh08VvMFH6d8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3053 Content-Type: text/plain; charset="utf-8" The fullmesh flag mustn't be used with the signal flag when adding an address. Commands like this should be treated as invalid commands: ip mptcp endpoint add 10.0.2.1 signal fullmesh This patch added the necessary flags check for this case. Acked-by: Mat Martineau Signed-off-by: Geliang Tang --- ip/ipmptcp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index eef7c6f4..0b744720 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -116,6 +116,11 @@ 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)) --=20 2.34.1 From nobody Mon May 6 17:27:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp3806524jad; Sun, 20 Feb 2022 22:12:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRRsdA0Kjp4dCgoWlDnkgpJPzBRwihmyvTBAjCnL/6kLyXvJ2YqALjcBGfaCVDQ0lQkFgB X-Received: by 2002:a17:906:6b8f:b0:6cd:7984:26fc with SMTP id l15-20020a1709066b8f00b006cd798426fcmr14557656ejr.701.1645423949781; Sun, 20 Feb 2022 22:12:29 -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 z16si8302829ejc.582.2022.02.20.22.12.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Feb 2022 22:12:29 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3921-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=EIWTquPt; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3921-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3921-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 B179F1C0781 for ; Mon, 21 Feb 2022 06:12:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8968A210C; Mon, 21 Feb 2022 06:12:27 +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 24D6420F9 for ; Mon, 21 Feb 2022 06:12:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645423944; 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=I7fEPjR3MlWt1lo1qlSLeG7RTScXOJ579J3jtddHCfI=; b=EIWTquPtq3+gLXnD6noh/q9z+kfuyzigPKRPnWeVRPrtqsijnRbSo74IDCHcNuE1E+f3gS iALMMROK/07AWjQkPRrKTk4+ZyKzBjHM8EwMYx24B8s1P2qM6ZLl3vRCsXZgHfeCTJJ6Fe GdKmwPfEgwZx175e3f+2WHy2nE0xo90= 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-2-ji2dWDl3OgidpgFETUBMiQ-1; Mon, 21 Feb 2022 07:12:23 +0100 X-MC-Unique: ji2dWDl3OgidpgFETUBMiQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aQhwnuo5QNhBgh8arVDkli1ij8o+Qp2Tcu5fdHDaQjE1y9pl+aTQKIS3PMF5gfEa7mv4VNZdCG6c0zJdkRpJA6R4pOYmjERakQlB5FIgRnCQxLZCWduWlFSPO+2AEa2djtsQY5ROii532YsBRqwqUJGs97R6weEwYLjmx9pvii2PtAiJRYBZSnO7eXYdYKliQ+nFQWEP7p7o4H/zULjZHLAkTAmYb7gYWDNpqYl+hPHosXngOjR1GF3BlxUyv1QKVQULvpL56Wq68YOVbknr8Xx3Fv0FXdZ2Pds7c75OyfC2oCTuWe8S7nYRlYsfhy3Mfgfyp2INhW9gCx+pyt8C3A== 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=Ie8GHK4pZ97/2v2yL3M5gGw41FClcEuA8gxWdFb7F+4=; b=BHytjy1aTk9qwooZUWvwXhI9cIk2FDoBx1yuAAvCHlz7k5L5U75gvN3MRy2zCRJFMSc7wINiwCQ434E+06YSLawl27otKZhlYJG0jEiibavdOTnbpV8MAOc1gnC21mCqlvfdndxhINB7qu0NeNAnLYHfSk2SpO8PEZf+Uu9qvfRsZQjUgU+/mAEH2ZBg86eyQ+4+2GLyn1gIrA5Ns+NuCOM9C028X5wJcPRlnxPtks8eWt7lJFDhmOXu0IXQmfOdRT7nJxx4Hyb/fp1kdBL/ZPWcVS4zrgUP1BvLJW/NXjVYbV1mzs9qHh3ibGQOlh5fdvDH/9A6IenMdHkgcThssQ== 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 VI1PR04MB3053.eurprd04.prod.outlook.com (2603:10a6:802:6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Mon, 21 Feb 2022 06:12:22 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Mon, 21 Feb 2022 06:12:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Paolo Abeni , Mat Martineau Subject: [PATCH iproute2-next v2 2/3] mptcp: add fullmesh support for setting flags Date: Mon, 21 Feb 2022 14:12:37 +0800 Message-ID: <5747de1784ce159db98fd81fa825c451fa0c5dcf.1645422873.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0001.apcprd04.prod.outlook.com (2603:1096:203:d0::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dfde1c8c-b418-4db1-d138-08d9f5011f73 X-MS-TrafficTypeDiagnostic: VI1PR04MB3053:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tgjmLYDCgszWSmJsk7uBobFAwejmt0h+tiHgnz6Jk8bowRBnZ7gFu9Cj+DU6TOWuKSVXJjoC9SjEAB/PwbY0SRHies/IM0WYGXGfOL+zb+HTV0QUPR5Ou7Jxk+p8McnI2GHqGg7bN/tT62gsVJaIZUCzr9MhdUUfY8cYxEBY9jjWiUtEDjcz0M5PKB0Ta+I0UHan3MzB2fz4asLESHwvFGoZJyRUBgRjF2llrObk9uzb0sRZD5AD4e36WtPRONKnC4r0LCZ3KHCjZFwkDZQxtJk2kll25qce6jydK98WDnh5/M05IgnhiXsLyUDvkxyMqWQtPI8F7kQJpRguoDPzq6p8jBL7YPTLT9jssmxmHFrVw3c4lXd945rQrur3BlS4/sozN6BxHUrULbzbERaZLTISGK9EMXda3exN59Ln+kUw9MT+eMBF5V/X7X96tXB5phhSpb9+/WwQaPTIqzyaMyQj9xem4DWcVEXFNHR3QthTEKIny9EOoteIz5WmuiohM9z9s7EDXwJfRCcq3zU+5Rs2JWxLo1/hOH56tlD2fobvPS5VuzGVI31ZPHV444Wfgh6sRK8DrtHXeLw4RlGeor3YtJ29JvQ7wYHKH0868HdC3y3H9XAy+MgQ4o/R5qG5jGVp0n7WBQekxI2T4c1rug== 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:(13230001)(366004)(186003)(26005)(2906002)(2616005)(38100700002)(36756003)(5660300002)(44832011)(8936002)(6916009)(6486002)(508600001)(66556008)(4326008)(54906003)(6666004)(8676002)(6512007)(66476007)(6506007)(66946007)(316002)(83380400001)(55236004)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZHlyVmbtXSvhmz+Leeo4njfzaxNVrw2L1LXw+6gy/5bnzlFgEZwouA7YSJJL?= =?us-ascii?Q?YbGjaB1RfrSvtMzw4p310icrSrKbNkpouImxgH6xWj3i9IqT8FjuztHcTUSG?= =?us-ascii?Q?0E7RWAOXkRSO9AdXWGH3XZ+f+PMj9qZKygloANsCwiVfp5FTNdyweUNBPejA?= =?us-ascii?Q?hE6TaWo77B+RGnJvwSetnqDPDGSjENDWNygQtaF0LgLSZZMmYST+/R/Q7S9U?= =?us-ascii?Q?Fl35P2vlECFT+A8z6BbYukodbsos27NDQAj7xgUzLZerL0SseVQEk9RsI6g2?= =?us-ascii?Q?cHgvCE8lBXD1GAp16VeZTHkSPNlqg+OKo+wXHwSn1UlCJAHtHopQWcjsWFDV?= =?us-ascii?Q?tkE5ox0duLYrwqokq9GyR+geHlnN/+1u5JT1w8jVRhsywfOOAYpEBAcs4BSb?= =?us-ascii?Q?+Gd8wSOcMiZ9xFl27zEt/DQZFfF3jmAAHCLN9AXAQDakTW8twumKAU6bX8WX?= =?us-ascii?Q?tLjyoVzg2lHT63JO5cPYlnDKKhTYxIU0llR1X147/fODWkRR19ASPmaAYL8R?= =?us-ascii?Q?QEtFykGrqziy9imvvoEgg4ndW59DhJVR4/yB2Y5v7oruBwir+70kof1ZgcTq?= =?us-ascii?Q?DLnCRfcSoqxE/a0vWDGzgK5+AL4D9McnIaswaEzMtaMJmTtusRpqTDUCg6j+?= =?us-ascii?Q?8HIu3OpImL8e948YAlH4MHISaAvYcPO478ldA3WwUpbibmyVm33x5MK2xUOE?= =?us-ascii?Q?WMLzF3fQaOtqw4c6TqlZvF0q/mCMdzZ8yilvNYZ3wQi4Zbg3VMoNJBJrqK0S?= =?us-ascii?Q?FjJTq7PSISZwJ4hwbklpPPQ7w80IqgOi+sYy9WZqwmbn+DL1TMLTbKVrLHSs?= =?us-ascii?Q?ZBbEvt0CLu6V/RckLmxgMB8jBHt22QxRaOftHEY082TnafOGtODN3yJU7o5t?= =?us-ascii?Q?CzpU7KXdvn5NjLa5Tid8Rat3Llu8oG5RskYnrl8MS0IVoGlemfPtDjXTPMh6?= =?us-ascii?Q?cXW2oxiu0MMWMG643P+AOCZ9go/PCHKU0JRuQE4ByWzAc3cqHj1h8FQPSYkV?= =?us-ascii?Q?VZScSIMFlPARn5Ks7ul79t8SYxpH9pevF7rQuZuGmFv1NdikLztQ7rURWzY/?= =?us-ascii?Q?EA32YnHATxaQZl0VkIm1HemeR4ueZl8BdTneHzcMlPwHb94CjlNUo0vBx0jD?= =?us-ascii?Q?kDKGYd9BEicrSHA3x4fqkGjAx0Sa7yNH5pIt9MQbyOcxPhj4/ZL8/HUAlbRR?= =?us-ascii?Q?vWzL2TgLkww0wPPwyX4Y0u08vppFHB26cYgs37dr6AIL3a3JHRGQzyCTJUW1?= =?us-ascii?Q?RNTmh4887Zys8J0gbXtO5jaI7fbZpjdPtwhxJ9LiOONbc4IjMVHeE0T9taFY?= =?us-ascii?Q?9iL2/MIyoE6N/C+BuAqpFbm1Va6eioahFgTp3vhurHsE4YKOir8CO5w09yN/?= =?us-ascii?Q?yOrptlfWAobW7T7bKggz/Uq0oWEEGT1kLF5l17giY7eGGizoodAhpukgcFc4?= =?us-ascii?Q?H896LUJqp8rXxKjkxYjUJUzCskqif8iWCvlTgIk0mHaISZvLsj8Ah6+7W029?= =?us-ascii?Q?/2Me1qrgX8Me15vG6vnJXe2a71wvgbTEFeiDM4/CmZh+3KYX/e/yVyupNcXH?= =?us-ascii?Q?LZzFJRBTpGGYdSQxSvJS0d0UmXOLdxhxYCr/dqRFLqZEZLBiS8fvS5WGlh8Q?= =?us-ascii?Q?Kb0nkJD64bNfJLdT1Bx2tlM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfde1c8c-b418-4db1-d138-08d9f5011f73 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2022 06:12:22.4060 (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: zeSWfTlLvjKk4TMOst+LHLVwEjazOpVwsrBy5pEvyJDX5KKdrydzCenU/45XZebVLVTKPmRtdFvd5Gv47oC1tw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3053 Content-Type: text/plain; charset="utf-8" A pair of new flags, fullmesh and nofullmesh, had been added in the setting flags of MPTCP PM netlink in kernel space recently by the commit 73c762c1f07d ("mptcp: set fullmesh flag in pm_netlink"). This patch added the corresponding logic to pass these two flags to the netlink in user space. These new flags can be used like this: ip mptcp endpoint change id 1 fullmesh ip mptcp endpoint change id 1 nofullmesh ip mptcp endpoint change id 1 backup fullmesh ip mptcp endpoint change id 1 nobackup nofullmesh Acked-by: Paolo Abeni Acked-by: Mat Martineau Signed-off-by: Geliang Tang --- ip/ipmptcp.c | 18 +++++++++++------- man/man8/ip-mptcp.8 | 8 ++++++-- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index 0b744720..247d1caf 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -25,14 +25,15 @@ 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 CHANGE-OPT\n" " ip mptcp endpoint show [ id ID ]\n" " ip mptcp endpoint flush\n" " ip mptcp limits set [ subflows NR ] [ add_addr_accepted NR ]\n" " ip mptcp limits show\n" " ip mptcp monitor\n" "FLAG-LIST :=3D [ FLAG-LIST ] FLAG\n" - "FLAG :=3D [ signal | subflow | backup | fullmesh ]\n"); + "FLAG :=3D [ signal | subflow | backup | fullmesh ]\n" + "CHANGE-OPT :=3D [ backup | nobackup | fullmesh | nofullmesh ]\n"); =20 exit(-1); } @@ -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) @@ -102,6 +104,7 @@ static int get_flags(const char *arg, __u32 *flags) =20 static int mptcp_parse_opt(int argc, char **argv, struct nlmsghdr *n, int = cmd) { + bool setting =3D cmd =3D=3D MPTCP_PM_CMD_SET_FLAGS; bool adding =3D cmd =3D=3D MPTCP_PM_CMD_ADD_ADDR; bool deling =3D cmd =3D=3D MPTCP_PM_CMD_DEL_ADDR; struct rtattr *attr_addr; @@ -121,9 +124,10 @@ static int mptcp_parse_opt(int argc, char **argv, stru= ct nlmsghdr *n, int cmd) (flags & MPTCP_PM_ADDR_FLAG_FULLMESH)) invarg("invalid flags\n", *argv); =20 - /* allow changing the 'backup' flag only */ - if (cmd =3D=3D MPTCP_PM_CMD_SET_FLAGS && - (flags & ~MPTCP_PM_ADDR_FLAG_BACKUP)) + /* allow changing the 'backup' and 'fullmesh' flags only */ + if (setting && + (flags & ~(MPTCP_PM_ADDR_FLAG_BACKUP | + 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.34.1 From nobody Mon May 6 17:27:18 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp3806647jad; Sun, 20 Feb 2022 22:12:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWMgCppqVXdwGD4ohmarUvD5JsXbksP7bNEuVQ+7ireMUNet5IL9keUoRroSpOwXa1v3HL X-Received: by 2002:a05:622a:1985:b0:2de:b88:4673 with SMTP id u5-20020a05622a198500b002de0b884673mr3772456qtc.230.1645423957418; Sun, 20 Feb 2022 22:12:37 -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 c7si958330qko.353.2022.02.20.22.12.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 Feb 2022 22:12:37 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3922-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=X8UISZS+; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3922-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3922-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 171D41C0946 for ; Mon, 21 Feb 2022 06:12:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF6D1210C; Mon, 21 Feb 2022 06:12:35 +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 6AFE420F9 for ; Mon, 21 Feb 2022 06:12:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1645423952; 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=J/WWkrKIdxBqKtuQ+M1jfSmc5WJGxQXYBhGNno54OjM=; b=X8UISZS+L3oZyP/LJXIZnV++z6NLvceq678i9K5Locy6/Q18/rQUj9v/fDST+G0crSraqS rx738SFrRHJ2TQC98xF/4C+u1OXlLzmezpWYYry3js+6b5bLtcXp+Vs227axzffC3KfDmG ymEyyzAZqyRwSm6rzpKfVslFBu9MQG0= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-31-BaxUMpMEN8eLYc5VHde1Aw-1; Mon, 21 Feb 2022 07:12:31 +0100 X-MC-Unique: BaxUMpMEN8eLYc5VHde1Aw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k/9rNXYiR3cPrB7SRRovRolaSH7vg+z93svfi8xuo3fs6Q51cOrHVFKaH0GMv+Y5meIvaJKmp2ernNbFwWHRfeEHH/1jMmna8rZpW+sWQvjSWCKfyiO/Gx8XkAKnROD6BxL8LZsfBok0Xs0vZWnMIqSTOgS7kYtMawz+Vs1ivIqllT5XsnJWMxFzQaT456pH8KIzdWWW1MhT7gqv1pBSe7AhMPq+1Ml7AFuJSGckzOgWBcpg/M+6IiU7bgYmCDjkayr62SO7mo0FgQyTY+mI1JL+OYzVO3qOBOOERGnnCQ9gE00BDil4I8EGyZ3spZ/J/najfkjRNG/E5stNnQvhRw== 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=7TNmfSsTYeiwxbo4rbwO298n2C1IdCvhgweo4Avhpvg=; b=MoXywOvhW8LljJHaWX+cc7/yFdwm4Aw/PzspzlEk/CMdD/eSBKLvI9JN48EKj96HsXXPugWjFeB0WSDTx6kJQpN4VgeyLagh+ASqmuFCbwMci1Bp6/NiGfYm1heXF39ASS6MUsDvdKnagAetefqcHaYeJFR0kp1qxrShQppvVDRpndm4Vf2/7gYilhGydYfODimtuBgg6PZoSmSsDxw6Hmb8fKHeakiK6wA+u9VqrCyoZRhURu/XrpodG1oEzM0vGK3XcDmKblnpP1jVNyxy6sOwXPdJBlfb+BRsCjpbds3/NOlY6WkZk6Vu6uvSndjkqyLYpqg5GGdJ9Pq8jvYFXA== 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 VI1PR04MB3053.eurprd04.prod.outlook.com (2603:10a6:802:6::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.26; Mon, 21 Feb 2022 06:12:30 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Mon, 21 Feb 2022 06:12:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang , Mat Martineau Subject: [PATCH iproute2-next v2 3/3] mptcp: add port support for setting flags Date: Mon, 21 Feb 2022 14:12:38 +0800 Message-ID: <530ddee685e17df00034dd97484db23bbe3d1ae4.1645422873.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0015.apcprd04.prod.outlook.com (2603:1096:203:d0::25) 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: 39abe1fb-46c0-4ad5-6e4a-08d9f5012419 X-MS-TrafficTypeDiagnostic: VI1PR04MB3053:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t+I0BaNH7/oNZGA0uj5T5zuRj6w29JkU07zK4H4NvKfPGhIwjFUOpyOfYhno1p9j7C/pKUllvh639bbz9bYnTi79sj2ljox6E566lrcxmyd66V83+o87cqUxmqMxJysd80jSJ0yUc5KBM8ZogfP6Ei3KbdtPeyBhNKy4Fd2pitAUWwYEoXSYfiSoJ5GMj8sZxveBUmW92R+/9TNRuTW9jOegPaNV99/CuMFQY9lp7UBCkTlgh6BdkxGElFTwZf6hS8QmaNUJ99+F4tzMmekwBDNBqDgnaRAFD24cC+YPffPJjunuhfDe6o+btor/2YHDnmBdySw9uvegsd6cMC2lRDHLg33KvgjjCl6RnfZIZTxMPRekc10WcAQD4uhFyM1G3HDJfgJm/u3KOFlahVzifB6JDcmsdDEQdTChrr+/tlkeAkIx3OCt5hvLedWVrJy9IwIULMuftt1oGmrEnsRUZpImsDamJn43PfFNSlgC0sNZjjfO8cElTDtUcCT8pNbMIhQdYLRx/MqlL3VeU2w85Tsy8vZuVy2J2myvz0S/BCX10dJ+SWn5ueZ2NaSYII3KJ41gb7gZHgo3dP5jpMzVweoEJKX2osa3807hwPgLwdYxsiWfAFlMu7/Fr6bR1OEr322873680XCpQGjvNTRFwA== 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:(13230001)(366004)(186003)(26005)(2906002)(2616005)(38100700002)(36756003)(5660300002)(44832011)(8936002)(6916009)(6486002)(508600001)(66556008)(4326008)(54906003)(8676002)(6512007)(66476007)(6506007)(66946007)(316002)(83380400001)(55236004)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?VLkr+uUbIBn5TDIb8iK7ki2eo5SduQD3h0HeRWIpGTqSP3BD7dFUg4EFYFWy?= =?us-ascii?Q?JVHCdTgGcsi7bmYMScq4T9qSEc5UdWTYiv/oODwEIUCFxX5SkIoo4TT4ZNuP?= =?us-ascii?Q?7I/MJqdKQEVZpgPYP+8mzcK8N9lWm8Kn1m4+k5999TabPBREpd2LgB4ZHV5N?= =?us-ascii?Q?oeJHZWgyKuCqkNFN7Xm5JkKUbQk5wH+1GxZ4cr1gzHtijnH82DFQgDzeyAF7?= =?us-ascii?Q?V6a3xEMNQtWUaj/jXezIDrgTIrN/Xt0GSDAPA29FIqKo6Bfyi47izGhsMxmc?= =?us-ascii?Q?GnfNRz5QMccTvZp6XenOuN3CEFJagNyXLsrgdw3kbSktT24Isvdbh5gbySvt?= =?us-ascii?Q?R74pCBUqsmQ3zqiCwDjuTcnQNmaRyUszDzJWQpsjbg5jkkh+IHP4uR2URcsX?= =?us-ascii?Q?8CrtJ77vOPJYBWltZg2HIEvEisoBvwW06d9QN/ObeLFu2VTsCgUBP6Eay0ea?= =?us-ascii?Q?v5N5eS7gNNMSUVQtSvy2NNs+XPyikghICUFlXHuraBSwqe3g4mmf6K1Dk672?= =?us-ascii?Q?zjBskt6DY0xeEoJGrK/3BZFPum9z0ccm5TbGBVmHBOFf8VDz/mcLXRUI68h1?= =?us-ascii?Q?SwzrmXRfo+Gm8z5VVlO41JVX3+nYBJR077BMT12TOV+/66alGep6UEuP9P3C?= =?us-ascii?Q?e5ErLmM5sCUsidSFXYN7kjPBKzM2ciCAGPGHhkBf1XoZ7NbNO69PLrhGFrDy?= =?us-ascii?Q?Hw86Y8csntXBJgnMv25n02l/nRYDnT4udkUecqGjyQjwm/Zy5NBBqNk3jW8Q?= =?us-ascii?Q?a/EEHooz3VMsPAxNMw2VoNG2Gw3wnCzWL+fx6jEa6jGb/lirCN2jyO+dOtyg?= =?us-ascii?Q?UFanZGLt7cGOHekucjd7y31uZgJtPCgFTbYZnmoPXEUCx3I3Xv9yDvB4amod?= =?us-ascii?Q?d2O21EU4/l47a77lrFr1+d/nAvAKeuQ+Dx5MvKywwJ8BLNPI1z7VK3j0J8tG?= =?us-ascii?Q?HjjLdmuu6trLXs0hqisS5GZxsNEkEKHQSQuRDNKHJIkgDZGTrvG9mWzbEtK3?= =?us-ascii?Q?igoYB7/eouEFJs5mBn4uNRWJQkdDytlmFsSnI6tWt8AmGpLvmsfnKsMq8Pnz?= =?us-ascii?Q?/F+6xDZb3xAv901J4xkKW+mTGPqOo7+i9RpM1nJqE3xPYDwzeVD2HJcHlhV/?= =?us-ascii?Q?CGYb8U0X9eBzaceWkmuod/Ktaw2pGhoqcQfKOGQLrA5f0o7MHzXES73JUlOk?= =?us-ascii?Q?YIpUQeil3x+dRpS1FcU14tLMcPWUlaPx5l4ZXBQsybTSZtO5MVe1fg6bUVyh?= =?us-ascii?Q?eUkvMjyAl010d6VYzknBhFpuC8Yn6m6XHZYeVjY5AfJlZx4C9UvJnCMX66rm?= =?us-ascii?Q?Pq7DMoG8lKTtwxknmKE8tcmIaOeArOmzfB1A6ObAszIjWuucJ4+dlRjgzd8O?= =?us-ascii?Q?OIFaWpW8ojvwayRQpapwnl1GNdZ/O/XADrWrtqYSRsGiU5tEDZPBOqDE946M?= =?us-ascii?Q?dOxa1aRUAaYUDzyyr2/7/VUVUpFP1yN5ZuAJN1DPSaciQsSonYcw8GYL7QeQ?= =?us-ascii?Q?VBbS1iUEWrlIW3RwjJvfATXP+NZGdI1tV4FG4RSLA4mUeAbfCs+sGj+85RCO?= =?us-ascii?Q?6V/zzB4G7zKQAL7Q11g8UQAK2S3LccwtB17jyOLxwLmejRKObTz0tzpiREC7?= =?us-ascii?Q?sknfAfsk7e3nz3zRRlbdD28=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39abe1fb-46c0-4ad5-6e4a-08d9f5012419 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2022 06:12:30.2335 (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: oeXQ50ByQcgXkGkFS1IuQ7QLEhb9UTSqcNgqfZQZLRvedxIGfWlymbq3bnXYpFm+Lnu1KhmWyO0oVD9YD7jDbA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB3053 Content-Type: text/plain; charset="utf-8" This patch updated the port keyword check for the setting flags, allow to use the port keyword with the non-signal flags. Don't allow to use the port keyword with the id number. With this patch, we can use setting flags in two forms, using the address and port number directly or the id number of the address: ip mptcp endpoint change id 1 fullmesh ip mptcp endpoint change 10.0.2.1 fullmesh ip mptcp endpoint change 10.0.2.1 port 10100 fullmesh Acked-by: Mat Martineau Signed-off-by: Geliang Tang --- ip/ipmptcp.c | 7 +++++-- man/man8/ip-mptcp.8 | 11 +++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index 247d1caf..b06afcf7 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -25,7 +25,7 @@ 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 CHANGE-OPT\n" + " ip mptcp endpoint change [ id ID ] [ ADDRESS ] [ port NR ] CHANGE-OPT\= n" " ip mptcp endpoint show [ id ID ]\n" " ip mptcp endpoint flush\n" " ip mptcp limits set [ subflows NR ] [ add_addr_accepted NR ]\n" @@ -175,9 +175,12 @@ static int mptcp_parse_opt(int argc, char **argv, stru= ct nlmsghdr *n, int cmd) invarg("address is needed for deleting id 0 address\n", "ID"); } =20 - if (port && !(flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) + if (adding && port && !(flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) invarg("flags must have signal when using port", "port"); =20 + if (setting && id_set && port) + invarg("port can't be used with id", "port"); + attr_addr =3D addattr_nest(n, MPTCP_BUFLEN, MPTCP_PM_ATTR_ADDR | NLA_F_NESTED); if (id_set) diff --git a/man/man8/ip-mptcp.8 b/man/man8/ip-mptcp.8 index bddbff3c..72762f49 100644 --- a/man/man8/ip-mptcp.8 +++ b/man/man8/ip-mptcp.8 @@ -38,11 +38,14 @@ ip-mptcp \- MPTCP path manager configuration .RB "] " =20 .ti -8 -.BR "ip mptcp endpoint change id " +.BR "ip mptcp endpoint change " +.RB "[ " id .I ID -.RB "[ " -.I CHANGE-OPT -.RB "] " +.RB "] [ " +.IR IFADDR +.RB "] [ " port +.IR PORT " ]" +.RB "CHANGE-OPT" =20 .ti -8 .BR "ip mptcp endpoint show " --=20 2.34.1