From patchwork Thu May 2 07:55:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gal Savion X-Patchwork-Id: 1930753 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=XcJgr7Tk; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=maxlinear.com header.i=@maxlinear.com header.a=rsa-sha256 header.s=selector1 header.b=hOk7Pkpq; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VVgV75Cfmz1ydX for ; Fri, 3 May 2024 03:12:29 +1000 (AEST) 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=CSZQBUbc9573Ee8QUeke3ME5PFes9wnd7EE09CjToq8=; b=XcJgr7TkZNOgpz 0UAxnGIX89F6HD8tvJ/svRWsfpgevV0y1j1/yiG6/W+fEkcDuWUjRfyTLuqRpBsmdIkbu75vLUSNK fYY+vm06E/b+lbR+BH4fM6HiE1ep0ZapcOqgSYiRs64MxpndKX3KK7gt0fS9mYk8wvrqI6mAqcXUc BtEXPhiWSxtnk2hYBSlYP5NR4KbswTam1X79hjAm8Zy0FI1pTsSiuHQh14PFdVBq49iJ/h3zezELv MaxvbzRBuVpJDj59AObn/b1fYzTjZXMrB0yBN8Mg8riWrV/rQOAa0IO3QuFI9Bw0iyg/2YemKvtyC jLCoj/E9p035XkOvxPDw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2ZyN-0000000DP94-1CDc; Thu, 02 May 2024 17:11:55 +0000 Received: from mail-bn8nam12on20701.outbound.protection.outlook.com ([2a01:111:f403:2418::701] helo=NAM12-BN8-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s2RIF-0000000Bt1S-2SZS for hostap@lists.infradead.org; Thu, 02 May 2024 07:55:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e9yD3Pe8Ad/vkTTMB/Wh4V3yPLovwQvU6Vbj5nWX36dmyWf0uaWcpdlmp/XEpfYpW9oqaF3U0yMoe9HbuAH2qR+MCReOHLnUyBI7xNYwfdbNSiU2dnn9+GZtcP6GtxWhpo6i80DSvHUoKptkoxngHRZC9iUxQ9E7r7uTLRdMsOY87IVFvv9HGd8p918rcyl9kIzgbhNp+mnaxIP9pC9wzoM3lqEva6GMAHOgiXfnpWzC7Lc6ysY/qQvW4An6CvmJhFgAR9uUQ2hINHiVv5Q99A0Y5YifEkNclWCMMPvY6f0eGf30kHAYPq4z1PURlkhfOkhXT4FBalGjEFGctWmyhA== 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=NniJ3YrvaHoQ2lv6sLaBVLUk17Ftfs+bqVZ49I5XZDI=; b=dbZ7lQlrUOTzUYnE1q5wawiyU4eYKtx+seh1hKjPh3xIkaGH5BbrxHFBFmNsqG5rb7CyNfoo67xrHn4h32PjbTMoFxyOccMGtzvuo/lws8BTIUzuj6mR/AaywcIfjnDt1wuSem/68nopTbCm1N5TSdAE6CXrQ8UQQ9s+JNrS92R52ZapERUjC9R5FanfhytSdiM3WtYtKEZKu6Pz6JHt6zfNPJct/pI2Z1YCsCvWN2z+a7+T3keDQCXF9SDqcoFI0DiUfT6T3KQzmslB0RIzFWSGubQchgwD5mQk0Ma9oOU5att+KZTQsHiXCWBwROMY+Sm8zw/fuhM7GGcy8wVzXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=maxlinear.com; dmarc=pass action=none header.from=maxlinear.com; dkim=pass header.d=maxlinear.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maxlinear.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NniJ3YrvaHoQ2lv6sLaBVLUk17Ftfs+bqVZ49I5XZDI=; b=hOk7Pkpql4UYd/23bybU/pvWmHqraUomDjot6ZbgAUShbB8z9wxI50rmtLGb8zv5NJXNr/ZQcoBpC37GIpsGktAFZh+ptqAo7YwApwERHjTA6M5FSglGw+sGDD93BiJyr7Tyveidi6iCbRGuJC+uaBVtf0/zz6Kr8bu1IunWSQ8= Received: from BL1PR19MB5889.namprd19.prod.outlook.com (2603:10b6:208:398::17) by MW3PR19MB4217.namprd19.prod.outlook.com (2603:10b6:303:40::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.28; Thu, 2 May 2024 07:55:45 +0000 Received: from BL1PR19MB5889.namprd19.prod.outlook.com ([fe80::89af:62b3:5d27:21eb]) by BL1PR19MB5889.namprd19.prod.outlook.com ([fe80::89af:62b3:5d27:21eb%6]) with mapi id 15.20.7544.029; Thu, 2 May 2024 07:55:45 +0000 From: Gal Savion To: "hostap@lists.infradead.org" CC: Arnon Meydav , Sergejs Hatinecs , Jurijs Soloveckis , Mikelis Vuls , Assaf Iserovich Subject: [PATCH] Avoid sending DEAUTH or DISASSOC packet when using flag tx=0 Thread-Topic: [PATCH] Avoid sending DEAUTH or DISASSOC packet when using flag tx=0 Thread-Index: AdqcZYicQOScC/HsTUysmPfFA/47oA== Date: Thu, 2 May 2024 07:55:45 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=maxlinear.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR19MB5889:EE_|MW3PR19MB4217:EE_ x-ms-office365-filtering-correlation-id: eb9a8374-0bf1-439b-3ab3-08dc6a7d45de x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230031|376005|366007|1800799015|38070700009; x-microsoft-antispam-message-info: =?utf-8?q?gQlN6KCNk7ItYlBDDBnk7IofANQRBPk?= =?utf-8?q?vrMVJReGsvsMu60ahkCfFFOHnJojzlu+Ft4tjZHX3lH8BRPevE6FLmX5EwR0+TLmY?= =?utf-8?q?GNNPE0xh0/YHZMCuFLY53ZZC0hag9LSxon3ZBv1fXBnFDh7UuKKdRvYbI8r+mtUJs?= =?utf-8?q?ddGtB2ZpsVyjaHvV/Z61lgUDDWvwFkLSdmIUuErLR6Y/Dh7G5UshwOD08CBH2NIau?= =?utf-8?q?/wxWD53IEYlVvlQ2ATU9cL2VfzirtaXOI0OYQaIv01tnrNR8wiIBoV4eATC4P9xBF?= =?utf-8?q?lMARI7mT39ldz3MSMZX3aIodUFmFpYzPLaNFl25w3HhcLyGVOWeLzx03pIJ9ymGtJ?= =?utf-8?q?5+40KJikh3Mtd7WUL6whROMkv7YnYirPsTIQ9d9RVN8TI+YtO9Ruj49Pho4VyndWJ?= =?utf-8?q?bL8lDA4liusoZhYtwDlfguvskDfwPPvOzenL0cnAn+UYzWDAhVBMt4G++ZxwAtyqz?= =?utf-8?q?JeL5lSEXvZSXVRDmqVL+WJJ2dQfqogAcGOnlyRDq20n8GwP1Gvy/V7ZJbQY+Z1CsK?= =?utf-8?q?5d2BobWLHxZO+9c5Gp9jk+g4oyZgDQ0axD8tW9FHFp1rpgr2Zv2j47LRNGZqoV1tw?= =?utf-8?q?8XiiHDvVnHnaAMDciVaCHx8s5E1TGSwp0g1fOnKW7UI0ls6RzKWBwcsSfFZ4Ez+KX?= =?utf-8?q?XtezvxmEJcqRb9vkP5AqKu37BNStclmK3fCyiE4l1XEKbt4hXJPxBJCJ4Ihtbexhl?= =?utf-8?q?bkmfTm//C8diJ5eZTFlS6gEbIdPe20CDsnRH5CXrghf4TV1Y/LvnyJ0bWchmH3Qga?= =?utf-8?q?bBqNfLZqwppPCZxhVOWBFhjSoZ5Me2ag5xjxVZ0CTQ9tVdxtn8VZ4G1h6z7AWVLkj?= =?utf-8?q?ggyfQJLKn9nKQPMFn7Rc2aALUASr40jJ+FcOP/+ctCJNu/TxiFwwzxylQt1HS5r+M?= =?utf-8?q?H7eEpINbfn2P3LIAbRC2ouLkLO04iGjyo28MXgKuW64uhMNuofc3WN9we77mJfRps?= =?utf-8?q?VMcZjV0+/l4tGmatvf9gIN4EuI255xKC22hi3TwbKitzfReczWjI/C1sFyuxQJXuz?= =?utf-8?q?uLf8l4uDkRISiZUNsy56txAGCDaS3kw0XYtEtFLj2UXNAKEydTk5YoVCaiiezMzWT?= =?utf-8?q?XAhgwBmwSD64l6ILo+EzXIxIgc9k25hgm4ZfWmy4BFiC/WxY1SnrBrIfD+Dg4J7TF?= =?utf-8?q?X0/Q6FV+AK8xJ7PiqxABAQ4t6TbSvxGw7qaKFbittAsqzpj60cpy3GAD6ew6zcnPi?= =?utf-8?q?OAHltX+5GUGLj+cFKFzketZBvISMODAvqL/tSqUYFR+pvRdHqudGZJPcxpXLnvcT7?= =?utf-8?q?85UV8PdJcjTRwwq6YJNg6033mvdTDee5f1w=3D=3D?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR19MB5889.namprd19.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376005)(366007)(1800799015)(38070700009);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?6NUc4U+ZaXWrah6o1HAsidNPgRtl?= =?utf-8?q?oae1EUXss5vxykAaCm+VMk+4ezkrLeYwsKXyCKcT5BvX/VIBJsM2xDBOPTruGrlpb?= =?utf-8?q?uQuzrXsPLPqJCknVzoHCSstnw5gvYD4rVybeVhanYohDKg7aHGlmjb9aLmgWwEwAh?= =?utf-8?q?+FhkckGaWbrh1VRMbaufLMm9amGlypOW0G1QZjgNvFjRpd/AuqP8xhy0mfSNJi/zi?= =?utf-8?q?riRUNuX5yX0hq2z5pWUi47hi49QtaeAlv49b9z4MurNbSZH2MujYZPoS6K38NlM+p?= =?utf-8?q?qYNvC7c8LMeIo/9rixrQ31rkTxboa8CLNVtAIzaCFnuhuzYS8M9WhtaJQtVuFQxS9?= =?utf-8?q?ucXpVr5cSLxaoRFrq71agIzIILSSqCVEZkSxsp2TQiYqDegDx7CxrqiQjsRxGvmfN?= =?utf-8?q?AVAcu4eY4EjuqEDrm+IyqeEcj0CuGOk/ukBDFt7Mr+Mk7ys2oKpz4ppb6ZiIFIGEN?= =?utf-8?q?UWTEvaGO/29S+/RQx1MQ3fE30aCBDkplmFlrD5JuxU7KDsgtZhUYMqaDpWt5WXTH6?= =?utf-8?q?fRwinnL1cD/diYLa8Hr9/yeOAOlfhvwxXspznnffYnv/8gQFmfmHvxRCt1iJNn51Y?= =?utf-8?q?tqrB3Wf+tZFd1k5lhIHDfbNLc99ZdwMPhv5ZGZV5arsCKGzJLWcOFnqC6YFYO+TqQ?= =?utf-8?q?7qi5kaUQ9CNMvaAoJlYkQtlB5EizfLy6T30zHzQQiEpTd3hRdArezC0Hu2FQSiz8w?= =?utf-8?q?X3DbUksfO0JFof6giSYLoOCjUNKn2pb5Oow4xy8Fuv1RA5uWaWXlrabk/CCZj9gvA?= =?utf-8?q?ZBUwjrPfRp8i5VrhA9QlzY36cdbPQ/MYjA/2jtmzZebTaUmvZ97qm3Q0mMXYpmkze?= =?utf-8?q?E0HmsjB51bexdItVBwcoq44J/gGSwdWcJLdYovQqupL8U3dhWfCzkxMTb9/xLdfrZ?= =?utf-8?q?YWhNDDxSuizVueXfgxFbwbOGbQ3aJAGMxNmH5iT7/jkajqoJ4U4uvrLQ/wyOHoNpF?= =?utf-8?q?OP1iVJwhpG5u3z55Yn0giJDTKO/jeV5B51+sFn5BTKI3VigpY9l5+OxDfU/+fjhoN?= =?utf-8?q?1LbwqQub0HP3yQCio6xrGoGe6+o7PQbacOgTDmICtw9YfiifSLHhy6OQrAN2wCNL0?= =?utf-8?q?a+FILxpANbjLm3BXgkHSJ/eGNAFCvaEQ7xfcMXwhcOjHqasRJa0zxIZLlrXUNnUjI?= =?utf-8?q?xkQtAdyZR8UZXhw3L2xgnvSe5NrF87ma54nk+cgtvgr63Sv+vpYqSABIAyt1zRyIS?= =?utf-8?q?cKJ+iu3XfnHvoW559QbjvbCoaEZmCpVpEvVGy2reaZcl2AGhjn1xD92+7PXSFhUPR?= =?utf-8?q?FyH5e+UUqj/ILtyzxxiOArV5ZXDdUpnk1C8y9SBoB0ta/umF0Q3ifuJ1SCmrMhstC?= =?utf-8?q?jmeGSJ5XhVtZCyRXRfnchWSd+JN4WlN4U2JFvkhS2mB4kjx35s2/VKK2sil48iw2L?= =?utf-8?q?Dxb0Nm+2kvWpFhw4mJv7zoz1kTdDCdsw4i1tst1wW9+VEnJEMV6ntrnktB8eabe99?= =?utf-8?q?R1uGgeulUhB+eqPECSxYCuSAVsm/82EAkYgTPxmyvppHSGImrbKl3ZUrBuYj9SJ2G?= =?utf-8?q?Xq5HwneNmmQT?= MIME-Version: 1.0 X-OriginatorOrg: maxlinear.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR19MB5889.namprd19.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb9a8374-0bf1-439b-3ab3-08dc6a7d45de X-MS-Exchange-CrossTenant-originalarrivaltime: 02 May 2024 07:55:45.4889 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: dac28005-13e0-41b8-8280-7663835f2b1d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 2R4DAKZg/JTMSaYOFAUX+p8xJIcv/kpsyQw9KdEZMsJqfJsNm24A12al0yopJqxBYgKYcWC1sMofq1z+kXhnlA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR19MB4217 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240502_005551_790807_13DF0AE4 X-CRM114-Status: GOOD ( 11.63 ) X-Spam-Score: -0.2 (/) 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: From 1aea804f11200e8e4fe622221590250abda30581 Mon Sep 17 00:00:00 2001 From: Gal Savion Date: Wed, 1 May 2024 14:11:39 +0300 Subject: [PATCH] Avoid sending DEAUTH or DISASSOC p [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 ARC_VALID Message has a valid ARC signature 0.0 ARC_SIGNED Message has a ARC signature X-Mailman-Approved-At: Thu, 02 May 2024 10:11:52 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From 1aea804f11200e8e4fe622221590250abda30581 Mon Sep 17 00:00:00 2001 From: Gal Savion Date: Wed, 1 May 2024 14:11:39 +0300 Subject: [PATCH] Avoid sending DEAUTH or DISASSOC packet when using flag tx=0 To: hostap@lists.infradead.org hostapd would send DISASSOC packet (after quiet DEAUTH) or DEAUTH packet (after quiet DISASSOC) to the station after some inactivity timeout, even though the command has tx=0 parameter. Fix this so that tx=0 cleans the STA info without sending any DISASSOC or DEAUTH packets. Signed-off-by: Gal Savion --- src/ap/ctrl_iface_ap.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/ap/ctrl_iface_ap.c b/src/ap/ctrl_iface_ap.c index 1acb97f9b..bcb7cc283 100644 --- a/src/ap/ctrl_iface_ap.c +++ b/src/ap/ctrl_iface_ap.c @@ -653,15 +653,18 @@ int hostapd_ctrl_iface_deauthenticate(struct hostapd_data *hapd, } #endif /* CONFIG_P2P_MANAGER */ - if (os_strstr(txtaddr, " tx=0")) + sta = ap_get_sta(hapd, addr); + if (os_strstr(txtaddr, " tx=0")) { hostapd_drv_sta_remove(hapd, addr); - else + if (sta) + ap_free_sta(hapd, sta); + } else { hostapd_drv_sta_deauth(hapd, addr, reason); - sta = ap_get_sta(hapd, addr); - if (sta) - ap_sta_deauthenticate(hapd, sta, reason); - else if (addr[0] == 0xff) - hostapd_free_stas(hapd); + if (sta) + ap_sta_deauthenticate(hapd, sta, reason); + else if (addr[0] == 0xff) + hostapd_free_stas(hapd); + } return 0; } @@ -715,15 +718,18 @@ int hostapd_ctrl_iface_disassociate(struct hostapd_data *hapd, } #endif /* CONFIG_P2P_MANAGER */ - if (os_strstr(txtaddr, " tx=0")) + sta = ap_get_sta(hapd, addr); + if (os_strstr(txtaddr, " tx=0")) { hostapd_drv_sta_remove(hapd, addr); - else + if (sta) + ap_free_sta(hapd, sta); + } else { hostapd_drv_sta_disassoc(hapd, addr, reason); - sta = ap_get_sta(hapd, addr); - if (sta) - ap_sta_disassociate(hapd, sta, reason); - else if (addr[0] == 0xff) - hostapd_free_stas(hapd); + if (sta) + ap_sta_disassociate(hapd, sta, reason); + else if (addr[0] == 0xff) + hostapd_free_stas(hapd); + } return 0; }