From nobody Thu May 2 04:50:02 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp580507jai; Thu, 20 Jan 2022 23:22:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgc0+kqYGE73L7pFC3oT28SKrhaibazCNWQm8J3YoQHow/yHN/+1HO6xf+5clxQwgmCT/q X-Received: by 2002:a37:a3cf:: with SMTP id m198mr1830200qke.186.1642749761794; Thu, 20 Jan 2022 23:22:41 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id 4si1721944qvq.536.2022.01.20.23.22.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jan 2022 23:22:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3271-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=@suse.com header.s=mimecast20200619 header.b=JiNDTGCH; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3271-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3271-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 7FCB81C09BD for ; Fri, 21 Jan 2022 07:22:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 22E202CA8; Fri, 21 Jan 2022 07:22:40 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 8901C2CA7 for ; Fri, 21 Jan 2022 07:22:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642749756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mh1+GJ41YH03m+peXJAiwF4P970//Da90uex/FQWffo=; b=JiNDTGCHR03SkiMQwYMeGDIDIQTcwoKa7hzbMYYGvFNHUUk//X18Vgu3ea6xjVtV7AxLkB 47q3PkF/5CYD8tNet2152GT6fq8GsVQXXViCVPbI8M144dMkR/20iq2B0zvwC73KeTvvlC ht7kZorz3D6gWrxYAVHF9fzDFA3UACo= Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2057.outbound.protection.outlook.com [104.47.13.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-40-Ce6y-HVsN9mYGWttMs3fZw-1; Fri, 21 Jan 2022 08:22:35 +0100 X-MC-Unique: Ce6y-HVsN9mYGWttMs3fZw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IvniApXPOXJxx+L2BOHftYRNurW8dWEs+imHqSjpWk9MGw45C4VuoMku/djQRdTJ1dwVtP7lfRM/DaEemk3e71ygEFjrmcPFDoxTGPCNm6U9mPw82DQoaJGhkgZyh9M7B5awgm41bJ80nh51IzTmVBGQZcIdmzHxE9PpOZagQL800sm6lB15LffcynmBchx9a9WyVN8MVURVV2P2GkKUbDKRqyxxFx8G3wWvxQ7hNi02t+SqEAYoHDSa4sA71SMjYmTdRgF/bp5sd10lY/xKna7GiNXKREG5xbp0I7XPcrlqlFReBtccdcZWaP/jfCzRpz+4c+r4kXQu9om8oGJqiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IimvkTFKHlLnRc95wzbXmOuJUlHEnCL21rKjbNB41lw=; b=AAbSgLyrJlglNyAXS+dZjgFJixgAoKr3H0pKSieTYHVNSBVCJYXW627ICcGvd50EXoSlK9RV7w2NPMg64YeXQ4lTvSzta4CaIu1oDG8c49ZRZfeE9oWnUbqmviRDizLhV8xt9EIsRKEsb+j6Lb2UsmWMaAxBEcDhcrh7hX35Uk0Dy0AxI4suJzR+RcFGrEeGnhNDTyKr1fBOjSkFcgGvzFcE1Fwbeit1PPa9uRUu4ihDz0Ho0V5bblB60g1ChK+IAK0jZMhGXITSFoyWt5gEXk0mC7RHAyxN9XZXehfSIdEkOFltag946oI6aofVbr3b007W3wVb2kvGGTjGpqkaoA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AM0PR04MB5396.eurprd04.prod.outlook.com (2603:10a6:208:116::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.8; Fri, 21 Jan 2022 07:22:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::fcd9:b39c:2b94:f13c]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::fcd9:b39c:2b94:f13c%6]) with mapi id 15.20.4909.010; Fri, 21 Jan 2022 07:22:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: add the port argument for set_flags" Date: Fri, 21 Jan 2022 15:22:30 +0800 Message-ID: <60ecb78f43a5f09341742ac6ed8bcfb4d48d0750.1642749049.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0021.apcprd06.prod.outlook.com (2603:1096:202:2e::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2867de7-1de4-402a-70a2-08d9dcaecb2f X-MS-TrafficTypeDiagnostic: AM0PR04MB5396:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:65; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KCviAMLW1lLao2CzySC6U3C55n3AIVJzZBRa6/jbP9zP+N0PzyTmQot5/eVRuGBImT6RVEMn5ns3fv/H7+dZJ40qhaaXMPfh6v0s6y1Wy2aJXRxP1yL1EwUn7pTH1dnDUHMfc/P51auLDlduQjmY6VFkff9jrhMORAabtHxGV4ePcgS5wjKWt0+criB5VhEkynebrsqBJMs79RId7pUPUVhN1UBteyI6NmOIc78slgkdAdX304S0Nk5DfOYtZOhuSUV/qkC7tY3AA7lXM7FyiqptS8KY1NP/7PXBqpW1xIQVunHm0/lMDinrB7y0vEsc11ZKGfYPh8mixETrIoh7ft3LteZr3ickEofbu2F1CZRWVobx5k+XU3p6FUkkFDNaUYJClkj9YYJEakoFUDkJqcvaUOckTlbLOnVvpUGyoIQSW6ne9+dKNtU2EA9v0sJ6JQ46P4x8y+R1kZ+u7yNxPGYHdKnlJQtFYk8g8GQHV5UJ/X6hmC9srv4AMvvgBK3ZW7dW+7OViCV8VyUB0/LHhbcM4gl1t6jF4jAgj1Z4xLj8l+tGyynH6UOCoMSAos+pDYXR5eUwjlsN0ZlNJS40NXdWk6geKVrAqYxy/QWitbXNEEw1jX4qQ8ksjoFo6xIsoIP5+zy90KoJZ458aYTZoA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66556008)(6916009)(8676002)(38100700002)(26005)(6666004)(107886003)(2616005)(86362001)(66946007)(6486002)(55236004)(5660300002)(2906002)(83380400001)(8936002)(6506007)(508600001)(66476007)(44832011)(186003)(4326008)(6512007)(316002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OHkmCjwzoZgC+tk93NT3XdVWxz/vjOlUxRMnrKhUuyYaq5H92x+KLv0Esblg?= =?us-ascii?Q?I/Qslxm3Ygjt9cw4iVk7Pwjx/snGg5JCZ707Z2vcX/uQilnJ9R7seOC1tJe9?= =?us-ascii?Q?5qkzT4RO3MuCs9Vps6uxxdbZvaTr70obd35MfsZ8xfaXDLxmOXBEqJHcg9ev?= =?us-ascii?Q?lnRqXWCuCYAGsP2aLktr9BdrIl5/wBrp1JnxZYKfoAnVdH7R8SFouOGy/f+n?= =?us-ascii?Q?+cqDI42Fw1cGZd3wetV2yEY71/Pe/Vf+wRo+hJHkaJOIMNuVWFVSD/aJHm6G?= =?us-ascii?Q?AFARgyBuugZJ4jkGCG4Ev9LyV2AbGRGqgA09HovpOy4nYTNiPkBxjEo5OvyK?= =?us-ascii?Q?MAWy4SWtvXGjfX7/vOr4HkV5IchuhJdHKrv061KuF55ivKlP8tsWmDwy5jfx?= =?us-ascii?Q?Y/PieNAAoVeNW6CqRNbVkuI7zAjw2kGUBU9fcZRhS65aRyPaMaR6BKNo12Fk?= =?us-ascii?Q?FOIXy/gNIKkToGRuiByE98l/jWD/XCQVLkSC+g8ine+GVEz1Ecc5ubhUaFj+?= =?us-ascii?Q?UJc9xlU6bf0/coWUJgiskka/kcXXnWUaZ7gZotayGOBlGlAtaf8bJTwAsOv/?= =?us-ascii?Q?Dx76XrFwiuJiW8DoqU5po2a1ikQnkHhaPeEKZXmnU5BA0j4LNFlzKbvUHX8c?= =?us-ascii?Q?CJb/HLRPKMUAejjRRBxMHQWBmzkIHzce+s/BC6P1oK/teBXQeFGPkVDNANtc?= =?us-ascii?Q?paRcsbK7wLqBsplIU0uoA16/5JGqMQgFu1q5s7Glww2iGupr3kZ+h0SQYmI2?= =?us-ascii?Q?62fJ7F/4AHy05Hip+I6K2IBMRvlUdxyC5fmIuhVcT4++BW+2ODre7ZGfagqu?= =?us-ascii?Q?/2to7PxAk3E+vunGuLwvFmH7M1xfvhqvvJTfQfIe65CI8mZqMtG1NQ1WfS+f?= =?us-ascii?Q?Km18CjJCqICSuszq9nEAnqY5Jo23hdn11cdhvC8DnIhfS93qgt100x/lAiyN?= =?us-ascii?Q?dd/O7lr4jIW6QWxkaXk8iDnmmh9DhRjNNkkYfzRuQErqN2+ryZEuz1MofdTV?= =?us-ascii?Q?tjm7e9xb0CWh9SmZ2qUy+tlCpkr54Gl1w7fvs38uG45VnZPfnlUHRgEiWW6d?= =?us-ascii?Q?qSSNxt97h81BkpwEwEan/on1XIJZxRGodjDgK1g9CM5GaPu1Wh7fyZyDVxMJ?= =?us-ascii?Q?v3aIwNqfVLePkGHhoei45PvZh54r34sXA8k0YzOxjs2zooBwR/HmJd1KMZWP?= =?us-ascii?Q?LhwUoAh+GPhzmZUOuMjyIcRsb+i2dZJgywWt/sNn3/CJZiz1m4Jd0NhXuAWD?= =?us-ascii?Q?0Yvoo55xZJY8r/l2xYuSTysUGZ7ZxNWoBQo8bsePEqWeZ02JFECiYfLmKqKV?= =?us-ascii?Q?mkb1g+4csInQysNoPYl1Rav7gzuxg3pOxDPxoPQ75ibI0UzVVQWKj8VcgxXn?= =?us-ascii?Q?1berd3Y0eJrRPrT0BVLNR6aQlEnExgllX5fqK+6wz/Vqe+yXgbomghRy/Vec?= =?us-ascii?Q?M1o4p/FDhLglR7LvjZWsmJxrOQiJrFE0JN8PXP6mMWrOcgBnHlxSu6doVU03?= =?us-ascii?Q?WD/OIUdBOLMLqjlAAim4qBDo34ecCwOHoZK8wRDTHPVCmocETHdtcby6VSAA?= =?us-ascii?Q?+J9O6nCMhQg3qLnzEe8IkM3uf8uNYV+hEAhkxS2A5C30OeiuD2wvR8bPzfX6?= =?us-ascii?Q?ykcTGYZHKCgwms6IhjzPeeg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2867de7-1de4-402a-70a2-08d9dcaecb2f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2022 07:22:34.4689 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: C/K2yg/2Mz7fFnYe2ejkptX/dr+ZIekgVIQuDfHq6FsWMMRrCWnCzLW3qZF8LPkfE29MACSnmm1LejBQNzfAOw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5396 Content-Type: text/plain; charset="utf-8" Please update the subject and the commit message: ''' selftests: mptcp: add port and id for set_flags This patch added the port and id arguments for setting the address flags in pm_nl_ctl. Usage: pm_nl_ctl set 10.0.2.1 flags backup port 10100 pm_nl_ctl set id 1 flags backup ''' Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 64 +++++++++++++------ 1 file changed, 43 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 2a57462764d0..e554928487f8 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -28,7 +28,8 @@ static void syntax(char *argv[]) fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); - fprintf(stderr, "\tset [flags backup|nobackup|fullmesh|nofullmesh] [= port ]\n"); + fprintf(stderr, "\tset [] [id ] [flags backup|nobackup|fullmesh|n= ofullmesh]\n"); + fprintf(stderr, "\t [= port ]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -657,8 +658,10 @@ int set_flags(int fd, int pm_family, int argc, char *a= rgv[]) u_int32_t flags =3D 0; u_int16_t family; int nest_start; + int use_id =3D 0; + u_int8_t id; int off =3D 0; - int arg; + int arg =3D 2; =20 memset(data, 0, sizeof(data)); nh =3D (void *)data; @@ -674,29 +677,45 @@ int set_flags(int fd, int pm_family, int argc, char *= argv[]) nest->rta_len =3D RTA_LENGTH(0); off +=3D NLMSG_ALIGN(nest->rta_len); =20 - /* addr data */ - 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); + if (!strcmp(argv[arg], "id")) { + if (++arg >=3D argc) + error(1, 0, " missing id value"); + + use_id =3D 1; + 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 { - error(1, errno, "can't parse ip %s", argv[2]); + /* addr data */ + rta =3D (void *)(data + off); + if (inet_pton(AF_INET, argv[arg], 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[arg], 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[arg]); + } + off +=3D NLMSG_ALIGN(rta->rta_len); + + /* 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); } - off +=3D NLMSG_ALIGN(rta->rta_len); =20 - /* 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); + if (++arg >=3D argc) + error(1, 0, " missing flags keyword"); =20 - for (arg =3D 3; arg < argc; arg++) { + for (; arg < argc; arg++) { if (!strcmp(argv[arg], "flags")) { char *tok, *str; =20 @@ -724,6 +743,9 @@ int set_flags(int fd, int pm_family, int argc, char *ar= gv[]) } else if (!strcmp(argv[arg], "port")) { u_int16_t port; =20 + if (use_id) + error(1, 0, " port can't be used with id"); + if (++arg >=3D argc) error(1, 0, " missing port value"); =20 --=20 2.31.1 From nobody Thu May 2 04:50:02 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:84cc:0:0:0:0:0 with SMTP id f70csp580570jai; Thu, 20 Jan 2022 23:22:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJyD61aA1v2sniIyp2Cp8lIS6HbOl/CfIMPJ7Jo0Bz4wrBqbpwM+wJ3N/M6wVG+fLdEd/kC1 X-Received: by 2002:a63:3704:: with SMTP id e4mr2071235pga.551.1642749768221; Thu, 20 Jan 2022 23:22:48 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id mm14si5357184pjb.14.2022.01.20.23.22.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jan 2022 23:22:48 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3272-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=J5m4JdYZ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3272-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3272-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.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 68B0C3E0A18 for ; Fri, 21 Jan 2022 07:22:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5B3AF2CA8; Fri, 21 Jan 2022 07:22:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 288352CA7 for ; Fri, 21 Jan 2022 07:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1642749763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pCNQhrGG3ukd4EfX3peP3ENc583+/hVy9P81nEZKg9A=; b=J5m4JdYZxzBoGVMNNallXTTvzRKhdnQWKEex+B+qA0AzN21oPP3aNjrAsmqLISjKUDhtdn 7BirlcBdfqECSQVytHDNtLfrYqe9ysZzLa7dsw6ui9uy6CYupEOwMiYyCo89dIZrkZqDMi RlhbDD2RVL/iM2l510FBtTLRhliXLa8= Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2057.outbound.protection.outlook.com [104.47.4.57]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-22-2ap22ylbP924mFcA-yeu5A-1; Fri, 21 Jan 2022 08:22:42 +0100 X-MC-Unique: 2ap22ylbP924mFcA-yeu5A-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b/ldlqkTglCEfKrrxOPY8kP13DCeWcRtqXoqnFqXdOIO8dGUnlx5tFU5nr546TMS0lkTuT9NH0Fj1cJDLDG3t8lOzhPoqDMaA9W2m1XNaZ+tKhbT5ZSMDZP/GTxKlIi6bQjI2Xs0Be6Avc0UUcNjsEnkSaoWYbfkYd4PTpmTavvUcFSI56f/vSPNyPLHkzHLeR2dBhMd57lTag4lJKj1Wtr4IkUlKWYkromFXTPw21y0ENCK51hK+8edz6oohUDziVkPt12c2mNnAIyMfxbQ5pJ1gaj6qOwPYEEA+jwip14dczGnPU3APwD9uJM/OKuGJmupdgY2JuMVvEziy6gWyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OkOXorI3110B3KdI840lhK6LIQ/VIiDFOX0JwsbSgYk=; b=Tm1HOan4F/zPdOeY6VzYK8CbOCFJuwExxJ7UY54uNNgdEL4zNAobck3GNHlEMhF+mYSVAh0+JehjbLrvyMFMU9n4FVRwkmeHXS6YPayozE09WGoVwN1nBnckOJedRLUm9STbzPpy2FssTzo2ptA63poY9Rnbsvl/OfRyxcO8cpWaBTL1aZodo7Wt6K+2uskMGxiOTU22o4sEmpvLg/nJe2cBJWbjLfCaOZDyk50Dk9wyLd4S6Ag/VhZqxMHDJll+P/fg3tXjj7jkcu6hnhrd0alQDa9xC6SaVmK3kgnTAZTrTGl2A0/kRHJQ7pzLOcy0MmJeqp5zP5lOZEBQHgJs1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PA4PR04MB7600.eurprd04.prod.outlook.com (2603:10a6:102:f2::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.8; Fri, 21 Jan 2022 07:22:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::fcd9:b39c:2b94:f13c]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::fcd9:b39c:2b94:f13c%6]) with mapi id 15.20.4909.010; Fri, 21 Jan 2022 07:22:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/2] Squash to "selftests: mptcp: add wrapper for setting flags" Date: Fri, 21 Jan 2022 15:22:31 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR06CA0019.apcprd06.prod.outlook.com (2603:1096:202:2e::31) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63bcb3f8-f36b-4564-af9b-08d9dcaecf94 X-MS-TrafficTypeDiagnostic: PA4PR04MB7600:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1002; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gKILn0P+fes39GIcWdbjcdP9djsw/lUJ97guOBGO9HR2nTxEilxgOoVd25kelFZIa3F20GxwBTqS05TcjQ24p1Z4tIFT4zvE0nKWao3Up/DU0C4zVTqT0Hmkkxc3ow3wVjMbjiqvVsM6dBlKbwvuN3edNFwlrkYf7n6gBVGkRel5m0wkORCe0JSnAAyTS8sPdUOjYMaG2UDVmWUHhLCzebIi48+M73WjhDVtToJgqaSv+ApwBmaJ85BdHP+jcB1Lulnf/kMcaVGsHkbC0sCCSmBC4MO5xoJiCmj3yKpkrUOTLZZwJJlGqMQ5X9DH/ahPrs91TniMykw0Kag9IxAnjD3CGPpnaXIUUpeaBLSSRPVbS+ygPYxXeS1EJK1BdBB17SUiUmc7GtEx6gtZ1j81UgFCYMzDI1ehB6sJLmyO7u51woAFlfTpBSJYPFhsEvcdbGYJFTUDXz/JjnGXy7wpYgo6kA4gmQe6kW3N2ESMsggc1KbSbmYQOKJXuXOCk+0r7kU06yTWw3d/4LL8pPP775k63XitjkwHuFnFcHcre1BNwAPXulGFDttVQi3CVEAF8t8byZDsn1Npq6KV8llG66wm9eRdjVpru1x5No7gzh1ie+iCGFK00ng11gJinbW/YZrbqItKYlPOjC2k4iDOCA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(316002)(83380400001)(6666004)(6506007)(6486002)(86362001)(2906002)(36756003)(107886003)(38100700002)(6512007)(186003)(55236004)(26005)(2616005)(4326008)(66556008)(8676002)(66476007)(44832011)(8936002)(508600001)(66946007)(6916009)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?SwiRmXZYGfNRdkwQZr30MD9whhqVmU63MkGZN5+Ix9bXa0Ngq0flMJzXSuCc?= =?us-ascii?Q?vYQP8Q7/7uF4ASLxe+dQLWKdAdV1qyZ/rKonhDUBpyg8wia7CZg4L7Curp4/?= =?us-ascii?Q?Ysvg9bHrZpiMLQkX0kDnHB7dUDLOSU+yOVmGAVy2/MwrADsrtpzFKx2HT/2f?= =?us-ascii?Q?taz0VNUaoQid1UQB59Rrj0BS6Rd5sWlBXj5iVAJRufwFfzNxkcCF0VVKqBna?= =?us-ascii?Q?BvwzIs13/YXgNG9fzCH3BSakir7sNa3v/gawZHzASTYOapYspOeNW7099rFg?= =?us-ascii?Q?z8GYtXxm3Zt8f57qxUEfPIr+OSb4jm5wkaMcxJAc3vG9TDUshgkK2792X4X7?= =?us-ascii?Q?dGDaVN/GCeiDnOyuCiuMexmXtIJg8ZnAZPE562MZ4RVrDozxMQEJjAlyoVnJ?= =?us-ascii?Q?uAv0GytNwWtZfsgVf2qTTy5kJDHeww1k6Bh3sFbfUPfHxBGSIHACZlwdiYRm?= =?us-ascii?Q?esPz5+wZZiaROrIe3EUSzcCpxwejGDke3l6FedhCEoJkAoYxrLDoopObo99c?= =?us-ascii?Q?utVF22sDDDvVaoFRe9ZUHuJ8UXMiZV+nhAA/EmYraFeDcS8RD5zossYtwJhd?= =?us-ascii?Q?JrXmYvAtaJ7Hq/i+79faiF+tHFqddWgNoD7YxXAOEgLbPqlToFL3SrryzYct?= =?us-ascii?Q?+p/REPt7Xi+gEVKnhC0qJ3DYcmKpI4ZOb13CR6vWAvyCNTBt+NKjEJddmTMc?= =?us-ascii?Q?fKpTOmUj7edMK8N3v1w3bo9b4vvKJDuGUJpVCbYzqtfG6JFpxPsMMFlHe/lR?= =?us-ascii?Q?CBgSqPxWQEfPcoSZ3SiE6wnSvfEN+z6Jwdrv26awGvnZVqeThb9PBvdVJf6w?= =?us-ascii?Q?eIiSb9ZB1soGI1y/yOSvZqcQhhL3TOREqODBWZsfdLqtUS5vbz0QF440ivvi?= =?us-ascii?Q?8MrWSGMC78+zjSjT/u7bOeS7DHcgZtLGxr0GEamiUVkhl8LBD+lMdUr88xGH?= =?us-ascii?Q?3IlSWBlyob8+ZvmMFAsBKNQWzYgzzFEfP/MmuqOKVLPWJHL+M+gIbNP8N9dP?= =?us-ascii?Q?gBQaWZs2zAdPrNsSkGrxjf7B1oGivOfotazKVXayqUpdzBIeB2P8ebHMqDIq?= =?us-ascii?Q?dS/gEzPqX+IRiSv6IP66SL2fTihA5OgQLcikHOSUAkHlH0nuKmB4XigJGP//?= =?us-ascii?Q?ZV9nW0y+eL9eaVo1IdpDOPm10X+yM7uywvb4z2GSntRUZG/zBNxOcKgFaN34?= =?us-ascii?Q?3E7hVT1kMJDsX9UNupDHq7fp+jjrudjJ8D52OHj6A1WlWnO+wOaC6kwWYuwi?= =?us-ascii?Q?ypGLx2VPlcRHKjVvnjQEcYbuQO0XgrfMPj8L+jp97/KKMzYzTAdBUH7rEVXO?= =?us-ascii?Q?pEzzX72pPZF2VS8qWM2r4iUarGQ4M/iX1a5s3HDOJ9NE2mwxYzZ89ps55bcZ?= =?us-ascii?Q?6q2NrZ2xpBojvoZ0YQzJ19ZP+QT3w6PKRtNVd0Q/TUxZPz/zO+mNYy3EDv6K?= =?us-ascii?Q?pPswM0UhHH3K6iIH1fZ6J7eH0/n8NtipIEDSCRuCOy5HcTrCVF2eUHXKhKEn?= =?us-ascii?Q?/s533HQp/XQdqivLlvQeVePjBD2HvucrdkepTu8PG1g36xxBQo6Pd+Jdvl7p?= =?us-ascii?Q?dyIN9TkezJ2DRzCvA5o5JVIu8j/ox8HoQtGWA5hY4EfyHiQ2/8NVaY1voUzb?= =?us-ascii?Q?ycIp45byQtq61t9+0gs3Cpg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63bcb3f8-f36b-4564-af9b-08d9dcaecf94 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2022 07:22:41.5465 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Lav5E81jSW8KjSTUvBof+k1CrcKYAwuAuTbw5J9ayhQIIs3+/vt+XE9rTZyJoMCALD7ZcVy1BYRT6+HgP4rHTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB7600 Content-Type: text/plain; charset="utf-8" Please update the commit message: ''' This patch implemented a new function named pm_nl_set_endpoint(), wrap the PM netlink commands 'ip mptcp endpoint change flags' and 'pm_nl_ctl set flags' in it, use a new argument 'ip_mptcp' to choose which one to use to set the flags of the PM endpoint. Randomly choose the 'addr' or 'id' as arguments for each command. Parse the address ID from the PM dump output as well as the address and port number, pass them to this wrapper in do_transfer() instead of using the pm_nl_ctl command directly. ''' Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index cd45b854ff6e..ff82ce6bf81f 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -457,12 +457,22 @@ pm_nl_change_endpoint() local id=3D$3 local addr=3D$4 local port=3D"" + local use_id=3D$((RANDOM%2)) + + if [ $5 -ne 0 ]; then port=3D"port $5"; fi =20 if [ $ip_mptcp -eq 1 ]; then - ip -n $ns mptcp endpoint change id $id ${flags//","/" "} + if [ $use_id -eq 1 ]; then + ip -n $ns mptcp endpoint change id $id ${flags//","/" "} + else + ip -n $ns mptcp endpoint change $addr ${flags//","/" "} $port + fi else - if [ $5 -ne 0 ]; then port=3D"port $5"; fi - ip netns exec $ns ./pm_nl_ctl set $addr flags $flags $port + if [ $use_id -eq 1 ]; then + ip netns exec $ns ./pm_nl_ctl set id $id flags $flags + else + ip netns exec $ns ./pm_nl_ctl set $addr flags $flags $port + fi fi } =20 --=20 2.31.1