mirror of
				https://github.com/Telecominfraproject/wlan-ap.git
				synced 2025-10-30 18:07:52 +00:00 
			
		
		
		
	hostapd: do not use ubus return codes as auth/assoc errors
Fixes: WIFI-12330 Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
		| @@ -125,7 +125,7 @@ Index: hostapd-2021-02-20-59e9794c/src/ap/ieee802_11.c | |||||||
|  		goto fail; |  		goto fail; | ||||||
|  	} |  	} | ||||||
| +	ubus_resp = hostapd_ubus_handle_event(hapd, &req); | +	ubus_resp = hostapd_ubus_handle_event(hapd, &req); | ||||||
| +	if (ubus_resp) { | +	if (0 && ubus_resp) { | ||||||
| +		wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n", | +		wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n", | ||||||
| +			MAC2STR(mgmt->sa)); | +			MAC2STR(mgmt->sa)); | ||||||
| +		resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE; | +		resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE; | ||||||
| @@ -160,7 +160,7 @@ Index: hostapd-2021-02-20-59e9794c/src/ap/ieee802_11.c | |||||||
|  #endif /* CONFIG_FILS */ |  #endif /* CONFIG_FILS */ | ||||||
|   |   | ||||||
| +	ubus_resp = hostapd_ubus_handle_event(hapd, &req); | +	ubus_resp = hostapd_ubus_handle_event(hapd, &req); | ||||||
| +	if (ubus_resp) { | +	if (0 && ubus_resp) { | ||||||
| +		wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n", | +		wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n", | ||||||
| +		       MAC2STR(mgmt->sa)); | +		       MAC2STR(mgmt->sa)); | ||||||
| +		resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE; | +		resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE; | ||||||
|   | |||||||
| @@ -0,0 +1,35 @@ | |||||||
|  | From 5bd8c37d2a18427ea25e9602db083dfe340076d9 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: John Crispin <john@phrozen.org> | ||||||
|  | Date: Mon, 27 Feb 2023 13:05:28 +0100 | ||||||
|  | Subject: [PATCH] hostapd: do not send auth/assoc error codes | ||||||
|  |  | ||||||
|  | Signed-off-by: John Crispin <john@phrozen.org> | ||||||
|  | --- | ||||||
|  |  .../network/services/hostapd/patches/600-ubus_support.patch   | 4 ++-- | ||||||
|  |  1 file changed, 2 insertions(+), 2 deletions(-) | ||||||
|  |  | ||||||
|  | diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch | ||||||
|  | index bf2dec4f07..89e1e72acd 100644 | ||||||
|  | --- a/package/network/services/hostapd/patches/600-ubus_support.patch | ||||||
|  | +++ b/package/network/services/hostapd/patches/600-ubus_support.patch | ||||||
|  | @@ -125,7 +125,7 @@ Index: hostapd-2022-01-16-cff80b4f/src/ap/ieee802_11.c | ||||||
|  |   		goto fail; | ||||||
|  |   	} | ||||||
|  |  +	ubus_resp = hostapd_ubus_handle_event(hapd, &req); | ||||||
|  | -+	if (ubus_resp) { | ||||||
|  | ++	if (0 && ubus_resp) { | ||||||
|  |  +		wpa_printf(MSG_DEBUG, "Station " MACSTR " rejected by ubus handler.\n", | ||||||
|  |  +			MAC2STR(mgmt->sa)); | ||||||
|  |  +		resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE; | ||||||
|  | @@ -160,7 +160,7 @@ Index: hostapd-2022-01-16-cff80b4f/src/ap/ieee802_11.c | ||||||
|  |   #endif /* CONFIG_FILS */ | ||||||
|  |    | ||||||
|  |  +	ubus_resp = hostapd_ubus_handle_event(hapd, &req); | ||||||
|  | -+	if (ubus_resp) { | ||||||
|  | ++	if (0 && ubus_resp) { | ||||||
|  |  +		wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n", | ||||||
|  |  +		       MAC2STR(mgmt->sa)); | ||||||
|  |  +		resp = ubus_resp > 0 ? (u16) ubus_resp : WLAN_STATUS_UNSPECIFIED_FAILURE; | ||||||
|  | --  | ||||||
|  | 2.34.1 | ||||||
|  |  | ||||||
		Reference in New Issue
	
	Block a user
	 John Crispin
					John Crispin