Merge branch 'rdkcentral:develop' into csi_raw_hex_data

Author: Aniket0606

configure.ac

@@ -135,6 +135,7 @@ AM_CONDITIONAL([HAL_IPC], [test x$HAL_IPC = xtrue])
 AM_CONDITIONAL([ONEWIFI_CAC_APP_SUPPORT], [test x$ONEWIFI_CAC_APP_SUPPORT = xtrue])
 AM_CONDITIONAL([ONEWIFI_STA_MGR_APP_SUPPORT], [test x$ONEWIFI_STA_MGR_APP_SUPPORT  = xtrue])
 AM_CONDITIONAL([ONEWIFI_DML_SUPPORT], [test x$ONEWIFI_DML_SUPPORT_MAKEFILE = xtrue])
+AM_CONDITIONAL([ONEWIFI_JSON_DML_SUPPORT], [test x$ONEWIFI_JSON_DML_SUPPORT = xtrue])
 AM_CONDITIONAL([ONEWIFI_DBUS_SUPPORT], [test x$ONEWIFI_DBUS_SUPPORT = xtrue])
 AM_CONDITIONAL([ONEWIFI_ANALYTICS_APP_SUPPORT], [test x$ONEWIFI_ANALYTICS_APP_SUPPORT = xtrue])
 AM_CONDITIONAL([ONEWIFI_LEVL_APP_SUPPORT], [test x$ONEWIFI_LEVL_APP_SUPPORT = xtrue])

include/webconfig_external_proto.h

@@ -21,7 +21,7 @@
 #define EXTERNAL_PROTO_H
 #include <webconfig_external_proto_ovsdb.h>
 #include <webconfig_external_proto_tr181.h>
-#if defined EASY_MESH_NODE || defined EASY_MESH_COLOCATED_NODE
+#if defined EASY_MESH_NODE
 #include <webconfig_external_proto_easymesh.h>
 #endif
 
