zephyr: Update SoftAP event functions of Zephyr with hostapd enabled

Update SoftAP event functions of Zephyr with hostapd enabled to support
hostapd split in glue layer.

Signed-off-by: Hui Bai <[email protected]>

Author: nxf58150

hostapd/hostapd_cli_zephyr.c

@@ -19,7 +19,7 @@
 #include "common/version.h"
 #include "common/ieee802_11_defs.h"
 #include "supp_main.h"
-#include "supp_events.h"
+#include "hapd_events.h"
 #include "ctrl_iface_zephyr.h"
 #include "hostapd_cli_zephyr.h"
 

src/ap/hostapd.c

@@ -58,7 +58,7 @@
 #include "wpa_auth_kay.h"
 #include "hw_features.h"
 #ifdef __ZEPHYR__
-#include <supp_events.h>
+#include <hapd_events.h>
 #endif /* __ZEPHYR__ */
 
 
@@ -2696,11 +2696,11 @@ static int hostapd_setup_interface_complete_sync(struct hostapd_iface *iface,
 	for (j = 0; j < iface->num_bss; j++)
 		hostapd_neighbor_set_own_report(iface->bss[j]);
 
-#if defined(__ZEPHYR__) && defined(CONFIG_WIFI_NM_HOSTAPD_AP)
-	supplicant_send_wifi_mgmt_ap_status(iface,
-					    NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
-					    WIFI_STATUS_AP_SUCCESS);
-#endif /* __ZEPHYR__ && CONFIG_WIFI_NM_HOSTAPD_AP */
+#ifdef __ZEPHYR__
+	hostapd_send_wifi_mgmt_ap_status(iface,
+					 NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+					 WIFI_STATUS_AP_SUCCESS);
+#endif /* __ZEPHYR__ */
 	if (iface->interfaces && iface->interfaces->count > 1)
 		ieee802_11_set_beacons(iface);
 

src/ap/hw_features.c

@@ -25,6 +25,7 @@
 #include "hw_features.h"
 
 #ifdef __ZEPHYR__
+#include <hapd_events.h>
 #include <supp_events.h>
 #endif /* __ZEPHYR__ */
 
@@ -1141,9 +1142,15 @@ hostapd_check_chans(struct hostapd_iface *iface)
 		err = hostapd_is_usable_chans(iface);
 		if (err <= 0) {
 #ifdef __ZEPHYR__
-			supplicant_send_wifi_mgmt_ap_status(iface->owner,
-				NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
-				WIFI_STATUS_AP_CHANNEL_NOT_ALLOWED);
+			if (IS_ENABLED(CONFIG_WIFI_NM_HOSTAPD_AP)) {
+				hostapd_send_wifi_mgmt_ap_status(iface,
+					NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+					WIFI_STATUS_AP_CHANNEL_NOT_ALLOWED);
+			} else {
+				supplicant_send_wifi_mgmt_ap_status(iface->owner,
+					NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+					WIFI_STATUS_AP_CHANNEL_NOT_ALLOWED);
+			}
 #endif /* __ZEPHYR__ */			
 			if (!err)
 				return HOSTAPD_CHAN_INVALID;
@@ -1166,9 +1173,15 @@ hostapd_check_chans(struct hostapd_iface *iface)
 	case HOSTAPD_CHAN_INVALID:
 	default:
 #ifdef __ZEPHYR__
-		supplicant_send_wifi_mgmt_ap_status(iface->owner,
-			NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
-			WIFI_STATUS_AP_CHANNEL_NOT_ALLOWED);
+		if (IS_ENABLED(CONFIG_WIFI_NM_HOSTAPD_AP)) {
+			hostapd_send_wifi_mgmt_ap_status(iface,
+				NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+				WIFI_STATUS_AP_CHANNEL_NOT_ALLOWED);
+		} else {
+			supplicant_send_wifi_mgmt_ap_status(iface->owner,
+				NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+				WIFI_STATUS_AP_CHANNEL_NOT_ALLOWED);
+		}
 #endif /* __ZEPHYR__ */
 		return HOSTAPD_CHAN_INVALID;
 	}
@@ -1318,9 +1331,15 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface)
 				       "Hardware does not support configured mode (%d) (hw_mode in hostapd.conf)",
 				       (int) iface->conf->hw_mode);
 #ifdef __ZEPHYR__
-			supplicant_send_wifi_mgmt_ap_status(iface->owner,
-				NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
-				WIFI_STATUS_AP_CHANNEL_NOT_SUPPORTED);
+			if (IS_ENABLED(CONFIG_WIFI_NM_HOSTAPD_AP)) {
+				hostapd_send_wifi_mgmt_ap_status(iface,
+					NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+					WIFI_STATUS_AP_CHANNEL_NOT_SUPPORTED);
+			} else {
+				supplicant_send_wifi_mgmt_ap_status(iface->owner,
+					NET_EVENT_WIFI_CMD_AP_ENABLE_RESULT,
+					WIFI_STATUS_AP_CHANNEL_NOT_SUPPORTED);
+			}
 #endif /* __ZEPHYR__ */
 			return -2;
 		}

src/ap/sta_info.c

@@ -41,6 +41,7 @@
 #include "wps_hostapd.h"
 
 #ifdef __ZEPHYR__
+#include <hapd_events.h>
 #include <supp_events.h>
 #endif /* __ZEPHYR__ */
 
@@ -1589,15 +1590,15 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd,
 	}
 
 #ifdef __ZEPHYR__
-#ifdef CONFIG_WIFI_NM_HOSTAPD_AP
-		supplicant_send_wifi_mgmt_ap_sta_event(hapd->iface,
-						       event,
-						       sta);
-#else
+	if (IS_ENABLED(CONFIG_WIFI_NM_HOSTAPD_AP)) {
+		hostapd_send_wifi_mgmt_ap_sta_event(hapd->iface,
+						    event,
+						    sta);
+	} else {
 		supplicant_send_wifi_mgmt_ap_sta_event(hapd->iface->owner,
                                                        event,
                                                        sta);
-#endif
+	}
 #endif /* __ZEPHYR__ */
 	if (hapd->sta_authorized_cb)
 		hapd->sta_authorized_cb(hapd->sta_authorized_cb_ctx,