Rebase

CHANGELOG.md

@@ -4,9 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.2.1](https://github.com/rdkcentral/tr69hostif/compare/1.2.0...1.2.1)
+
+- RDK-58526 : Default IPControl RFC for EU partners [`#203`](https://github.com/rdkcentral/tr69hostif/pull/203)
+- RDK-57868 : Default IPControl RFC for EU partners [`#200`](https://github.com/rdkcentral/tr69hostif/pull/200)
+- RDK-57867 : Default the IUI layer separation RFC globally for EntOS [`#193`](https://github.com/rdkcentral/tr69hostif/pull/193)
+- Merge tag '1.2.0' into develop [`9b98df0`](https://github.com/rdkcentral/tr69hostif/commit/9b98df0330008138a47b6f18a4314df6f0a7adc1)
+
 #### [1.2.0](https://github.com/rdkcentral/tr69hostif/compare/1.1.9...1.2.0)
 
+> 27 June 2025
+
 - RDK-57649 [RDKE] - TR69HostIf Performance Monitoring and Optimized Logging [`#185`](https://github.com/rdkcentral/tr69hostif/pull/185)
+- 1.2.0 release changelog updates [`0e68c7e`](https://github.com/rdkcentral/tr69hostif/commit/0e68c7e79ca5b155a93fa1ac6a11db218486504d)
 - Merge tag '1.1.9' into develop [`083a042`](https://github.com/rdkcentral/tr69hostif/commit/083a042ce2eb4bcfc24bf95f24e8f04e897fe7c4)
 
 #### [1.1.9](https://github.com/rdkcentral/tr69hostif/compare/1.1.8...1.1.9)

src/hostif/handlers/Makefile.am

@@ -94,7 +94,7 @@ if WITH_SNMP_ADAPTER
 AM_CXXFLAGS += -DSNMP_ADAPTER_ENABLED -I$(top_srcdir)/src/hostif/snmpAdapter
 endif
 
-AM_LDFLAGS = $(GLIB_LIBS) $(G_THREAD_LIBS) $(SOUP_LIBS) $(PROCPS_LIBS) -lIARMBus -lyajl -lds -ldshalcli -ldbus-1
+AM_LDFLAGS = $(GLIB_LIBS) $(G_THREAD_LIBS) $(SOUP_LIBS) $(PROCPS_LIBS) -lIARMBus -lyajl -lds -ldshalcli -ldbus-1 -lsecure_wrapper
 if WIFI_CLIENT_ROAMING
 AM_CXXFLAGS += -DWIFI_CLIENT_ROAMING
 endif

src/hostif/handlers/include/hostIf_XREClient_ReqHandler.h

@@ -1,6 +1,6 @@
 /*
  * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016 RDK Management
  *
@@ -50,6 +50,7 @@
 #include "hostIf_msgHandler.h"
 #include "hostIf_updateHandler.h"
 #include "hostIf_main.h"
+#include "secure_wrapper.h"
 
 /**
  * @brief This class provides the interface for getting XRE request handler information.
@@ -78,6 +79,8 @@
     static msgHandler* getInstance();
 };
 
+int set_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stMsgData);
+int get_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stMsgData);
 #endif /* HOSTIF_XRECLIENT_REQHANDLER_H_ */
 /* End of HOSTIF_XRECLIENT_REQHANDLER_H_ doxygen group */
 /**

src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp

@@ -1,6 +1,6 @@
 /*
  * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016 RDK Management
  *
@@ -45,6 +45,8 @@
 GMutex XREClientReqHandler::m_mutex;
 int XREClientReqHandler::numOfEntries = 0;
 
+#define XCONF_CHECKNOW_SCRIPT_CMD "backgroundrun /usr/bin/rdkvfwupgrader 0 3 >> /opt/logs/swupdate.log"
+
 msgHandler* XREClientReqHandler::getInstance()
 {
 
@@ -199,6 +201,10 @@
     {
         ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreEnable(stMsgData);
     }
+    else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow") == 0)
+    {
+        ret = get_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(stMsgData);
+    }
     else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreStatus") == 0)
     {
         ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreStatus(stMsgData);
@@ -469,6 +475,48 @@
     mUpdateCallback = cb;
 }
 
+int set_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stMsgData)
+{
+    FILE *file = fopen("/tmp/xconfchecknow_val", "w");
+    if (file == NULL) {
+        RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF, "[%s:%s:%d]Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow: Error opening file for write.\n",__FILE__,__FUNCTION__,__LINE__);
+        return NOK;
+    }
+    fprintf(file, "%s", stMsgData->paramValue);
+    fclose(file);
+    if(0 == strncasecmp("TRUE",stMsgData->paramValue ,strlen("TRUE")) || 0 == strncasecmp("CANARY",stMsgData->paramValue ,strlen("CANARY")))
+    {
+        /*On setting xconfCheckNow,results the device to connect with the XCONF server
+            for the purpose of firmware and configuration checks.*/
+        if(-1 == v_secure_system(XCONF_CHECKNOW_SCRIPT_CMD))
+        {
+            RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF, "[%s:%s:%d]Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow: Running checkNow script failed.\n",__FILE__,__FUNCTION__,__LINE__);
+
+            return NOK;
+        }
+
+        RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF, "[%s:%s:%d]Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow: CheckNow Running... \n",__FILE__,__FUNCTION__,__LINE__);
+    }
+    else
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF, "[%s:%s:%d]Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow: \"%s\" Invalid Input. Valid Input is \"TRUE\" \n",__FILE__,__FUNCTION__,__LINE__,stMsgData->paramValue);
+        return NOK;	    
+    }
+    return OK;
+}
+
+int get_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stMsgData)
+{
+    FILE *file = fopen("/tmp/xconfchecknow_val", "r");
+    if (file == NULL) {
+        RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF, "[%s:%s:%d]Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow: Error opening file for read.\n",__FILE__,__FUNCTION__,__LINE__);
+        return NOK;
+    }
+    fscanf(file, "%9s", stMsgData->paramValue);
+    fclose(file);
+    return OK;
+}
+
 void XREClientReqHandler::checkForUpdates()
 {
     HOSTIF_MsgData_t msgData;

src/hostif/parodusClient/waldb/data-model/data-model-generic.xml

@@ -224,13 +224,13 @@
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.IPControl." access="readOnly" minEntries="1" maxEntries="1" />
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.IPControl.Service." access="readOnly" minEntries="1" maxEntries="1" />
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.IPControl.Service.Discovery." access="readOnly" minEntries="1" maxEntries="1" >
-      <parameter base="Enable" access="readWrite" notification="0" maxNotification="2" >
+      <parameter base="Enable" bsUpdate="allUpdate" access="readWrite" notification="0" maxNotification="2" >
         <syntax> <boolean/> </syntax>
       </parameter>
     </object>
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.IPControl.Subsystem." access="readOnly" minEntries="1" maxEntries="1" />
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.IPControl.Subsystem.RICS." access="readOnly" minEntries="1" maxEntries="1" >
-      <parameter base="Enable" access="readWrite" notification="0" maxNotification="2" >
+      <parameter base="Enable" bsUpdate="allUpdate" access="readWrite" notification="0" maxNotification="2" >
         <syntax> <boolean/> </syntax>
       </parameter>
     </object>
@@ -511,6 +511,14 @@
         </syntax>
       </parameter>
     </object>
+     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.apps." access="readOnly" minEntries="0" maxEntries="1" >
+      <parameter base="watchdogmode" access="readWrite" notification="0" maxNotification="2" >
+        <syntax>
+           <boolean/>
+             <default type="factory" value=""/>
+        </syntax>
+      </parameter>
+     </object>
      <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.ForwardSSH." access="readOnly" minEntries="0" maxEntries="unbounded" >
        <parameter base="Enable" access="readWrite" notification="0" maxNotification="2" >
          <syntax>
@@ -3554,6 +3562,18 @@
         </syntax>
       </parameter>
     </object>
+    <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Canary." access="readOnly" minEntries="1" maxEntries="1" >
+      <parameter base="wakeUpStart" access="readWrite" notification="0" maxNotification="2" >
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+      <parameter base="wakeUpEnd" access="readWrite" notification="0" maxNotification="2" >
+        <syntax>
+          <int/>
+        </syntax>
+      </parameter>
+    </object>
     <object base="Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.ThunderTestClient." access="readOnly" minEntries="1" maxEntries="1" >
       <parameter base="ServerURL" access="readWrite" notification="0" maxNotification="2" >
         <syntax>

src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp

@@ -1,6 +1,6 @@
 /*
  * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2016-2019 RDK Management
  *
@@ -3904,6 +3904,14 @@
         ret = set_Device_DeviceInfo_X_RDKCENTRAL_COM_RDKRemoteDebuggerWebCfgData(stMsgData);
     }
 #endif
+    else if (strcasecmp(stMsgData->paramName,CANARY_START_TIME) == 0)
+    {
+	ret = set_Device_DeviceInfo_X_RDKCENTRAL_COM_Canary_wakeUpStart(stMsgData);
+    }
+    else if (strcasecmp(stMsgData->paramName,CANARY_END_TIME) == 0)
+    {
+        ret = set_Device_DeviceInfo_X_RDKCENTRAL_COM_Canary_wakeUpEnd(stMsgData);
+    }
     else if (strcasecmp(stMsgData->paramName,RDK_REBOOTSTOP_ENABLE) == 0)
     {
         ret = set_Device_DeviceInfo_X_RDKCENTRAL_COM_RebootStopEnable(stMsgData);
@@ -4227,6 +4235,32 @@
 }
 #endif
 
+int hostIf_DeviceInfo::set_Device_DeviceInfo_X_RDKCENTRAL_COM_Canary_wakeUpStart (HOSTIF_MsgData_t *stMsgData)
+{
+    int startTime = 0;
+    int retVal = NOK;
+    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s] Entering... \n",__FUNCTION__);
+    startTime = atoi(stMsgData->paramValue);
+    RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s] Start Time Value is %d \n",__FUNCTION__, startTime);
+    retVal = OK;
+
+    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s] Exiting... \n",__FUNCTION__);
+    return retVal;
+}
+
+int hostIf_DeviceInfo::set_Device_DeviceInfo_X_RDKCENTRAL_COM_Canary_wakeUpEnd (HOSTIF_MsgData_t *stMsgData)
+{
+    int endTime = 0;
+    int retVal = NOK;
+    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s] Entering... \n",__FUNCTION__);
+    endTime = atoi(stMsgData->paramValue);
+    RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s] End Time Value is %d \n",__FUNCTION__, endTime);
+    retVal = OK;
+
+    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s] Exiting... \n",__FUNCTION__);
+    return retVal;
+}
+
 int hostIf_DeviceInfo::set_Device_DeviceInfo_X_RDKCENTRAL_COM_RebootStopEnable(HOSTIF_MsgData_t *stMsgData)
 {
     int ret = NOK;

src/hostif/profiles/DeviceInfo/Device_DeviceInfo.h

@@ -192,6 +192,10 @@
 #define RDK_REBOOTSTOP_ENABLE                      "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.RebootStop.Enable"
 
 #define APPARMOR_BLOCKLIST_PROCESS                      "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.NonRootSupport.ApparmorBlocklist"
+/* Profile: X_RDKCENTRAL-COM_RFC.Canary */
+#define CANARY_START_TIME                               "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Canary.wakeUpStart"
+#define CANARY_END_TIME                                 "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Canary.wakeUpEnd"
+
 /**
  * @brief This class provides the interface for getting device information.
  * @ingroup TR69_HOSTIF_DEVICEINFO_CLASSES
@@ -1228,6 +1232,23 @@ class hostIf_DeviceInfo {
     int set_Device_DeviceInfo_X_RDKCENTRAL_COM_RDKRemoteDebuggerIssueType(HOSTIF_MsgData_t *);
     int set_Device_DeviceInfo_X_RDKCENTRAL_COM_RDKRemoteDebuggerWebCfgData(HOSTIF_MsgData_t *);
 #endif
+
+    /*
+      * @brief set_Device_DeviceInfo_X_RDKCENTRAL_COM_CanaryStartTime, set_Device_DeviceInfo_X_RDKCENTRAL_COM_CanaryEndTime, set_Device_DeviceInfo_X_RDKCENTRAL_COM_CanaryExtendTime
+      *
+      * This method is to get the Issuetype from QA.
+      * with following TR-069 definition:
+      *   Parameter Name: Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Canary.wakeUpStart,
+      *                   Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.Canary.wakeUpEnd,
+      *   Data type: String - Arguments Start/End Time
+      *
+      * @retval OK if it is successful.
+      * @retval NOK if operation fails.
+      */
+
+    int set_Device_DeviceInfo_X_RDKCENTRAL_COM_Canary_wakeUpStart(HOSTIF_MsgData_t *);
+    int set_Device_DeviceInfo_X_RDKCENTRAL_COM_Canary_wakeUpEnd(HOSTIF_MsgData_t *);
+
     /*
       * @brief set_Device_DeviceInfo_X_RDKCENTRAL_COM_RebootStopEnable
       *