@@ -33,7 +33,7 @@ typedef struct {
     union {
         webconfig_external_ovsdb_t ovsdb;
         webconfig_external_tr181_t tr181;
-#if defined EASY_MESH_NODE || defined EASY_MESH_COLOCATED_NODE
+#if defined EASY_MESH_NODE
         webconfig_external_easymesh_t easymesh;
 #endif
     }u;
@@ -57,7 +57,7 @@ webconfig_error_t webconfig_ovsdb_decode(webconfig_t *config,
 
 webconfig_error_t webconfig_convert_ifname_to_subdoc_type(const char *ifname, webconfig_subdoc_type_t *type);
 
-#if defined EASY_MESH_NODE || defined EASY_MESH_COLOCATED_NODE
+#if defined EASY_MESH_NODE
 // external api sets for easymesh agent, encode takes webconfig object, easymesh structure
 // and subdocument type as input, encoded string (4th argument) is output
 webconfig_error_t webconfig_easymesh_encode(webconfig_t *config,

include/wifi_base.h

@@ -87,6 +87,8 @@ extern "C" {
 #define MAX_NUM_MLD_LINKS 15
 #endif /*MAX_NUM_MLD_LINKS*/
 
+#define UNDEFINED_MLD_ID 255
+
 #ifdef CONFIG_NO_MLD_ONLY_PRIVATE
 #define MLD_UNIT_COUNT 8
 #else

lib/ovsdb/ovsdb_table.c

@@ -197,7 +197,7 @@ void* onewifi_ovsdb_table_select_where(const char *ovsdb_sock_path, ovsdb_table_
     if (!retval && records_array)
         free(records_array);
     json_decref(jrows);
-    return retval;
+    return records_array;
 }
 
 void* onewifi_ovsdb_table_select(const char *ovsdb_sock_path, ovsdb_table_t *table, char *column, char *value, int *count)

lib/qm/qm_conn.c

@@ -251,6 +251,7 @@ bool qm_conn_read_req(int fd, qm_request_t *req, char **topic, void **data)
         if (!*topic) goto alloc_err;
         ret = read(fd, *topic, size);
         if (ret != size) goto read_err;
+        (*topic)[size] = '\0';
     }
     total += size;
 
@@ -264,7 +265,7 @@ bool qm_conn_read_req(int fd, qm_request_t *req, char **topic, void **data)
     }
     total += size;
 
-    LOG(TRACE, "%s: t:%s ds:%d b:%d", __FUNCTION__, *topic, size, total);
+    LOG(TRACE, "%s: t:%s ds:%d b:%d", __FUNCTION__, *topic ? *topic : "", size, total);
 
     return true;
 

scripts/OneWiFi_Selfheal.sh

@@ -33,6 +33,9 @@ radio_6g_instance=3
 private_2g_instance=1
 private_5g_instance=2
 private_6g_instance=17
+lnf_2g_instance=7
+lnf_5g_instance=8
+lnf_6g_instance=20
 hal_indication="/tmp/hal_initialize_failed"
 prev_reboot_timestamp=0
 cur_reboot_timestamp=0
@@ -220,6 +223,50 @@ onewifi_conn_clients_count() {
     done
 }
 
+check_lnf_status()
+{
+    radio_status_2g=`dmcli eRT retv Device.WiFi.Radio.$radio_2g_instance.Enable`
+    if [ "$radio_status_2g" == "true" ]; then
+        if ! ovs-vsctl list-ifaces br106 | grep -q "wl0.4"; then
+            status_lnf_2g=`dmcli eRT retv Device.WiFi.AccessPoint.$lnf_2g_instance.Enable`
+            if [ "$status_lnf_2g" == "true" ]; then
+                ssid_lnf_2g=`wl -i wl0.4 bssid`
+                if [ "$ssid_lnf_2g" == "00:00:00:00:00:00" ]; then
+                    wl -i wl0.4 bss up
+                fi
+            fi
+        fi
+    fi
+
+    radio_status_5g=`dmcli eRT retv Device.WiFi.Radio.$radio_5g_instance.Enable`
+    if [ "$radio_status_5g" == "true" ]; then
+        if ! ovs-vsctl list-ifaces br106 | grep -q "wl1.4"; then
+            status_lnf_5g=`dmcli eRT retv Device.WiFi.AccessPoint.$lnf_5g_instance.Enable`
+            if [ "$status_lnf_5g" == "true" ]; then
+                ssid_lnf_5g=`wl -i wl1.4 bssid`
+                if [ "$ssid_lnf_5g" == "00:00:00:00:00:00" ]; then
+                    wl -i wl1.4 bss up
+                fi
+            fi
+        fi
+    fi
+
+    if [ "$MODEL_NUM" == "$CGM49" ] || [ "${MODEL_NUM}" = "CGM601TCOM" ] || [ "${MODEL_NUM}" = "CWA438TCOM" ] || [ "${MODEL_NUM}" = "SG417DBCT" ] || [ "${MODEL_NUM}" == "SCER11BEL" ] || [ "$MODEL_NUM" == "SCXF11BFL" ]; then
+        radio_status_6g=`dmcli eRT retv Device.WiFi.Radio.$radio_6g_instance.Enable`
+        if [ "$radio_status_6g" == "true" ]; then
+            if ! ovs-vsctl list-ifaces br106 | grep -q "wl2.4"; then
+                status_lnf_6g=`dmcli eRT retv Device.WiFi.AccessPoint.$lnf_6g_instance.Enable`
+                if [ "$status_lnf_6g" == "true" ]; then
+                    ssid_lnf_6g=`wl -i wl2.4 bssid`
+                    if [ "$ssid_lnf_6g" == "00:00:00:00:00:00" ]; then
+                        wl -i wl2.4 bss up
+                    fi
+                fi
+            fi
+        fi
+    fi
+}
+
 onewifi_mem_restart() {
     # Find the OneWifi process PID
     onewifi_pid=$(ps | grep "/usr/bin/OneWifi -subsys eRT\." | grep -v grep | awk '{print $1}')
@@ -327,7 +374,7 @@ do
                 eco_mode_5g=`dmcli eRT getv Device.WiFi.Radio.$radio_5g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:`
                 eco_mode_6g="false"
             elif [ "$MODEL_NUM" == "SCER11BEL" ]  || [ "$MODEL_NUM" == "SCXF11BFL" ]; then
-                eco_mode_2g=`dmcli eRT getv Device.WiFi.Radio.$radio_2g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:` 
+                eco_mode_2g=`dmcli eRT getv Device.WiFi.Radio.$radio_2g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:`
                 eco_mode_5g=`dmcli eRT getv Device.WiFi.Radio.$radio_5g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:`
                 eco_mode_6g=`dmcli eRT getv Device.WiFi.Radio.$radio_6g_instance.X_RDK_EcoPowerDown | grep "value:" | cut -f2- -d:| cut -f2- -d:`
             else
@@ -482,6 +529,9 @@ do
 
     # Check if OneWifi process RSS memory usage exceeds threshold, if does restart OneWifi.
     onewifi_mem_restart
+    if [ "$MODEL_NUM" != "SR213" ] && [ "$MODEL_NUM" != "GR-EXT02A-CTS" ] && [ "$MODEL_NUM" != "SR203" ] && [ "$MODEL_NUM" != "$TG4" ]; then
+        check_lnf_status
+    fi
     sleep 5m
     ((check_count++))
 done

scripts/mesh_setip.sh

@@ -317,9 +317,6 @@ if [ "$MODEL_NUM" == "$X50" ] || [ "$MODEL_NUM" == "$CGM43" ] || [ "$MODEL_NUM"
                 if [ "$wifiDynamicProfile" == "1" ]; then   # Only create brlan115 onboarding bridge with interface wl0.4 if wifiDynamicProfile is already set to 1 (mesh onboarding)
                     sysevent set multinet-up 19             # Trigger to initialise brlan115 onboarding bridge
                 fi
-            else
-                sysevent set multinet-down 18           # Trigger to remove br412 bridge
-                sysevent set multinet-down 19           # Trigger to remove brlan115 onboarding bridge
             fi
         fi
     else

source/apps/analytics/wifi_analytics.c

@@ -101,7 +101,7 @@ void device_statistics_info(analytics_data_t *data)
     char         temp_str[128];
     unsigned int radio_index = 0;
     radio_data_t radio_stats;
-    char   client_mac[32], sta_stats_str[256], tm_str[64];
+    char   client_mac[32], sta_stats_str[256], tm_str[128];
     analytics_sta_info_t    *sta_info;
     wifi_associated_dev3_t  *dev_stats;
     sta_data_t *sta_data;
@@ -872,7 +872,8 @@ int command_event_analytics(wifi_app_t *apps, wifi_event_subtype_t sub_type, voi
         break;
 
     case wifi_event_type_rsn_override_rfc:
-        wifi_util_info_print(WIFI_APPS, "%s:%d: Change in WPA3-Personal-Compatibility RFC %d \r\n", __func__, __LINE__, (bool *)arg);
+        wifi_util_info_print(WIFI_APPS, "%s:%d: Change in WPA3-Personal-Compatibility RFC %d\r\n",
+            __func__, __LINE__, *(int *)arg);
         break;
 
     default:

source/apps/levl/wifi_levl.c

@@ -114,11 +114,11 @@ static int schedule_from_pending_map(wifi_app_t *wifi_app)
             memcpy(mac_addr, levl_sc_data->mac_addr, sizeof(mac_address_t));
             levl_sc_data = hash_map_remove(p_map, mac_str);
             if (levl_sc_data != NULL) {
+                //schedule for sounding
+                schedule_mac_for_sounding(ap_index, mac_addr, levl_sc_data->duration, levl_sc_data->interval);
                 free(levl_sc_data);
             }
 
-            //schedule for sounding
-            schedule_mac_for_sounding(ap_index, mac_addr, levl_sc_data->duration, levl_sc_data->interval);
             break;
         }
     }
@@ -1831,7 +1831,11 @@ int levl_init(wifi_app_t *app, unsigned int create_flag)
                                levl_event_exec_timeout, app, (APPS_FRAME_EXEC_TIMEOUT_PERIOD * 1000), 0, FALSE);
 
     //Create FIFO for the csi.
-    mkfifo(CSI_LEVL_PIPE, 0777);
+    if (mkfifo(CSI_LEVL_PIPE, 0777) != 0 && errno != EEXIST) {
+        wifi_util_error_print(WIFI_APPS, "%s:%d Failed to create FIFO %s, errno:%d\n",
+            __func__, __LINE__, CSI_LEVL_PIPE, errno);
+        return RETURN_ERR;
+    }
     app->data.u.levl.csi_fd = -1;
 
     rc = get_bus_descriptor()->bus_open_fn(&app->handle, component_name);

source/apps/motion/wifi_motion.c

@@ -377,7 +377,7 @@ void csi_set_client_mac(char *r_mac_list, int csi_session_number)
         csi->no_of_mac = 0;
     }
 
-    strncpy(mac_list, r_mac_list, MAX_CSI_CLIENTMACLIST_STR);
+    snprintf(mac_list, MAX_CSI_CLIENTMACLIST_STR, "%s", r_mac_list);
     rest = mac_list;
     if (strlen(mac_list) > 0)  {
         gettimeofday(&t_now, NULL);
@@ -817,7 +817,7 @@ bus_error_t csi_set_handler(char *event_name, raw_data_t *p_data, bus_user_data_
                     str_to_mac_bytes(str, l_client_list[itr]);
                     str = strtok_r(NULL, ",", &cptr);
                     itr++;
-                    if (itr > MAX_NUM_CSI_CLIENTS) {
+                    if (itr >= MAX_NUM_CSI_CLIENTS) {
                         wifi_util_error_print(WIFI_APPS,"%s:%d client list is big %d\n", __func__, __LINE__, itr);
                         if (str_dup) {
                             free(str_dup);