From nobody Tue Feb 10 03:45:16 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:3b21:0:0:0:0:0 with SMTP id c33csp2012794jaa; Wed, 2 Feb 2022 19:14:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJyjsa06xOu/eentyF2MKXdRvNHV7t2TN9k3yDMUo3AVqxU/mLWWf2KaWgyYTtjJKvtdzMmX X-Received: by 2002:a05:620a:103c:: with SMTP id a28mr22079038qkk.413.1643858060556; Wed, 02 Feb 2022 19:14:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643858060; cv=none; d=google.com; s=arc-20160816; b=Ob4nH3Y+DAgx5+5oHUueft1FZDz1xIUhzM02oZtZv19GdSDFnG+4DfBJC7+OPhpywn +ANEaWY+XMBJHhP8r3Pvgll5CSDLVW61nBcMBUYML91pYQZyLtgyLdxISJrnBf9v4Dvx u3rXB/aeG70e3E2mC5vwBqe9owXRsM2LlddneOShGbFK0iIN+bKlSOQjjJoPj3MQdgvZ k3icvHMO/bvuYpjdI2CrlUiWfcAh+WHmbotc05XpE/lRwH4+KaDz+iHYaz7ocIMRMdwT Is069X/HpP4jihwTSSTCgjTjCZUpE85X8eEh7MJj1/ziMCmsV4vE/KR47TP5zgeGOLHf gCcQ== 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=x7LaLW+AaOc0XgzIhE/UGr7uTZuS2xWr3TxsJ979n6U=; b=v3TTk4o6jGKRXjmqUhTqCfyL53kCTCogKrz5ie3uAGlwVrNUk2kialiS+34/wmLMxy u4Zd2o7/r/Iwq2IpCOP211Y2w8XjNBkHSmODIX5Dfd0dxC2a6aaxKRQisz98a/2HIPIZ qRujBc5y4+JAH/54tKqAXYu5Wbi0Z9yjnoe6M4Bb3sR+mHZigB2+KeonJZ5WHeHGaWAE Dpv8xY5MyA8nDwjJPoMMD1/oMJGN+nQhYDtoPym1IfraClycB/5YAsL/8SOiugMYAKLS wQNObM108nXTcO6J8VmzWksdPsLrKuP06kwjDUHs/IBx9NXIQg6Q76Duvd5ugThKX3b4 Wq7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WWGKUjbF; spf=pass (google.com: domain of mptcp+bounces-3433-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3433-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id 14si9333946qvr.308.2022.02.02.19.14.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Feb 2022 19:14:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3433-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=@intel.com header.s=Intel header.b=WWGKUjbF; spf=pass (google.com: domain of mptcp+bounces-3433-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3433-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 466211C0F2B for ; Thu, 3 Feb 2022 03:14:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8AF6C2CA2; Thu, 3 Feb 2022 03:14:14 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 972282CA6 for ; Thu, 3 Feb 2022 03:14:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643858053; x=1675394053; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=C4l3p6tFPmwIdITMHYdRnSwVY78HGRvYQSgg/UPc39c=; b=WWGKUjbFYRz6bSfwGlz8M/jfDB/15blO2dPcz69MUKJ9szq2LQWydxpJ MwbyePzdoLpxoWlIXlVxTmGEdXTnzvK29gfRbJ0UPXHzR3PKXoJZwTIvE WA1LKtJR0ByKTMczwg57WzJsXZY45v/UPAJeRmQCPcyWYErMCxiw5VmhL RJsrCu0fXBWoATbwbGVH/T+Eyuvj7tvIrIJnzQJkY4Nk5ELgWUwAB9wwO imPlEe+c+RtZRsTkcxVYjZLm4nTY2Pnn+o2WLhjEyTARtAEvxX+iQWEru jBSayaMxZppw8ISefHY1BsvD2i7rAXeMEy9EwHSZKI4qZZY/axUWC84YF w==; X-IronPort-AV: E=McAfee;i="6200,9189,10246"; a="235467503" X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="235467503" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2022 19:14:09 -0800 X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="631204639" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2022 19:14:09 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v4 08/13] mptcp: selftests: support MPTCP_PM_CMD_REMOVE Date: Wed, 2 Feb 2022 22:13:58 -0500 Message-Id: <20220203031403.2996549-9-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220203031403.2996549-1-kishen.maloor@intel.com> References: <20220203031403.2996549-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 REMOVE_ADDR signals 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 0044fdc461ff..56759d9883c9 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|nolisten] [i= d ] [dev ] \n"); fprintf(stderr, "\tann id token [port ] [dev ] [nolisten]\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)) + @@ -915,6 +965,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