From nobody Mon Feb 9 09:22:55 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp239620pis; Tue, 3 May 2022 19:39:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+Sa1P+l/F3nLwJj7OFFTMd5n0CUF3dHv1GfTT30gIvjAJwIJaQJZNBPlSzq0MUzJaXXC1 X-Received: by 2002:a17:90b:3944:b0:1dc:1ddb:e25c with SMTP id oe4-20020a17090b394400b001dc1ddbe25cmr7980415pjb.124.1651631963969; Tue, 03 May 2022 19:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651631963; cv=none; d=google.com; s=arc-20160816; b=IPfx82hEzo2Ty9B6p758ylPRRePWZxJTotYo7k+CD0S4WxHTgEbMplORXY64XI4mvA SvESDOW61pNdcGCMUmIgfbx4VCGYX6id+SjZhK1DM4MZazjnTO21OrLzMfjtna/dfmkw 7v95LZXkIjqXYJ2QWYggHpdBLvViebRpjf3iWywphevwoQ5RGMzWSU2bvJgYQrU+7k/Q DvmDD11UbWPt5W+j2CwgXSLh2O/+GX4TsO6w16GDp+xoS5ydySXRZ/9uZ99l1/A5jOG6 n8z4s7qAPqXrgVFynUkK0ZFb8HMfWLk3EXyFa6tumVXnho9YqkUE5GZugmL85M33qCqW 2FYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=caL/wBqJng8KMW7RDfZ8R085NJ/Ir+mi6CvD/XuTnr8=; b=oPDAwDS/mMg0UAo32JfEnTGxpjTE3zYwla3TG6pyI38nkFQMhajiED3gC3t8kMAKQK hmZwNQMVKcB7gTxDVBPA/6IQ51y8tRBXIOm6llU2fXJ4vwPInaPtYGG0d3PyYFS8av+i IOqneAVY7X0u7OpE9kG4lC+ILacUeeeo1f6vq2idHITNCcdFVgE1MvQrd8oxsVr66LjO sTKi7zWwNciFLuNPUNQsXc4mFJo1O3NsY558YWYbbOeHgDvZd4DShOaSx7Nu3ELaEgn9 1kWIG//yx7xURWuQnL57fcQFktTMpQo/yd8oO69EptQuMWemDZkbb7hmdky+7Ns1yEyj FVEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O5XxNdzj; spf=pass (google.com: domain of mptcp+bounces-5085-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5085-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q23-20020a656a97000000b003c22771658dsi8116827pgu.482.2022.05.03.19.39.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 May 2022 19:39:23 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5085-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=O5XxNdzj; spf=pass (google.com: domain of mptcp+bounces-5085-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5085-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id C81BB280A92 for ; Wed, 4 May 2022 02:39:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 52AEC20EF; Wed, 4 May 2022 02:39:14 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 9B82920EA for ; Wed, 4 May 2022 02:39:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651631952; x=1683167952; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=BTuJLvhT2HSc1fn6mxDRYIMI8004r4543DADFIHv6G8=; b=O5XxNdzjKAPw+Tw32xLOHEbb1jX3EDMCCCAH0e3nrKzXwuZKaFPtGY1g lwW1o3kq/pez9PvEPWpBbc7z8humZ1lvBg8IYqhP2S798w6WS8lg1Wo1Y fVP09ljJCZHi9d5tmiTiBIXT1/sNRsKhvFJHUVnbgWIb5clOkbPIoUw1N 07CXCTqZ+kUPxxCw39WNPCq7X1L9gTmpVRTkxdGddOfvCzZf8rbzaIL4m 9NvkwfJ2xYfA7BefqBIGoUt6nmhb44tuafkPyMC0SlTVz4dJEPVHSXrJX Hqkjvnoa859pRmzzelcqhYSC6N/R/5E8cKiWPpoRZFHYzJGPrHXu/EQSH Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10336"; a="266488768" X-IronPort-AV: E=Sophos;i="5.91,196,1647327600"; d="scan'208";a="266488768" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2022 19:39:08 -0700 X-IronPort-AV: E=Sophos;i="5.91,196,1647327600"; d="scan'208";a="584493386" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.20.240]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 May 2022 19:39:07 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Kishen Maloor , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 07/13] selftests: mptcp: support MPTCP_PM_CMD_REMOVE Date: Tue, 3 May 2022 19:38:55 -0700 Message-Id: <20220504023901.277012-8-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504023901.277012-1-mathew.j.martineau@linux.intel.com> References: <20220504023901.277012-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Kishen Maloor This change updates the "pm_nl_ctl" testing sample with a "rem" (remove) option to support the newly added netlink interface command MPTCP_PM_CMD_REMOVE to issue a REMOVE_ADDR signal over the chosen MPTCP connection. E.g. ./pm_nl_ctl rem token 823274047 id 23 Acked-by: Paolo Abeni Signed-off-by: Kishen Maloor Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 0ef35c3f6419..3506b0416c41 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -28,6 +28,7 @@ static void syntax(char *argv[]) fprintf(stderr, "%s add|get|set|del|flush|dump|accept []\n", argv[0= ]); fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tann id token [port ] [dev ]\n"); + fprintf(stderr, "\trem id token \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); fprintf(stderr, "\tset [] [id ] flags [no]backup|[no]fullmesh [po= rt ]\n"); @@ -172,6 +173,55 @@ static int resolve_mptcp_pm_netlink(int fd) return genl_parse_getfamily((void *)data); } =20 +int remove_addr(int fd, int pm_family, int argc, char *argv[]) +{ + char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + + 1024]; + struct nlmsghdr *nh; + struct rtattr *rta; + u_int32_t token; + u_int8_t id; + int off =3D 0; + int arg; + + memset(data, 0, sizeof(data)); + nh =3D (void *)data; + off =3D init_genl_req(data, pm_family, MPTCP_PM_CMD_REMOVE, + MPTCP_PM_VER); + + if (argc < 6) + syntax(argv); + + for (arg =3D 2; arg < argc; arg++) { + if (!strcmp(argv[arg], "id")) { + if (++arg >=3D argc) + error(1, 0, " missing id value"); + + id =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_LOC_ID; + rta->rta_len =3D RTA_LENGTH(1); + memcpy(RTA_DATA(rta), &id, 1); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "token")) { + if (++arg >=3D argc) + error(1, 0, " missing token value"); + + token =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_TOKEN; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &token, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else + error(1, 0, "unknown keyword %s", argv[arg]); + } + + do_nl_req(fd, nh, off, 0); + return 0; +} + int announce_addr(int fd, int pm_family, int argc, char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + @@ -917,6 +967,8 @@ int main(int argc, char *argv[]) return add_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "ann")) return announce_addr(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "rem")) + return remove_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush")) --=20 2.36.0