From nobody Mon Feb 9 13:38:50 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1788:b0:4ac:5e5b:1ad1 with SMTP id y8csp538682piq; Fri, 8 Apr 2022 18:38:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4vCMa8QhYfYqHZ9OxvvYH/8mDtLI7R5g+OqbpzW3MInJljLMl7X+a9CTogTdgv1fwhSVA X-Received: by 2002:a17:90a:af8f:b0:1ca:7bce:ce3b with SMTP id w15-20020a17090aaf8f00b001ca7bcece3bmr25003260pjq.224.1649468327195; Fri, 08 Apr 2022 18:38:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649468327; cv=none; d=google.com; s=arc-20160816; b=hhC9bbK8G8UhQOJLnbr1Bm6LnlcYO3eAimfF8Z59HSNLWMaZhmkonRKSnR9yWZdR3Z puB8XD39JNonIT3a2YR14sWeCWW9XtKeBFuhptDsgFbKp7QJYOyNGlgHkSAqHtBkJbWg X3oKK+QKR8ySTlq6NHjLFheCf7rZeR4gavcLASJAOdQl+RZy6HBNL6LKXJBfJmlNA5M5 gGkrfdP9yQLYACJ2Ka/xvvHODd/eNSTUoq7sNhwEAc2ffl3VI3PyfwQ0N/bXVp7Cu7Xm O/Jtwj6GjGjvEff8LuCvgrY/CCcb2+fd3/KlyOzWRcyEGE2cVmd2nq+jUA7Q0rnfoFnj oNgw== 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:to:from:dkim-signature; bh=fw8Pkk7FsoXal6qTEgfyW7yvlnTAlkxjWf/YOWAEp+M=; b=SJSa0AitnUV12Rpg/BlEeWPFEVQ3dUilaSDrLLzXpfFhNhfEECpt1P8mJ7CzZPlvpf xKo31YkwrJ5p6fd/KcUJYKPrzAyyzSGmP9+obbjwssYITQa0FbtPUzHZBa0+ppOGvdnA jw3lV++kK4Q+OGTAte5SD0VDmM9UMJksTRkhSzq5fAeHZtID4lwf+0ykX3WIhgKUE+45 zHU0mmvbhaP/WahZpioiBe25dGsbFYa+B2BywbtGpM2BgYGM8K5OfVWl23nhEHodgjc5 rAklXJYMrk74cTYrYL8kvYBv5XA6PDDIeOu6uOSV/iqGXHlYOWpakzv0InB7yTNCe/s5 7FZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=U0DgJfUN; spf=pass (google.com: domain of mptcp+bounces-4703-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4703-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id q21-20020a170902edd500b00153b2d164c5si251533plk.205.2022.04.08.18.38.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2022 18:38:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4703-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=@intel.com header.s=Intel header.b=U0DgJfUN; spf=pass (google.com: domain of mptcp+bounces-4703-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-4703-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 064FE3E0F50 for ; Sat, 9 Apr 2022 01:38:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BB985656; Sat, 9 Apr 2022 01:38:43 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 72E2A652 for ; Sat, 9 Apr 2022 01:38:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1649468322; x=1681004322; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RAhrEvJmyKeoBz/vW0WCe2KrNVdwr/PvsJn+yTOk/F0=; b=U0DgJfUNAnii0LUdCai47cpkEU6exNvnRBGcVl9fQ5JgT9NY034kgdeC PR6NUjsYZsoTGzz/DDPTpoIGPt6zDLXruG2HXtU7gb87/Tq1MtWh6vMKi 2KYDfT5lwjC5Bi9WzqVfRrr2Yu8/0IXRn+cOZdqgiJ6NIpPSgwtLAFppP hntXoukg791r6KUUOhNPWMx9BSfY0mSxXeFo+9A3saySsvUgoP1j1pr0I eihwguftO9WdmQ18z+TOXAtGM6j3Kxgw52NuQJhMARJ6qIvfOc4D3iwls v5LbIig9p/j1jg74QYxG/l//gnb2fuEk/jG+O4ProU4FgpDb68DUilJzM Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10311"; a="261921151" X-IronPort-AV: E=Sophos;i="5.90,246,1643702400"; d="scan'208";a="261921151" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2022 18:38:30 -0700 X-IronPort-AV: E=Sophos;i="5.90,246,1643702400"; d="scan'208";a="698436091" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Apr 2022 18:38:30 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v9 08/14] selftests: mptcp: support MPTCP_PM_CMD_REMOVE Date: Fri, 8 Apr 2022 21:38:19 -0400 Message-Id: <20220409013825.1877395-9-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220409013825.1877395-1-kishen.maloor@intel.com> References: <20220409013825.1877395-1-kishen.maloor@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" 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 Signed-off-by: Kishen Maloor --- 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.31.1