RDKB-58244: SMApp update based on status of the Mesh.Enable and HCM

Reason for change: SMApp continues to run when Mesh is disabled.
Test Procedure: 1. Disable getv Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable and Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MeshWifiOptimization.Mode
                2. Check if SM_APP is still running.

Risks: Low
Priority: P2

Signed-off-by: Maksym Holovatyi <[email protected]>

Author: HollowMax

include/wifi_events.h

@@ -183,6 +183,7 @@ typedef enum {
     wifi_event_monitor_get_radio_temperature,
     wifi_event_monitor_set_subscribe,
     wifi_event_monitor_action_frame,
+    wifi_event_type_sm_app_enable,
     wifi_event_monitor_max,
 
     // Tunnel

source/apps/sm/wifi_sm.c

@@ -43,6 +43,8 @@ typedef struct {
     unsigned int    req_stats_vap_mask;
 } client_assoc_stats_t;
 
+static int sm_stats_to_monitor_set(wifi_app_t *app, bool enable);
+
 client_assoc_stats_t client_assoc_stats[MAX_NUM_RADIOS];
 
 int sm_survey_type_conversion(wifi_neighborScanMode_t *halw_scan_type, survey_type_t *app_stat_type, unsigned int conv_type)
@@ -556,7 +558,7 @@ int handle_sm_command_event(wifi_app_t *app, wifi_event_t *event)
     wifi_mgr_t *g_wifi_mgr = get_wifimgr_obj();
     stats_config_t *cur_stats_cfg = NULL;
     hash_map_t *cur_app_stats_cfg_map = app->data.u.sm_data.sm_stats_config_map;
-    bool off_scan_rfc = g_wifi_mgr->rfc_dml_parameters.wifi_offchannelscan_sm_rfc;
+    bool *sm_app_enable, off_scan_rfc = g_wifi_mgr->rfc_dml_parameters.wifi_offchannelscan_sm_rfc;
 
     wifi_util_dbg_print(WIFI_SM, "inside %s:%d off_scan_rfc:%d\n",__func__, __LINE__,off_scan_rfc);
     if (event->sub_type == wifi_event_type_wifi_offchannelscan_sm_rfc )
@@ -584,6 +586,18 @@ int handle_sm_command_event(wifi_app_t *app, wifi_event_t *event)
            }
        }
    }
+   else if (event->sub_type == wifi_event_type_sm_app_enable)
+   {
+       sm_app_enable = event->u.core_data.msg;
+       if (sm_app_enable)
+       {
+           sm_stats_to_monitor_set(app, *sm_app_enable);
+       }
+       else
+       {
+           wifi_util_error_print(WIFI_SM, "inside %s:%d sub_type: wifi_event_type_sm_app_enable sm_app_enable=NULL\n",__func__, __LINE__);
+       }
+   }
    return RETURN_OK;
 }
 
@@ -771,7 +785,7 @@ int sm_event(wifi_app_t *app, wifi_event_t *event)
             monitor_event_sm(app, event);
         break;
         case wifi_event_type_command:
-            handle_sm_command_event(app,event);
+            handle_sm_command_event(app, event);
         break;
         default:
         break;

source/core/wifi_ctrl.h

@@ -90,6 +90,7 @@ extern "C" {
 
 #define WIFI_WEBCONFIG_KICK_MAC            "Device.WiFi.KickAssocDevices"
 #define BUS_WIFI_WPS_PIN_START             "Device.WiFi.WPS.Start"
+#define BUS_SM_APP_ENABLE                  "Device.X_RDK_MeshAgent.SM_APP.Enable"
 
 #define ETH_BH_STATUS                      "Device.X_RDK_MeshAgent.EthernetBhaulUplink.Status"
 
@@ -242,6 +243,7 @@ typedef struct wifi_ctrl {
     bool                frame_802_11_injector_subscribed;
     bool                factory_reset;
     bool                marker_list_config_subscribed;
+    bool                sm_app_enable_subscribed;
     bool                eth_bh_status_subscribed;
     wifiapi_t           wifiapi;
     wifi_rfc_dml_parameters_t    rfc_params;

source/core/wifi_ctrl_queue_handlers.c

@@ -3183,6 +3183,7 @@ void handle_command_event(wifi_ctrl_t *ctrl, void *data, unsigned int len,
     case wifi_event_type_start_inst_msmt:
     case wifi_event_type_stop_inst_msmt:
     case wifi_event_type_xfinity_rrm:
+    case wifi_event_type_sm_app_enable:
         // not handle here
         break;
     default:

source/core/wifi_ctrl_rbus_handlers.c

@@ -1309,6 +1309,23 @@ static void frame_802_11_injector_Handler(char *event_name, raw_data_t *p_data)
     }
 }
 
+static void sm_app_enable_Handler(char *event_name, raw_data_t *p_data)
+{
+    bool sm_app_enable;
+
+    wifi_util_dbg_print(WIFI_CTRL, "%s:%d Recvd Event\n", __func__, __LINE__);
+
+    if((strcmp(event_name, BUS_SM_APP_ENABLE) != 0) || (p_data->data_type != bus_data_type_boolean)) {
+        wifi_util_error_print(WIFI_CTRL,"%s:%d Invalid event received,%s:%x\n", __func__, __LINE__, event_name, p_data->data_type);
+        return;
+    }
+
+    sm_app_enable = p_data->raw_data.b;
+
+    push_event_to_ctrl_queue(&sm_app_enable, sizeof(sm_app_enable), wifi_event_type_command,
+        wifi_event_type_sm_app_enable, NULL);
+}
+
 static void wps_test_event_receive_handler(char *event_name, raw_data_t *p_data)
 {
     uint32_t vap_index = 0;
@@ -1601,6 +1618,19 @@ void bus_subscribe_events(wifi_ctrl_t *ctrl)
         }
     }
 
+    if (ctrl->sm_app_enable_subscribed == false) {
+        if (bus_desc->bus_event_subs_fn(&ctrl->handle, BUS_SM_APP_ENABLE, sm_app_enable_Handler, NULL,
+                0) != bus_error_success) {
+            // wifi_util_dbg_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe failed\n",
+            // __FUNCTION__,
+            //     __LINE__, BUS_SM_APP_ENABLE);
+        } else {
+            ctrl->sm_app_enable_subscribed = true;
+            wifi_util_info_print(WIFI_CTRL, "%s:%d bus: bus event:%s subscribe success\n",
+                __FUNCTION__, __LINE__, BUS_SM_APP_ENABLE);
+        }
+    }
+
 #if defined(RDKB_EXTENDER_ENABLED)
     if (ctrl->eth_bh_status_subscribed == false) {
         if (bus_desc->bus_event_subs_fn(&ctrl->handle, ETH_BH_STATUS, eth_bh_status_handler, NULL,

source/core/wifi_events.c

@@ -147,6 +147,7 @@ const char *wifi_event_subtype_to_string(wifi_event_subtype_t type)
         DOC2S(wifi_event_type_xfinity_rrm)
         DOC2S(wifi_event_type_collect_stats)
         DOC2S(wifi_event_type_send_action_frame)
+        DOC2S(wifi_event_type_sm_app_enable)
         DOC2S(wifi_event_command_max)
         DOC2S(wifi_event_monitor_diagnostics)
         DOC2S(wifi_event_monitor_connect)