From nobody Mon Feb 9 17:23:08 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:3b21:0:0:0:0:0 with SMTP id c33csp2012768jaa; Wed, 2 Feb 2022 19:14:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzcXC6aLTrdMptFRBEWNe3FL/NW/FgufDLlH/27g3djjuZ7PFBBIKTBBFHbshsImiat4iAQ X-Received: by 2002:a05:6214:c8f:: with SMTP id r15mr29508776qvr.109.1643858058297; Wed, 02 Feb 2022 19:14:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643858058; cv=none; d=google.com; s=arc-20160816; b=QF9xbbFAgOhQGHVPIo6fR/FaDaJBssPW0MCCIFJhCG8Rles/hveyRZcBXD+FJwL53+ cj+5G6mgjpqfadOUJ7bJccqQ9m6PL+WTBFaAlR3b9CjaQDu+qVBeHAOzGpiw8zH4rf2m Is1fFcQI2wT6bc4vRAP0j4uPAQf7OL0W16t97QxCAwF4SgtFEkR35oQrdcvtBBQvYzHn k2RGhKOt0DLmxzbPEQxBkAjKWyBterhMxnbhuGavLElLrPCeJPcFApeyFOFXCCu1OmkR 8IgOnQf5GZ+xGIIuSMg+XJgItjTuVjgHRNvXXe0RB79KynDSGXjpz1+D8+H+9Ne/yIpx q7Qw== 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=+6xpBUPtJTRzLEjuMR9AdYti/Yw9sJXwxb3QHTF5Xvc=; b=A491io1iweDhLxbtS/WI4pK8LpDgRFda3/9cInJy4x7YPo1tD6ck34c932XYrskBqF /q0t4zveCJQp2Pu4EhvTyBMACWtCX44ELbdr8NlyfC3IAYmIsbO5QVs54UYUCeS/mBfb 2bqYv3ykESiF7hJWbRyU6+16LbWQENBI7VNZ/cFgtRcXTe/PXqufuu/GfF0Bz5QQ5/Ss N3JznPalTasXqlFS1+qPQPuUCI3/4UVJo5LyWCA/0FNsPoSWzmjHNaRX9aQcKDI4Ohwu jcFKGmdKO1JXehIXlMT5RGhzqzYTfqQtIQwmvrlzzELtJPH6KRnZ5dbPxEbmP92V+kVe 98vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cCOo1CR2; spf=pass (google.com: domain of mptcp+bounces-3431-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3431-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 i7si6783816qkp.171.2022.02.02.19.14.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Feb 2022 19:14:18 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3431-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=cCOo1CR2; spf=pass (google.com: domain of mptcp+bounces-3431-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3431-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 121571C0F0D for ; Thu, 3 Feb 2022 03:14:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 476272CA1; 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 A3C522CA5 for ; Thu, 3 Feb 2022 03:14: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=1643858052; x=1675394052; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=dkQKXKI5PP/plD7z39+ZsHRyeYf2sAZ4SoCudTN/0Uw=; b=cCOo1CR2stAR2W9xTD8cGQNxXR62313xW4arib6eoWW4jfX66O573hDx KTzySV2lOG5cYD5ouyBTicy84mqvt8TuF6RltVTsT+b88U9akSAd56VPU OepK1HNaT9OzfQX8zb9jEVNiR4oraqGOMezYgtCF/vFwZ0XyAEhVhKZKV Klr/jV9q9Zsrz7aP0/sOv7t/4fr8ISkuVJNF1p78ogZi+XeOMV2JEgOop vkxgqHOUgMe9Z/zOEUxnIsxJXFHjykhqhZ9ZX29yYZODOcmhybIq9rW2A 6NT+OGwiBlTxjvKTJh+QnGxELex5pDR5sF/X5AwZSU75kJX9bovAUmJus g==; X-IronPort-AV: E=McAfee;i="6200,9189,10246"; a="235467500" X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="235467500" 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="631204634" 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 06/13] mptcp: selftests: support MPTCP_PM_CMD_ANNOUNCE Date: Wed, 2 Feb 2022 22:13:56 -0500 Message-Id: <20220203031403.2996549-7-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 an "ann" (announce) option to support the newly added netlink interface command MPTCP_PM_CMD_ANNOUNCE to issue ADD_ADDR advertisements over the chosen MPTCP connection. E.g. ./pm_nl_ctl ann 192.168.122.75 token 823274047 id 25 dev enp1s0 Signed-off-by: Kishen Maloor --- v3: support MPTCP_PM_ADDR_FLAG_NO_LISTEN in both the in-kernel PM's add_addr and userspace PM's amnounce_addr implementations --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 138 +++++++++++++++++- 1 file changed, 137 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 22a5ec1e128e..0044fdc461ff 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -6,6 +6,7 @@ #include #include #include +#include =20 #include #include @@ -25,7 +26,8 @@ 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, "\tadd [flags signal|subflow|backup|fullmesh|nolisten] [i= d ] [dev ] \n"); + fprintf(stderr, "\tann id token [port ] [dev ] [nolisten]\n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); fprintf(stderr, "\tset [] [id ] flags [no]backup|[no]fullmesh [po= rt ]\n"); @@ -170,6 +172,136 @@ static int resolve_mptcp_pm_netlink(int fd) return genl_parse_getfamily((void *)data); } =20 +int announce_addr(int fd, int pm_family, int argc, char *argv[]) +{ + char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + + 1024]; + u_int32_t flags =3D MPTCP_PM_ADDR_FLAG_SIGNAL; + u_int32_t token =3D UINT_MAX; + struct rtattr *rta, *addr; + u_int32_t id =3D UINT_MAX; + struct nlmsghdr *nh; + u_int16_t family; + int addr_start; + 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_ANNOUNCE, + MPTCP_PM_VER); + + if (argc < 7) + syntax(argv); + + /* local-ip header */ + addr_start =3D off; + addr =3D (void *)(data + off); + addr->rta_type =3D NLA_F_NESTED | MPTCP_PM_ATTR_ADDR; + addr->rta_len =3D RTA_LENGTH(0); + off +=3D NLMSG_ALIGN(addr->rta_len); + + /* local-ip data */ + /* record addr type */ + rta =3D (void *)(data + off); + if (inet_pton(AF_INET, argv[2], RTA_DATA(rta))) { + family =3D AF_INET; + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_ADDR4; + rta->rta_len =3D RTA_LENGTH(4); + } else if (inet_pton(AF_INET6, argv[2], RTA_DATA(rta))) { + family =3D AF_INET6; + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_ADDR6; + rta->rta_len =3D RTA_LENGTH(16); + } else + error(1, errno, "can't parse ip %s", argv[2]); + off +=3D NLMSG_ALIGN(rta->rta_len); + + /* addr family */ + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_FAMILY; + rta->rta_len =3D RTA_LENGTH(2); + memcpy(RTA_DATA(rta), &family, 2); + off +=3D NLMSG_ALIGN(rta->rta_len); + + for (arg =3D 3; arg < argc; arg++) { + if (!strcmp(argv[arg], "nolisten")) { + /* nolisten */ + flags |=3D MPTCP_PM_ADDR_FLAG_NO_LISTEN; + } else if (!strcmp(argv[arg], "id")) { + /* local-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_ADDR_ATTR_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], "dev")) { + /* for the if_index */ + int32_t ifindex; + + if (++arg >=3D argc) + error(1, 0, " missing dev name"); + + ifindex =3D if_nametoindex(argv[arg]); + if (!ifindex) + error(1, errno, "unknown device %s", argv[arg]); + + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_IF_IDX; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &ifindex, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "port")) { + /* local-port (optional) */ + u_int16_t port; + + if (++arg >=3D argc) + error(1, 0, " missing port value"); + + port =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_PORT; + rta->rta_len =3D RTA_LENGTH(2); + memcpy(RTA_DATA(rta), &port, 2); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "token")) { + /* MPTCP connection token */ + if (++arg >=3D argc) + error(1, 0, " missing token value"); + + token =3D atoi(argv[arg]); + } else + error(1, 0, "unknown keyword %s", argv[arg]); + } + + /* addr flags */ + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_FLAGS; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &flags, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + + addr->rta_len =3D off - addr_start; + + if (id =3D=3D UINT_MAX || token =3D=3D UINT_MAX) + error(1, 0, " missing mandatory inputs"); + + /* token */ + 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); + + do_nl_req(fd, nh, off, 0); + + return 0; +} + int add_addr(int fd, int pm_family, int argc, char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + @@ -238,6 +370,8 @@ int add_addr(int fd, int pm_family, int argc, char *arg= v[]) flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; else if (!strcmp(tok, "fullmesh")) flags |=3D MPTCP_PM_ADDR_FLAG_FULLMESH; + else if (!strcmp(tok, "nolisten")) + flags |=3D MPTCP_PM_ADDR_FLAG_NO_LISTEN; else error(1, errno, "unknown flag %s", argv[arg]); @@ -779,6 +913,8 @@ int main(int argc, char *argv[]) =20 if (!strcmp(argv[1], "add")) 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], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush")) --=20 2.31.1