From patchwork Thu Jun 13 06:32:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hui Bai X-Patchwork-Id: 1947251 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=tIXWcDqw; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=KY5NCEFF; 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 4W0CJv5pVkz1ydW for ; Thu, 13 Jun 2024 16:33:00 +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=b/oD686UYuWxoxNw/wWETbBc42NhSixVDVgDRBa/yYY=; b=tIXWcDqwRXwDG8 SnqTK4A3pHFD8jED6a/AQCxFqhI8vteHPnTuHRABB/pj4kaSkHeCW+dNo+jtF9JIpKHmOT4bn9lLB tRP0fyT3p/3wxF4Hjcwsp1a+QPWmcSGsIgvOhd3881zffysYzcKJBS55CwdHpjP2zLMWLGhQU5RRH Am5MympEqiPsSqfIumfaW/d0mWNkNN7K5pqA8hcbzYicJmwC7ACf4YJkuAkHWTh8qrO3+XFWANOD9 eekm9AG1beIjT9oO/xYJlQUC62aWf0LVHwOLs5EM6N9KIerbm0Okta5MWTxTn46IgR7Ofdmacs5yQ N9Q4a7w2VdhfM/bI45MA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHe0J-0000000FK9R-2GlN; Thu, 13 Jun 2024 06:32:11 +0000 Received: from mail-ve1eur01on20601.outbound.protection.outlook.com ([2a01:111:f403:2602::601] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sHe0D-0000000FK8I-2yft for hostap@lists.infradead.org; Thu, 13 Jun 2024 06:32:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kp/FeNE/lMzaMUVgJK2AEqwhOm6YjiMzGarpJd1BzjJCrtEV2CgSqlUPfn9dzmaGzh2sFxpSmvWDgn/GpwFtiPUZ/UiBd9hch6JlXpUg36tcF6DMu5fDKivAbSx67eGAG7tE2Qt7Q+17iV03YtWCGbsST2lIjVMoNSLUiBE6MSlCr9hkFPOwjfaPtDXs/Z9by6VSHwxDB7toTVYCsz9pvn/hH8LTnDmDZQkjlLhr8twPh0FRsoDrbKwTUcv2RcuWEHIwZNDyMw5n/iZWewhhf6/9QlRIn4i/wnmmd5iHtmLk7HS5l/+w4Qf5pEjgf65ykwQol9CZZHuDwQnI3dVJGA== 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=CY/oL/8v4hn/867j3kFpAJlAYVonOCeIjzfJZwYmBRo=; b=nVKveGXc3/kRy3cOymZr2HfPITrYOZNVjxN59LuhQtE16PbLPnxwDhKCiaI+ahFPynzGo6TA4e7MkOy8JT+/yf0eUy+iz5/EeprJkLw3hkCVm62gvZNKRSGobTKNK4B5dQcQAGjv2+W++FDloVz16TuXsF6sPMCkz2tpcbmHnYuF0z2dU1jNkQO0Zf7FRCPvzOe4ynl9yiVc8mXsmv1BNI6Tu6xli4/NYBCPDKZE9fmxTDr83GmTxwvFfTpSIHTopXeNbgJ/+CjI6/ffRPSx65pKtj8t+K6dHXs9SJTg+08c1yCvoSf/M8bksK8xQp6GuzyKdMvMjcPBtU6yBe5M1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CY/oL/8v4hn/867j3kFpAJlAYVonOCeIjzfJZwYmBRo=; b=KY5NCEFF67VOXN0h8mUOFfFqNHve8bGLjUNCuEiwfN7/z7PHZLwE0l88hXp4OfR8+4fC+aEH4I4Xc/l0zKrfjR0KIrKgBpuUD6jtls+GWkvVwDXHtiQZz5Jnq6bL4fb3dXqM5JixXuG9kCpTzWqKrmsuXCfFvWwgYTM7m7mgL5A= Received: from PAXPR04MB9139.eurprd04.prod.outlook.com (2603:10a6:102:22e::22) by PAWPR04MB10031.eurprd04.prod.outlook.com (2603:10a6:102:38b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Thu, 13 Jun 2024 06:32:01 +0000 Received: from PAXPR04MB9139.eurprd04.prod.outlook.com ([fe80::a0ed:cdd7:4ffb:b757]) by PAXPR04MB9139.eurprd04.prod.outlook.com ([fe80::a0ed:cdd7:4ffb:b757%3]) with mapi id 15.20.7677.024; Thu, 13 Jun 2024 06:32:01 +0000 From: Hui Bai To: "hostap@lists.infradead.org" CC: Hui Bai Subject: [PATCH] hostapd: Rename event handling functions in hostapd for Thread-Topic: [PATCH] hostapd: Rename event handling functions in hostapd for Thread-Index: Adq9WwcEcqwRxWuIQ3OoFQZ2C5F13g== Date: Thu, 13 Jun 2024 06:32:01 +0000 Message-ID: Accept-Language: zh-CN, 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=nxp.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAXPR04MB9139:EE_|PAWPR04MB10031:EE_ x-ms-office365-filtering-correlation-id: 5c7db526-75b5-48e6-facf-08dc8b7288c8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0;ARA:13230034|376008|1800799018|366010|38070700012; x-microsoft-antispam-message-info: =?iso-8859-1?q?YqcwLXNRMoXeKf8/lKw8xgoXfl?= =?iso-8859-1?q?oxq990T+ubcMCpHZ8EFoMdXaXj+orkI8BjOdVpbDgiiKBG5r+0HTe0z7FOrF?= =?iso-8859-1?q?F/NK23uvbkhemr8tCEU56MqHqnoJ0biHARZ6RgGroZVxBDJtPMQnGuDZ86AS?= =?iso-8859-1?q?e5djjCy7pqwx+n7iO2EAS/8bESXnnUtVt+Lnvw+IMFD6AqUCmTeQS211WENW?= =?iso-8859-1?q?QBHaaL74oafpEoELgJ8mf8cWFXE/oQ4nqVtaAwSsUyV7WqVeKgqxxs9ZqL3H?= =?iso-8859-1?q?KlnvYXKWxA723/a4Ip9AVS8i3PHEV5JHVdGwQlvcWDTAjonqis7mEb/rcSOb?= =?iso-8859-1?q?sJnnKD/mqEu60dytnpX1T32T8FaTE5aIyAR85Q/tLDuqpMV3LhNkvPD8hX1y?= =?iso-8859-1?q?vlYjUPxgUQSdGVye7/GaoKePpuKJHxCKilhyjmxvyGRjaq/8U7XKbwcH2uMw?= =?iso-8859-1?q?22MoDIz2Ygv+Ma1gsJ34KicRqamWiL1gdLdl/PFYclDeJG4gs27JDYxzLemV?= =?iso-8859-1?q?i3TmtgB4Sr8KbLim5Oxh2gHNhUy1H/y/lXQltR7qLlvIhgNRtJGoS6Vek1ri?= =?iso-8859-1?q?ga3sX2Rjrzgf32y5NNwGiUF/j5nW992+/gi6EDITQqZF/SmYS2quXMP+wJo3?= =?iso-8859-1?q?HD++POQUI5o/uyxM2MOqJqbB2Po8K8FRMafHJv5QVy3GACA5YNHl+Ogybkff?= =?iso-8859-1?q?LgjRybD7Y0eBPAp5TchXlsCYRDpPZFiAGvApfL7By36XMF3Z5L3DhEELGl8Q?= =?iso-8859-1?q?jKaD99o+cU06VDCFfjErRahmVIVwCRVtWv+R7lke3MoFYqxRCOZ8xHqZadkl?= =?iso-8859-1?q?byjWxLOwa63GDyx658bzNf7o0PCW2aUGXezyUSqFHZHS5abrchOZ1U9W9SdD?= =?iso-8859-1?q?06iFT5VwgMMZqxDimo82yubYcCfzYQtz00ZLMUnmcgEkw2Fzjq5LNeQ6Q/l/?= =?iso-8859-1?q?qKOtU00dS1cTnCrkue0pWLmU77yz2Qf6OwTgnYTwZoiv7h3EFzRJ2Up/02GH?= =?iso-8859-1?q?4BmEVnC5P7T6SFlq/4vflFGa4NrxDctmdk9HZUQwR5FbhOHlp7pgeQchRQQ+?= =?iso-8859-1?q?oTrfz4yivvFk85OXx4EtcTsld9zUUD3JJ1w+c0XMY2TLvakXISfEZl/2mxSL?= =?iso-8859-1?q?WEkkdgFXLl2+EpTt1sIeO9gRKFJE3hDyT8Zlv5m2WHWOQQlSCYI4Usttn87r?= =?iso-8859-1?q?CXtaQX7bglGoMD/HvsWWGmhcKtxlXACjuPjEzqkkoiLG7LO/QxQ0utvdoobc?= =?iso-8859-1?q?hJHJbTwdbInRvkfp9Jv8s50ewKfelTZ5u0PWQ5F7STaMq3d/GEmHJV31DvI/?= =?iso-8859-1?q?9WJjcP5xtZn1zpWaq7EForkl29APP8gN8YQ0NkkFw/l1I3NxKq4BrP/sALqc?= =?iso-8859-1?q?9WADKaZqWh8oalxLRh2fITv9FzW72w8/r7ABJnCug=3D?= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB9139.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230034)(376008)(1800799018)(366010)(38070700012);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?kl6MyESl1tvmhfzIbExYgix?= =?iso-8859-1?q?U4C61HasLNKing6XoubnKzt7KgIOoFF7K3tCDnRXkbGjB8YXRH9vdWBK0HyU?= =?iso-8859-1?q?AxDbZhnKkVUqe8HjEpqCQMQx/Wa/A41fGWEbzvKTRi9SxpyRMG/tBIyGsta/?= =?iso-8859-1?q?oL2mkguWvv5CxCfIhpFwy6vE5tzrHUCTv8vjXWZ08IP5jGu+ZMJImGXepgQi?= =?iso-8859-1?q?YZa32+PNbxu57/W3Sy5cbuLoz/+8PDLM69fPVMVn4YncQFcH5ynjtF5W25qQ?= =?iso-8859-1?q?L6hyrjbXuXJl2TwOdWxcnG4WZdWiSEnCrK3TqqIu4a+38ZfkFMjHZDkZjsHz?= =?iso-8859-1?q?AGc1HJIgmbHgFVWHItBz3xj4Wq3OTeRXa1ENcxagA4STWA9Z7al0DwTIglNQ?= =?iso-8859-1?q?KkEJ5V9FFxHoZd2ob2eEAtHxMS/ROQiTNmdlp0UoePEcf6C4m7n1p02rRFg3?= =?iso-8859-1?q?r+1qnugUtThSUpWHD73bcKPiibvhunjes6czW+WD8wQnf4F16U1OZEZLhehW?= =?iso-8859-1?q?5+ZF6Kb8D2AB4Ny/MQQ+qhbr+mjwuCPxbMe1NJn9J98Su2SZC9X5gqvqMw/x?= =?iso-8859-1?q?XapMYUJ3/k8fTfbGtJTaY697wGrNtiDvAE5dBCxCJcxNcJFSZuG1W5m3Ue1Z?= =?iso-8859-1?q?xaXiaEeuqvWCYHYrsCs46W9Avf63kZn5lZoSVQa51PfjOTUqNLkuVXO9QfZH?= =?iso-8859-1?q?AtvVLUV59nLxG2bi/Ro58g3DVSchxkqYf95bF1s1cP9Bfa+TIoI5TXpGPjIh?= =?iso-8859-1?q?q0lsvMvEo0EGpJtlM+2A194EesfzoS4M9uBXvPwjH9w4Hus53ZFxjBFalX2Q?= =?iso-8859-1?q?8CZe/vpDYS+Bjmw100kLG7pZ9pdF1bkbwKT0NSP456jSGfhTcPSzAgmMVY+P?= =?iso-8859-1?q?ovvXkTb8ygJyfuI3YUejFBpOmjIIyZmI45Ue2t+bz6Jnbw4ddmmj0XZjOoCI?= =?iso-8859-1?q?0sfDjsKoFqHQlbk39zyEwd/YUJdXjW/xE4pEPQxMNnNBWkNFt/zXOmGL0ZWP?= =?iso-8859-1?q?odcOXi+hjvMoIEFpVrpSsWOCwNgcfYCML1OU6eek05W1GmUoN1OpPwnYIKVL?= =?iso-8859-1?q?2vIG3uO9t3RB2p1Y1ugM+aKltVaxonmsZdiVvwXcIGxHSBKbDRA9DCinhMxn?= =?iso-8859-1?q?MWMRGBJI0WxujPL7t61fGBIGJt79S0sFUjCm+BE9Nj8e85OQNzdhHgbaEdpN?= =?iso-8859-1?q?ujyp8IZmQpXZdLMXzaJIj9ReE54p+/nQWPeKUgMDwHS7eqK349bG9sq1aLwe?= =?iso-8859-1?q?PPrn6XNyY+gRObgeTjKF3OaW6xc49uv8UiPzv82xVF0kak1CuZ0hlf7RmwdR?= =?iso-8859-1?q?yBknPq72Aq/FCIUr380ybLTX2bwwWZ3jH4RKCeGwMFoTeRMU7J2hVV4s7mpn?= =?iso-8859-1?q?qV6AtRVlmR0uDkZ28m7nY7i6JcbRDDUWI+Q6ZwDrnlb/mhT7FQGoIU13jbaJ?= =?iso-8859-1?q?TPQUY/O2ML5uHho0pn0lqQpBXNd/i9S4dPodY8siPtyb7CQG1tJBjYV7Rez1?= =?iso-8859-1?q?gwshyJbZfvJU8XYrD/AYNTP5psCnX1CoMGreG4fjXN3uRRdcZg3Kav/m1AXk?= =?iso-8859-1?q?pHRzq6fCLsuqC8CApgFNGn29rKNbHMaDQfzXw9cWQFAxQi9t/L6Q/MaM=3D?= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9139.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c7db526-75b5-48e6-facf-08dc8b7288c8 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jun 2024 06:32:01.6978 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: O7QBKZnvhEeY9j364u+OUnAZN04mcWak2Dup5Ime+4Jh7iUZ5sWn61hoHBkVTELE X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB10031 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240612_233205_776151_1318FC17 X-CRM114-Status: GOOD ( 10.77 ) X-Spam-Score: 0.8 (/) 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: On Zephyr, both wpa_supplicant and hostapd are supported. One compilation error was found due to function name conflict. Both wpa_supplicant and hostapd has its own global event and event handlers wit [...] Content analysis details: (0.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a01:111:f403:2602:0:0:0:601 listed in] [list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 T_SPF_PERMERROR SPF: test of record failed (permerror) -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_SIGNED Message has a ARC signature 0.0 ARC_VALID Message has a valid ARC signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 1.0 FORGED_SPF_HELO No description available. -0.0 T_SCC_BODY_TEXT_LINE No description available. 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 On Zephyr, both wpa_supplicant and hostapd are supported. One compilation error was found due to function name conflict. Both wpa_supplicant and hostapd has its own global event and event handlers with same name: wpa_supplicant_event wpa_supplicant_event_global To fix the compilation error, rename above functions in hostapd for Zephyr as below: hostapd_event hostapd_event_global Signed-off-by: Hui Bai --- src/ap/drv_callbacks.c | 10 ++++++++++ src/drivers/driver.h   | 30 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c index ad06e6a3f..29836cc73 100644 --- a/src/ap/drv_callbacks.c +++ b/src/ap/drv_callbacks.c @@ -2409,8 +2409,13 @@ static void hostapd_event_color_change(struct hostapd_data *hapd, bool success) #endif  /* CONFIG_IEEE80211AX */   +#ifdef __ZEPHYR__ +void hostapd_event(void *ctx, enum wpa_event_type event, +                  union wpa_event_data *data) +#else void wpa_supplicant_event(void *ctx, enum wpa_event_type event,                           union wpa_event_data *data) +#endif {        struct hostapd_data *hapd = ctx;        struct sta_info *sta; @@ -2761,8 +2766,13 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, }   +#ifdef __ZEPHYR__ +void hostapd_event_global(void *ctx, enum wpa_event_type event, +                          union wpa_event_data *data) +#else void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,                                   union wpa_event_data *data) +#endif {        struct hapd_interfaces *interfaces = ctx;        struct hostapd_data *hapd; diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 204694dd4..d86bf403a 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -6846,6 +6846,21 @@ union wpa_event_data { void wpa_supplicant_event(void *ctx, enum wpa_event_type event,                           union wpa_event_data *data); +#ifdef __ZEPHYR__ +/** + * hostapd_event - Report a driver event for hostapd + * @ctx: Context pointer (wpa_s); this is the ctx variable registered + *      with struct wpa_driver_ops::init() + * @event: event type (defined above) + * @data: possible extra data for the event + * + * Driver wrapper code should call this function whenever an event is received + * from the driver. + */ +void hostapd_event(void *ctx, enum wpa_event_type event, +                  union wpa_event_data *data); +#endif + /**   * wpa_supplicant_event_global - Report a driver event for wpa_supplicant   * @ctx: Context pointer (wpa_s); this is the ctx variable registered @@ -6859,6 +6874,21 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,                                   union wpa_event_data *data); +#ifdef __ZEPHYR__ +/** + * hostapd_event_global - Report a driver event for hostapd + * @ctx: Context pointer (wpa_s); this is the ctx variable registered + *      with struct wpa_driver_ops::init() + * @event: event type (defined above) + * @data: possible extra data for the event + * + * Same as wpa_supplicant_event(), but we search for the interface in + * wpa_global. + */ +void hostapd_event_global(void *ctx, enum wpa_event_type event, +                          union wpa_event_data *data); +#endif + /*   * The following inline functions are provided for convenience to simplify   * event indication for some of the common events.