From nobody Wed May 8 20:12:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1107908jah; Wed, 12 Jan 2022 14:16:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRZXhClKJSCxVWlem4+EfRsVTV6144h2xBDVWYRVX8KN3cgazFu4r+Dgs2Y1hrWT0RgDpW X-Received: by 2002:a05:620a:244c:: with SMTP id h12mr1364581qkn.381.1642025789081; Wed, 12 Jan 2022 14:16:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642025789; cv=none; d=google.com; s=arc-20160816; b=HHWxkHXeX/M8adDepTOExjvCVDZWVYT1VdG9ktV5R70eUWrgZeL9XWL8iLKEcojVEm nlsNQlrPCZGKxj2qS4Cxm7WUEe9PRADZ0uvxieG+TTV39scpTfviz8Naq0/dnOhR1N3H 52h+JPHg1KFQdbWHd/piIjjYNDm8vmm3sv66TnNBcpc/GVCYceWUso8EqERvYRiRhqbx 8Z7oimBkPx7RyeBUSdY8jWls/wV3j7X7tWxj0uFCbmBa0psZR7kBpuQYhajBvL9k9C6K Oi2Ksi+iHCom/Je3kVQ7eseiXLJ3SUNHgczdiu93asnCrRR2tWhxvulLO21ytyuF0Ed6 hLGg== 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=WMW0VEj/YxMn7Vw1S/C05nep5DNx2fwYQLsbCzVhO/E=; b=FqGue3c7Q+d5eM0JUBt0QCnwr444z8UFPVbpoCHbd8JCv0qpRUSMQKMYlQcOZPxd11 e8oFiRoaI/s9q9JqO88to8BIXzKhVJIsxbPk1g6PpKY/9vWsHbuXf5CDuf6Fj3aXiNAs zT5sz0Dahr5h7Zgk28NykwgsIZtKBXpM0Xc9tCQpe/HY9KjejdxU7xIcxbBeOTFZuAjb pD7wwR4No8OWo1AvQSxfDNGa6bgymdWll0HaC+wGlVrbZYEGhfTGr7dsTmAuQ1V+2Gvw cYKGON/iHmRNVWNmrqc7zT9yb0AyxMw3WzqQ2OWm77loYBTzFduCl1XbTvgaZhpbUxpf q6vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PtpeG9tz; spf=pass (google.com: domain of mptcp+bounces-3088-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3088-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. [147.75.197.195]) by mx.google.com with ESMTPS id g4si613491qko.191.2022.01.12.14.16.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 14:16:29 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3088-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=@intel.com header.s=Intel header.b=PtpeG9tz; spf=pass (google.com: domain of mptcp+bounces-3088-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3088-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 C0D7F1C0F0C for ; Wed, 12 Jan 2022 22:16:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 427022CAA; Wed, 12 Jan 2022 22:16:17 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 43E322CAD for ; Wed, 12 Jan 2022 22:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642025776; x=1673561776; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=C2VI5SqdOWAektSC7DHL1vhcCvIC6JSahI3lmtl6KNM=; b=PtpeG9tzHRKmuEJlE2tHfE+6dJTDB4SeMxKme7Of5vDkpQ08RbnhrzAx tUShFUzLV5u3iLZc4zX5lTh1tseE/2MVx1Fhsk2o82zz3Tl6O7bYQGOvz 6o8SXyQaoBXnIuCNi67dAA33o4hjlIHIg8Mg1npB+Bdk+WViOln4zQFj0 TRqRgqeRHrMu5g0ixfZpUdKi3MxioP21F+yA2rHcxIM+FF90Ve6udIHZg JNM470v0EAhkfEqBd+iJdSMzH51vnJAWoMoIeLwIn7+z6JorS3To959mo R40mgliJwJVh7OeT1k3S0CXxJMROW9qL3DO/gF4V42bEsdgPvq49xdGD0 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="307213947" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="307213947" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 14:16:08 -0800 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="490907375" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 14:16:07 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 16/21] mptcp: selftests: support MPTCP_PM_CMD_REMOVE Date: Wed, 12 Jan 2022 17:15:18 -0500 Message-Id: <20220112221523.1829397-17-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112221523.1829397-1-kishen.maloor@intel.com> References: <20220112221523.1829397-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 76dfb5a8984a..8892bf16693a 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 [flags backup|nobackup]\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)) + @@ -874,6 +924,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