From patchwork Tue Nov 2 13:24:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre TOSONI X-Patchwork-Id: 1549674 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=tGqso6R8; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ACKSYS.onmicrosoft.com header.i=@ACKSYS.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-ACKSYS-onmicrosoft-com header.b=qdErZM/E; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hk9fW40bZz9sVc for ; Wed, 3 Nov 2021 00:26:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:CC :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=58tAv4nmgYrY+d4ANrnAJX5BwOPXCmQaICMl+vH8Xo4=; b=tGqso6R8L686bq b6kGtfduXySe4N1+H58bX49hD3cIiKZUG+fHRg2m1cEnWuHWUQqC5xQN9lRzws+12j4EfSN+O7bbG Qt+nHouX85/H53vsTk5GN/N+4Zm1aHFm/zVxFLZTZ5iV0SmQuhb2OSzg3kPOpMqSQnjTjDlZ/yg/n gOCLocLRy4DCUOhAnBDSxIyAiPqXY6AOMEga5X62/bXmBXgK/ih0yeP8N4w7DtYL+E500yKXeejbS 7Z8d6n4WzlVOhxLGzd+ifNQzYixXsd958hcN5ai0nBaR/hcnHPU1XGix/Y8etruBrAw8e+Z+Cq04g x8P9haCgh7VBs/Cdksew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mhtm3-001niq-BG; Tue, 02 Nov 2021 13:24:23 +0000 Received: from mail-eopbgr60097.outbound.protection.outlook.com ([40.107.6.97] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mhtlz-001nht-TK for openwrt-devel@lists.openwrt.org; Tue, 02 Nov 2021 13:24:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OUr5KSg8FcWHpUuxCe/wFkBo5tYNvmVblwt43PfAsQtDAKbRlg66gjh5Y0NwiDzlwCNV5K2hJWmPSt1KUGfv+tLcJ9klah8ztPTrG2oQ43rBsh6FMGKLcYrO9YGeBwzE5xBlAQTbI9h/4vI60M3oXDiWWZIQUrINNdtN8RROMSwCTmxxuVVTAml3opZGDAPKk7x6RPgDLY4R6bqaijeXNRldIQ0jFNfL45r5F7Z/qZOMm6pc6IAhjVr4SBvm+X+N8T2/N1I3SOr40Cs/9OIsps4M3AolPeb7CU9MEASrldt0gz9zthMe9AllwEAT0apyrqqsvuqUyh5f1sB8uPwmOQ== 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=1n5AilQQi9mUDd8zthFtuSw2JCSzJYxhuDO0oSqsC+0=; b=hkTG56GXMrO+1kPQ8NxpQgGjD3lFfZBRwvMuefEKnl/NSkHpNgpaw4WxSN7b02uVuOmeVUMDJVnMYLXhB2B/7QH7ozaCXZXrhUkWqx8waJ7LqvdVOvCAhf6ULQhh34esc4KbQsT3KPkrDZba+4DQU4uRXKcAfhl0lkTUg0uTXIYxBkuTHsz9q8IuZXjha5Ykhbgvkfc9M0N7WHQG8OQKWHIdz23rrPJUj13L6mmnGzmGUopuSemW+pJXa4B8IhBX6SUcViRxo1WrYTGzRt56QI6ODaYtRAR9R29eL7qDoxeGoDIm+X8oeFLkekOVl+7mY9gh3WcIZkPrb873pz2P5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=acksys.fr; dmarc=pass action=none header.from=acksys.fr; dkim=pass header.d=acksys.fr; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ACKSYS.onmicrosoft.com; s=selector2-ACKSYS-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1n5AilQQi9mUDd8zthFtuSw2JCSzJYxhuDO0oSqsC+0=; b=qdErZM/EP4syZsnz+DuR3rOj/CMMZOTfnWTTZd0ky7RBKkSittCXl4PMkQCCNDHzRhpPN/xIS+sy/wU/x3n8Zw4ZxVQoPIZRvKW8l09YDQoCQADDbbtgjrdQgl1H1BwKd5QUN/8SCyhch15vOZsHo/aFss39uRHaNFWvYAPJnz4= Received: from DB9PR01MB7354.eurprd01.prod.exchangelabs.com (2603:10a6:10:21d::7) by DB3PR0102MB3675.eurprd01.prod.exchangelabs.com (2603:10a6:8:7::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.18; Tue, 2 Nov 2021 13:24:14 +0000 Received: from DB9PR01MB7354.eurprd01.prod.exchangelabs.com ([fe80::f007:df3d:1b84:f0fe]) by DB9PR01MB7354.eurprd01.prod.exchangelabs.com ([fe80::f007:df3d:1b84:f0fe%6]) with mapi id 15.20.4649.020; Tue, 2 Nov 2021 13:24:13 +0000 From: Jean-Pierre TOSONI To: "nbd@openwrt.org" CC: "openwrt-devel@lists.openwrt.org" Subject: [PATCH] wireless: fix mode checking in for_each_interface Thread-Topic: [PATCH] wireless: fix mode checking in for_each_interface Thread-Index: AdfP6nfFvYZb5oMPRommaU/e0da8hw== Date: Tue, 2 Nov 2021 13:24:13 +0000 Message-ID: Accept-Language: fr-FR, en-US Content-Language: fr-FR X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=acksys.fr; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: acd099e6-784f-424e-0d25-08d99e04103e x-ms-traffictypediagnostic: DB3PR0102MB3675: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:5516; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: HBw+xcJjBoVLWj/BHQl9wjZDvZs4xcmct7rdXIfMXwDCr0eiH4/g84JYYreaM9gQcmHcC7FZfwFRELZEh9c/Xg0GFb6t+L5UO86Pb8Ww8XJDls6YvyDsvtUKVfgSrJzBgkd/ObpTPXf5m8NYuiGrMX9a1SoVAtsVOCcaQNeVOdlEetTNTTLHqr0Q4Qr02/cDzjoL6ibJfp/CmnxNgWETIUMkY9G/bk7YEL7sYnRky8EpUmoD9ZasEWigQpqFR4rminOYFRgSxNGiq3roVolLhWiAcsxz99d9a0XtfpE+I0FDlOkh0IzZXN69zOVFWLJXqCENwdCeD4l/PayBp1y6upsvSI/Tt/Ih/VTXJ9fXE8Kp0yNf6sZmLIkE5mLdBTu40ivtC8flRTQTFnlmUdy1ZroSydZWZPx5OT7ViWJ2hCQRE9GjoCWT0AhuoE4LxLt4xsrwjCB9cn9H9e1WKaqTsPX4m++6p63z1gDwGForFaSL3u5wx6TyhfowFf4e431AM4w7LzVQtgdc5v/KFUL/KBx38nV1a5wDQ2x1g/7oMy+Nv+kNmqPTACmLHtozeG14HDwbYjRE7NLNY1XkaEn181ocsQ5Y44oBt8B28D4sDcRiltq71BQdFF4VXbbR2snu86fPeuVtMgs2wKV938j8Nq7Dcmhoa76WJHKufjm4gSU47PMf10j3JmsH9CmYfGRBG4Qk7VgFa6/Ymo1/f3e6VQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR01MB7354.eurprd01.prod.exchangelabs.com; PTR:; CAT:NONE; SFS:(396003)(366004)(376002)(136003)(39830400003)(346002)(84040400005)(9686003)(4744005)(38070700005)(4326008)(55016002)(122000001)(8936002)(66946007)(38100700002)(2906002)(316002)(66446008)(8676002)(7696005)(52536014)(86362001)(66556008)(64756008)(66476007)(83380400001)(33656002)(6506007)(6916009)(26005)(76116006)(508600001)(186003)(5660300002)(71200400001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: fOPKFJ8PPJ275gJpmQt+CU+9DCGl4FkIqSNnwP/trpPAIxDsLsI3odmv7SQfAJQcVgsQe0XzRhwW17SwrQFeg1QlwymW3cDGXLcUfpXNv7sorUZLaJnc/uU7uhEfKDtuSKzSO8yjxJhx2Fh3gHp4l4EpiYwr43b/d8a/JFFnfH755Q/PsJzW2HkBPex19E6E7FRPyFBRZ2VN0PGnLb4OEjf3UsURLRqJm1Im/A5hVB3bzTxfY3TbHv9iVJJiLP0NRit1gsGPOZI//0K4ct0dnA80vG6HxVvN1AvTkT0XnQYofWXZOArtYMndF2CcB9EPjqD5PzkbH4MP6pZ4X+k7SihcpbPnR26ZqcYIXd7h18iP4MnK6ZnXwKfFHxTC6VR+g/ZHXSzEvZHLg33wmcP0VDLIoT3I2TrKVagiXPWmvoP58bhTukFR7sUaLcRKSMHR15VwexuDoz8+8K5W0n501PqXajKdckXQVcTvd88bqjhNJe70UXGc3xrPNF5EGy97lIk1Qs00CvUCjfYV5booiLcMPVbwgObZ2L4rWtNnY9i0iS8CO/sI+cyeFXkTPd6XOQhkfhL0rPhquAbyRTo3n9BzDgU/5HJ7uRL+T4T5ktEmuoZpU1SfKBPqsetYqZouWD3hvcizd+lpPwgkQAKs1dLxiBMpaGQJ7vl5l+Ou2OYPazORpovUekA/ZMvJJsBRvlDFME60M3u5sbX+HhZkkFtdozA6mPp1KbeZY0fk4KZVe8xF8+5Wrpg8R6ZOVNkNz0RyVtDqoZAGNW2QoNtNBb/cexI6ZxGhCbhtemKx45J4To5QFEHECZmNBwuUy+SE4xoiPBznhziKgmqDAEPcpfR9RBl9/E+s8jiGX+J9IbuE226dfAg0PbdxR/T1Z0/PiiHiznRXd5jgixka20wY9ECsSXZkRn9Xd4maoCi776utW28ZOjwDQ+bF68NkT95Xj1tCK1WIo52GBhOFrqKX/oT2CbIOsIdEgFPl6oP41IfkkLVnZIJ8NhV7forUqJ2g+xeeNVwPl/735g1XPP/v5RkpFLMbX1ocpy2IcqTfIRPHJLiEXvBcnYRGwMnXGicvxJ+wQJE9mBZd6vF2Wff3gSjLQDMSpVNrtng87jtTGuc7dqvi6N1oyWRf682mYHXbDi+qZG8XegvuVnpMOSdZ1Z1ShZuIUNVB9C0wJR05H+oRIxvlSuRXRHRhV1rOil8sx2Y+rLp42E344A9eSHC+9XpopcHAZWEQK/p7zRb89J2wpM6jGCLtQChsYC3mF/Gv7EscaRsbXFX7fFXNI5r627Bz0YuBk2WjTiQob3+hsy74xubRG/Qr8Vfv3vkUQB08bjY7EKKKVUQq41lZ9OoJZvlsB+htfH/Sd7vU8CVgceJ7tBTv2lkoqbTmjdV5lpYWH7cl/hJYYLQDFcbaDRfzqUHlinsz3krQZZPJuZepL1JVI+kX+ziHV4ob6FQJb5CmOe+t/W06TgPAXdec8XLEv4FmFPNOItnki9Ez9m0o5uY6NX7RFgGvShzlltBoWUHHgrfpU5g4vHuhdpu5An2hky1DsG/ZCrw84NvT05YeIjJA7bdDqHNR3dCoecAu5vD8L0zoOZzyl3IDckyFyHFSRA== MIME-Version: 1.0 X-OriginatorOrg: acksys.fr X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DB9PR01MB7354.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-Network-Message-Id: acd099e6-784f-424e-0d25-08d99e04103e X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2021 13:24:13.6467 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f18a6414-d5f3-4b5c-9345-f30c01d87e32 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: fAluuE1J9d6qauFCRRYuTwcvAF38fk29JE6TIkDW5RpZT6xnNaTOHtixj9MdcXaJWvGLWw5fq6ALMOLbEVZONw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0102MB3675 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211102_062420_039943_03847F16 X-CRM114-Status: GOOD ( 11.06 ) X-Spam-Score: 1.0 (+) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: When searching through wifi-ifaces for specific modes, the mode string must be compared as a full word. So, add spaces around the searched name. Else, adding a future new mode like "newap" or "apdetector" which embed an existing "ap" mode string, will end in detecting the wrong interface. Content analysis details: (1.0 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.6.97 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.6.97 listed in wl.mailspike.net] 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 1.0 FORGED_SPF_HELO No description available. X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org When searching through wifi-ifaces for specific modes, the mode string must be compared as a full word. So, add spaces around the searched name. Else, adding a future new mode like "newap" or "apdetector" which embed an existing "ap" mode string, will end in detecting the wrong interface. This was found while trying to create a new detection service for WIDS. Signed-off-by: Jean-Pierre Tosoni --- scripts/netifd-wireless.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/netifd-wireless.sh b/scripts/netifd-wireless.sh index 80fbf75..9dd5431 100644 --- a/scripts/netifd-wireless.sh +++ b/scripts/netifd-wireless.sh @@ -321,7 +321,7 @@ for_each_interface() { json_get_var _w_type mode json_select .. _w_types=" $_w_types " - [[ "${_w_types%$_w_type*}" = "$_w_types" ]] && { + [[ "${_w_types% $_w_type *}" = "$_w_types" ]] && { json_select .. continue }