RDKBWIFI-388: Add support for onboarding extender using WPS mechanism in RDK-B #1102
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,9 +21,11 @@ | |
| #include <stdbool.h> | ||
| #include "stdlib.h" | ||
| #include <sys/time.h> | ||
| #include <string.h> | ||
| #include "vap_svc.h" | ||
| #include "wifi_ctrl.h" | ||
| #include "wifi_util.h" | ||
| #include "wifi_hal.h" | ||
|
|
||
| bool vap_svc_is_private(unsigned int vap_index) | ||
| { | ||
|
|
@@ -92,7 +94,8 @@ int vap_svc_private_update(vap_svc_t *svc, unsigned int radio_index, wifi_vap_in | |
| unsigned int i; | ||
| wifi_vap_info_map_t *p_tgt_vap_map = NULL; | ||
| int ret; | ||
| wifi_platform_property_t *wifi_prop = get_wifi_hal_cap_prop(); | ||
|
|
||
| p_tgt_vap_map = (wifi_vap_info_map_t *) malloc( sizeof(wifi_vap_info_map_t) ); | ||
| if (p_tgt_vap_map == NULL) { | ||
| wifi_util_error_print(WIFI_CTRL,"%s:%d Failed to allocate memory.\n", __FUNCTION__,__LINE__); | ||
|
|
@@ -112,6 +115,38 @@ int vap_svc_private_update(vap_svc_t *svc, unsigned int radio_index, wifi_vap_in | |
| wifi_util_error_print(WIFI_CTRL, "%s:%d configure_lnf_psk_radius_from_hotspot failed\n", __FUNCTION__, __LINE__); | ||
|
bsomanath marked this conversation as resolved.
bsomanath marked this conversation as resolved.
|
||
| return -1; | ||
| } | ||
|
|
||
| #if defined(_PLATFORM_BANANAPI_R4_) && defined(EM_WPS_FH_HACK) | ||
| { | ||
| int band; | ||
| wifi_vap_info_t *vap = &p_tgt_vap_map->vap_array[0]; | ||
| unsigned int vap_index = map->vap_array[i].vap_index; | ||
|
|
||
| if (convert_radio_index_to_freq_band(wifi_prop, radio_index, &band) == RETURN_OK) { | ||
| /* | ||
| * Private SSID on 2.4/5 GHz with WPS: disable MLO/MLD and use WPA2-Personal + PSK. | ||
| * MLD left enabled while forcing WPA2 breaks hostapd / EasyMesh topology; WPS also | ||
| * expects classic WPA2-PSK on these bands. | ||
| */ | ||
| if (isVapPrivate(vap_index) && map->vap_array[i].u.bss_info.wps.enable && | ||
| band != WIFI_FREQUENCY_6_BAND) { | ||
| vap->u.bss_info.mld_info.common_info.mld_enable = 0; | ||
| vap->u.bss_info.mld_info.common_info.mld_id = 255; | ||
| vap->u.bss_info.mld_info.common_info.mld_link_id = 255; | ||
| memset(vap->u.bss_info.mld_info.common_info.mld_addr, 0, | ||
| sizeof(vap->u.bss_info.mld_info.common_info.mld_addr)); | ||
| vap->u.bss_info.mld_info.common_info.mld_apply = 1; | ||
|
|
||
| vap->u.bss_info.security.mode = wifi_security_mode_wpa2_personal; | ||
|
|
||
| vap->u.bss_info.security.encr = wifi_encryption_aes; | ||
| vap->u.bss_info.security.mfp = wifi_mfp_cfg_optional; | ||
| vap->u.bss_info.security.wpa3_transition_disable = false; | ||
| vap->u.bss_info.security.u.key.type = wifi_security_key_type_psk; | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| #if defined(_WNXL11BWL_PRODUCT_REQ_) | ||
| if (rdk_vap_info[i].exists == false && isVapPrivate(map->vap_array[i].vap_index)) { | ||
| wifi_util_error_print(WIFI_CTRL,"%s:%d VAP_EXISTS_FALSE for vap_index=%d, setting to TRUE \n",__FUNCTION__,__LINE__,map->vap_array[i].vap_index); | ||
|
|
@@ -132,6 +167,42 @@ int vap_svc_private_update(vap_svc_t *svc, unsigned int radio_index, wifi_vap_in | |
| #endif /* !defined(_PP203X_PRODUCT_REQ_) && !defined(_GREXT02ACTS_PRODUCT_REQ_) */ | ||
| p_tgt_vap_map->vap_array[0].u.bss_info.enabled &= rdk_vap_info[i].exists; | ||
|
|
||
| // If WPS is enabled on private VAP, copy mesh backhaul credentials into multi_ap_backhaul structure | ||
| if (map->vap_array[i].u.bss_info.wps.enable && isVapPrivate(map->vap_array[i].vap_index)) { | ||
| wifi_vap_name_t vap_names[MAX_NUM_RADIOS] = {0}; | ||
| unsigned int num_vaps = get_list_of_mesh_backhaul(wifi_prop, MAX_NUM_RADIOS, vap_names); | ||
| wifi_vap_info_t *backhaul_vap_info = NULL; | ||
|
|
||
| if (num_vaps > 0) { | ||
| int backhaul_vap_index = convert_vap_name_to_index(wifi_prop, vap_names[0]); | ||
| if (backhaul_vap_index >= 0) { | ||
| backhaul_vap_info = get_wifidb_vap_parameters(backhaul_vap_index); | ||
| } | ||
| } | ||
| if (backhaul_vap_info != NULL && | ||
| strlen((char *)backhaul_vap_info->u.bss_info.ssid) > 0 && | ||
| strlen((char *)backhaul_vap_info->u.bss_info.security.u.key.key) > 0 && | ||
| strcmp((char *)backhaul_vap_info->u.bss_info.security.u.key.key, INVALID_KEY) != 0) { | ||
| memset(p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_ssid, 0, | ||
| sizeof(p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_ssid)); | ||
| strncpy((char *)p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_ssid, | ||
| (char *)backhaul_vap_info->u.bss_info.ssid, | ||
| sizeof(p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_ssid) - 1); | ||
|
|
||
| memset(p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_network_key, 0, | ||
| sizeof(p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_network_key)); | ||
| strncpy((char *)p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_network_key, | ||
| (char *)backhaul_vap_info->u.bss_info.security.u.key.key, | ||
| sizeof(p_tgt_vap_map->vap_array[0].u.bss_info.multi_ap_backhaul_network_key) - 1); | ||
|
|
||
| wifi_util_info_print(WIFI_CTRL, "%s:%d Copied mesh backhaul credentials to multi_ap_backhaul for private VAP %d\n", | ||
| __FUNCTION__, __LINE__, map->vap_array[i].vap_index); | ||
| } else { | ||
| wifi_util_dbg_print(WIFI_CTRL, "%s:%d Mesh backhaul credentials not found or invalid, WPS enabled without backhaul for VAP %d\n", | ||
| __FUNCTION__, __LINE__, map->vap_array[i].vap_index); | ||
| } | ||
| } | ||
|
|
||
| ret = wifi_hal_createVAP(radio_index, p_tgt_vap_map); | ||
| if (ret != RETURN_OK) { | ||
| wifi_util_error_print(WIFI_CTRL,"%s: wifi vap create failure: radio_index:%d vap_index:%d\n",__FUNCTION__, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1379,6 +1379,49 @@ static int wps_event_callback(int apIndex, wifi_wps_ev_t event) | |
| return RETURN_OK; | ||
| } | ||
|
|
||
| #ifdef UWM_EXT_WPS_SUPPORT | ||
| /** | ||
| * @brief WPS STA event callback - called when WPS credentials are received for station interface | ||
| * @param vap_index VAP index where WPS occurred | ||
| * @param event WPS event (2 = WPS_EV_SUCCESS) | ||
| * @return None | ||
| */ | ||
| static void wps_sta_event_callback(unsigned int vap_index, unsigned int event) | ||
| { | ||
| wifi_ctrl_t *ctrl = get_wifictrl_obj(); | ||
| vap_svc_t *ext_svc = NULL; | ||
|
|
||
| wifi_util_info_print(WIFI_CTRL, "%s:%d: WPS STA event callback: vap_index=%d, event=%d\n", | ||
| __func__, __LINE__, vap_index, event); | ||
|
|
||
| /* Only handle WPS_EV_SUCCESS (value 2) */ | ||
| if (event != 2) { | ||
| wifi_util_dbg_print(WIFI_CTRL, "%s:%d: Ignoring non-success WPS event %d\n", | ||
| __func__, __LINE__, event); | ||
| return; | ||
|
bsomanath marked this conversation as resolved.
Comment on lines
+1394
to
+1401
|
||
| } | ||
|
bsomanath marked this conversation as resolved.
Comment on lines
+1386
to
+1402
|
||
|
|
||
| if (ctrl == NULL) { | ||
| wifi_util_error_print(WIFI_CTRL, "%s:%d: ctrl is NULL\n", | ||
| __func__, __LINE__); | ||
| return; | ||
| } | ||
|
|
||
| /* Find the mesh extender service for this VAP using the existing API */ | ||
| ext_svc = get_svc_by_vap_index(ctrl, vap_index); | ||
| if (ext_svc != NULL && ext_svc->type == vap_svc_type_mesh_ext) { | ||
| /* Found the service - call the WPS credentials handler */ | ||
| wifi_util_info_print(WIFI_CTRL, "%s:%d: Calling vap_svc_mesh_ext_wps_credentials_received " | ||
| "for vap_index %d\n", __func__, __LINE__, vap_index); | ||
| vap_svc_mesh_ext_wps_credentials_received(ext_svc, vap_index); | ||
| } else { | ||
|
bsomanath marked this conversation as resolved.
|
||
| wifi_util_dbg_print(WIFI_CTRL, "%s:%d: Could not find mesh extender service for vap_index %d " | ||
| "(ext_svc=%p, type=%d)\n", __func__, __LINE__, vap_index, ext_svc, | ||
| ext_svc ? ext_svc->type : -1); | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| int init_wifi_ctrl(wifi_ctrl_t *ctrl) | ||
| { | ||
| unsigned int i; | ||
|
|
@@ -1463,6 +1506,11 @@ int init_wifi_ctrl(wifi_ctrl_t *ctrl) | |
|
|
||
| wifi_wpsEvent_callback_register(wps_event_callback); | ||
|
|
||
| #ifdef UWM_EXT_WPS_SUPPORT | ||
| /* Register WPS STA event callback for mesh extender WPS support */ | ||
| wifi_wpsStaEvent_callback_register(wps_sta_event_callback); | ||
| #endif | ||
|
|
||
| ctrl->bus_events_subscribed = false; | ||
| ctrl->tunnel_events_subscribed = false; | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add to every
#endifcomment what if is it related to.