diff --git a/conf/mgrlist.conf b/conf/mgrlist.conf index 2513af850..bd585c5dc 100644 --- a/conf/mgrlist.conf +++ b/conf/mgrlist.conf @@ -2,7 +2,7 @@ Device.DeviceInfo deviceMgr Device.Services.STBService dsMgr Device.Services.StorageService storageSrvcMgr Device.MoCA mocaMgr -Device.X_COMCAST-COM_Xcalibur xreMgr +Device.X_COMCAST-COM_Xcalibur.Client xreMgr Device.Ethernet ethernetMgr Device.IP ipMgr Device.Time timeMgr diff --git a/conf/tr69hostIf.conf b/conf/tr69hostIf.conf index b550e758e..541399e8d 100644 --- a/conf/tr69hostIf.conf +++ b/conf/tr69hostIf.conf @@ -3,8 +3,7 @@ Device.DeviceInfo=deviceMgr Device.Services.STBService=dsMgr Device.Services.StorageService=storageSrvcMgr Device.MoCA=mocaMgr -Device.X_COMCAST-COM_Xcalibur.Client.XRE=xreMgr -Device.X_COMCAST-COM_Xcalibur.TRM=xreMgr +Device.X_COMCAST-COM_Xcalibur.Client=xreMgr Device.Ethernet=ethernetMgr Device.IP=ipMgr Device.Time=timeMgr diff --git a/configure.ac b/configure.ac index 6b4d1d47b..a749f59d1 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,6 @@ AC_CONFIG_HEADERS([cfg/config.h]) LT_INIT -XREMGR_FLAGS=" " MOCAMGR_FLAGS=" " SUBDIRS_MOCA=" " MOCA2_FLAG=" " @@ -58,21 +57,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])], [AM_DEFAULT_VERBOSITY=1 AC_SUBST(AM_DEFAULT_VERBOSITY)]) -AC_ARG_ENABLE([xre], - [ AS_HELP_STRING([--enable-xre], [enable xre profile (default is no)])], - [ - case "${enableval}" in - yes) XREMGR_FLAGS="-DUSE_XRESRC" - xre=true;; - no) AC_MSG_ERROR([xre profile is disabled]) - xre=false;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-xre]) - xre=false;; - esac - ], - [xre=false; echo "xre profile is disabled"]) -AM_CONDITIONAL([XRELIB_FLAG], [test "x$xre" = xtrue]) - # This adds the option of compiling with/without using the profile source code AC_ARG_ENABLE([moca], [AS_HELP_STRING([--enable-moca],[enable moca profile (default is yes)])], @@ -424,7 +408,6 @@ AM_CONDITIONAL([ENABLE_RDK_STMGR_V2], [test "x$HAVE_RDK_STMGR_V2_H" = "xyes" -a AC_FUNC_MALLOC AC_SUBST(PROFILE_SRC) -AC_SUBST(XREMGR_FLAGS) AC_SUBST(MOCAMGR_FLAGS) AC_SUBST(SUBDIRS_MOCA) AC_SUBST(SUBDIRS_STORAGESERVICE) diff --git a/docs/api/dml_parameter_list.md b/docs/api/dml_parameter_list.md index a4edbcdab..290c5f4e5 100755 --- a/docs/api/dml_parameter_list.md +++ b/docs/api/dml_parameter_list.md @@ -4,9 +4,9 @@ | Access | Count | Test Action | |--------|-------|-------------| -| readOnly | 356 | GET only - assert non-empty or expected value | -| readWrite | 548 | GET + SET - verify set/get round-trip | -| **Total** | **904** | | +| readOnly | 254 | GET only - assert non-empty or expected value | +| readWrite | 493 | GET + SET - verify set/get round-trip | +| **Total** | **747** | | --- @@ -753,64 +753,9 @@ | 739 | `Device.Time.NTPServer5Directive` | readWrite | string | Chrony directive used for the numbered NTP server slot. | | 740 | `Device.Time.Status` | readWrite | string | Current status of the system time service. | | 741 | `Device.Time.X_RDK_CurrentUTCTime` | readOnly | string | Current UTC time reported by the device. | -| 742 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssDeviceId` | readOnly | string | Security system device identifier. | -| 743 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssDeviceReg` | readOnly | dateTime | Security system device registration time. | -| 744 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssErrorCnt` | readOnly | unsignedInt | Security system error count. | -| 745 | `Device.X_COMCAST-COM_Xcalibur.Client.SecuritySystem.ssRegTs` | readOnly | boolean | Indicates whether a security system registration timestamp is available. | -| 746 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreAppId` | readOnly | string | Application identifier for this XRE connection entry. | -| 747 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnEstTs` | readOnly | string | Connection establishment timestamp for this XRE connection entry. | -| 748 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnIfName` | readOnly | string | Interface name used by this XRE connection entry. | -| 749 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnRetryAttempts` | readOnly | unsignedInt | Retry attempts recorded for this XRE connection entry. | -| 750 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnStatus` | readOnly | string | Current status of this XRE connection entry. | -| 751 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnURL` | readOnly | string | Connection URL used by this XRE connection entry. | -| 752 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreAvgCmdProcTime` | readOnly | int | Command processing time statistic reported by XRE. | -| 753 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreChannelMapId` | readOnly | string | Channel map identifier currently used by the XRE client. | -| 754 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreCommandCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 755 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreControllerId` | readOnly | string | Controller identifier reported by the XRE client. | -| 756 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable` | readWrite | boolean | Enables or disables the XRE client. | -| 757 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreErrorCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 758 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreFlushLocalCache` | readWrite | boolean | Triggers an XRE local cache flush when set. | -| 759 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreGatewaySTBMAC` | readOnly | string | Gateway STB MAC address reported by the XRE client. | -| 760 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreGetTWPDiags` | readOnly | string | Diagnostic payload returned by XRE TWP diagnostics. | -| 761 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLastURLAccessed` | readOnly | string | Last URL accessed by the XRE client. | -| 762 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLastVideoUrl` | readOnly | string | Last video URL accessed by the XRE client. | -| 763 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLogLevel` | readWrite | string | Logging level used by the XRE client. | -| 764 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreMaxCmdProcTime` | readOnly | int | Command processing time statistic reported by XRE. | -| 765 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreMinCmdProcTime` | readOnly | int | Command processing time statistic reported by XRE. | -| 766 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xrePlantId` | readOnly | string | Plant identifier reported by the XRE client. | -| 767 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreReceiverId` | readOnly | string | Receiver identifier reported by the XRE client. | -| 768 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSession` | readWrite | boolean | Triggers XRE session refresh behavior. | -| 769 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSessionWithRR` | readWrite | int | Controls refresh-with-RR behavior for the XRE session. | -| 770 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionId` | readOnly | string | Active XRE session identifier reported by the client. | -| 771 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionLastModTs` | readOnly | string | Timestamp of the last XRE session update. | -| 772 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionUptime` | readOnly | string | Uptime of the current XRE session. | -| 773 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreStatus` | readOnly | string | Configuration or status value for the XRE client. | -| 774 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotAnimCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 775 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotAppCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 776 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotFlashCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 777 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotFontCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 778 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotHtmlTxtCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 779 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotImgCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 780 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotNineSliceImgCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 781 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotRectCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 782 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotSoundCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 783 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotStyleshtCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 784 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotTxtCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 785 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotTxtIpCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 786 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotVideoCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 787 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotViewCnt` | readOnly | unsignedInt | Count metric reported by the XRE client. | -| 788 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreVersion` | readOnly | string | Version string reported by the XRE client. | -| 789 | `Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreVodId` | readOnly | string | VOD identifier reported by the XRE client. | -| 790 | `Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow` | readWrite | string | Triggers an immediate Xconf check for the Xcalibur client. | -| 791 | `Device.X_COMCAST-COM_Xcalibur.DevApp.devAppNumAps` | readOnly | unsignedInt | Number of DevApp application entries reported by the platform. | -| 792 | `Device.X_COMCAST-COM_Xcalibur.DevApp.devAppTable.{i}.devAppId` | readOnly | string | Application identifier for this DevApp entry. | -| 793 | `Device.X_COMCAST-COM_Xcalibur.DevApp.devAppTable.{i}.devAppRestartCapability` | readOnly | string | Restart capability reported for this DevApp entry. | -| 794 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayDeviceFriendlyName` | readOnly | string | Gateway identification value reported by TRM. | -| 795 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayMoCAIP` | readOnly | string | Gateway identification value reported by TRM. | -| 796 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayMoCAMAC` | readOnly | string | Gateway identification value reported by TRM. | -| 797 | `Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewaySTBMAC` | readOnly | string | Gateway identification value reported by TRM. | -| 798 | `Device.X_RDKCENTRAL-COM_T2.ReportProfiles` | readWrite | string | Telemetry 2.0 report profiles payload. | -| 799 | `Device.X_RDKCENTRAL-COM_T2.ReportProfilesMsgPack` | readWrite | string | Telemetry 2.0 report profiles payload. | -| 800 | `Device.X_RDK_WebPA_DNSText.URL` | readWrite | string | Bootstrap URL used to retrieve WebPA DNS text records. | -| 801 | `Device.X_RDK_WebPA_Server.URL` | readOnly | string | Current WebPA server URL from the bootstrap store. | -| 802 | `Device.X_RDK_WebPA_TokenServer.URL` | readOnly | string | Current WebPA token server URL from the bootstrap store. | +| 742 | `Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow` | readWrite | string | Triggers an immediate Xconf check for the Xcalibur client. | +| 743 | `Device.X_RDKCENTRAL-COM_T2.ReportProfiles` | readWrite | string | Telemetry 2.0 report profiles payload. | +| 744 | `Device.X_RDKCENTRAL-COM_T2.ReportProfilesMsgPack` | readWrite | string | Telemetry 2.0 report profiles payload. | +| 745 | `Device.X_RDK_WebPA_DNSText.URL` | readWrite | string | Bootstrap URL used to retrieve WebPA DNS text records. | +| 746 | `Device.X_RDK_WebPA_Server.URL` | readOnly | string | Current WebPA server URL from the bootstrap store. | +| 747 | `Device.X_RDK_WebPA_TokenServer.URL` | readOnly | string | Current WebPA token server URL from the bootstrap store. | diff --git a/docs/integration/build-setup.md b/docs/integration/build-setup.md index f2d0e1d76..7923acf7b 100644 --- a/docs/integration/build-setup.md +++ b/docs/integration/build-setup.md @@ -26,7 +26,6 @@ The top-level `configure.ac` currently exposes feature toggles including: | Flag | Effect | |------|--------| -| `--enable-xre` | Enable XRE-related profile support | | `--enable-moca` / `--enable-moca2` | Enable MoCA profile support | | `--enable-DHCPv4` | Enable DHCPv4 profile support | | `--enable-StorageService` | Enable StorageService profile support | diff --git a/run_ut.sh b/run_ut.sh index 7e0b7938f..c2066bcac 100644 --- a/run_ut.sh +++ b/run_ut.sh @@ -81,7 +81,7 @@ touch /tmp/timeReceivedNTP touch /tmp/webpa/start_time touch /opt/persistent/firstNtpTime touch /etc/rfcdefaults/rfcdefaults.ini -touch /opt/XRE_container_enable /opt/dab-enable +touch /opt/dab-enable touch /opt/.ntpEnabled touch /var/tmp/rssh.pid cat /version.txt diff --git a/src/Makefile.am b/src/Makefile.am index 7f92c70b3..785b00964 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -71,18 +71,10 @@ if WITH_WEBPA_RFC AM_CXXFLAGS += -DWEBPA_RFC_ENABLED endif -if XRELIB_FLAG -AM_LDFLAGS = $(GLIB_LDFLAGS) $(GLIB_LIBS) \ - $(G_THREAD_LIBS) -lyajl $(SOUP_LIBS) \ - $(NEXUS_LIB) -ldbus-1 \ - -lIARMBus -lrdkloggers \ - -ltr69ProfileXcaliber -lrbus -else AM_LDFLAGS = $(GLIB_LDFLAGS) $(GLIB_LIBS) \ $(G_THREAD_LIBS) -lyajl $(SOUP_LIBS) \ $(NEXUS_LIB) -ldbus-1 \ -lIARMBus -lrdkloggers -lrbus -endif if WITH_THUNDER_CLIENT else @@ -143,10 +135,6 @@ if WITH_MOCA_PROFILE tr69hostif_LDADD += $(top_builddir)/src/hostif/profiles/moca/libhostIfMoCA.la endif -if XRELIB_FLAG -tr69hostif_LDADD += -ltr69ProfileXcaliber -endif - AM_CXXFLAGS += -I$(top_srcdir)/src/hostif/parodusClient/pal AM_CXXFLAGS += -I$(top_srcdir)/src/hostif/parodusClient/waldb tr69hostif_LDADD += $(top_builddir)/src/hostif/parodusClient/waldb/libwaldb.la diff --git a/src/hostif/handlers/Makefile.am b/src/hostif/handlers/Makefile.am index 99014af4f..d51ed0e63 100644 --- a/src/hostif/handlers/Makefile.am +++ b/src/hostif/handlers/Makefile.am @@ -22,7 +22,6 @@ DIST_SUBDIRS = AM_CXXFLAGS = -I$(top_srcdir)/src/hostif/include \ -I$(top_srcdir)/src/hostif/profiles/STBService \ - -I$(top_srcdir)/src/hostif/profiles/X_COMCAST-COM/X_COMCAST-COM_Xcalibur/include \ -I$(top_srcdir)/src/hostif/profiles/moca \ -I$(top_srcdir)/src/hostif/profiles/Ethernet \ -I$(top_srcdir)/src/hostif/profiles/Device \ @@ -34,9 +33,8 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/hostif/include \ -I$(top_srcdir)/src/hostif/profiles/InterfaceStack \ -I$(top_srcdir)/src/hostif/profiles/StorageService \ -I$(PKG_CONFIG_SYSROOT_DIR)$(includedir)/rdk/iarmmgrs/sysmgr \ - -I$(top_srcdir)/src/hostif/profiles/moca \ -I./include $(GLIB_CFLAGS) $(G_THREAD_CFLAGS) \ - $(XREMGR_FLAGS) $(MOCAMGR_FLAGS) $(SOUP_CFLAGS) $(MOCA2_FLAG) \ + $(MOCAMGR_FLAGS) $(SOUP_CFLAGS) $(MOCA2_FLAG) \ $(XRDK_SDCARD_PROFILE_FLAG) $(XRDK_EMMC_PROFILE_FLAG) \ -I=/usr/include/rdk/iarmbus/ \ -I=/usr/include/rdk/iarmmgrs/sysmgr/ \ diff --git a/src/hostif/handlers/docs/README.md b/src/hostif/handlers/docs/README.md index 53a8fb43f..8eaeced0c 100644 --- a/src/hostif/handlers/docs/README.md +++ b/src/hostif/handlers/docs/README.md @@ -193,7 +193,7 @@ These classes own specific TR-181 areas or integration namespaces and are the ob | `DHCPv4ClientReqHandler` | `Device.DHCPv4.Client.*` | Read-only handler in practice for the current code path; returns client interface references, routers, and DNS servers, and reports the client entry count | | `InterfaceStackClientReqHandler` | `Device.InterfaceStack.*` | Read-only handler that exposes higher-layer and lower-layer relationships between interfaces and reports `InterfaceStackNumberOfEntries` | | `StorageSrvcReqHandler` | `Device.services.StorageService.*` | Delegates storage-service GET requests to `hostIf_StorageSrvc`; the current implementation exposes reads and leaves SET and attribute support effectively unimplemented | -| `XREClientReqHandler` | `Device.X_COMCAST-COM_Xcalibur.Client.*`, `...Client.XRE.*`, and related XRE/DevApp control parameters | Handles XRE operational controls such as xconf check-now, session refresh, XRE restart, cache flush, log level changes, and receiver/dev-app restart flows when the XRE profile is enabled | +| `XREClientReqHandler` | `Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow` | Handles the xconf check-now parameter only; triggers the rdkvfwupgrader script when set to `TRUE` or `CANARY`, and persists the value to `/tmp/xconfchecknow_val` | | `XRdkCentralT2` | `Device.X_RDKCENTRAL-COM_T2.ReportProfiles` and `...ReportProfilesMsgPack` | Pass-through handler that forwards Telemetry 2 profile payloads to RBUS, supports long-string transfer using `paramValueLong`, and cross-checks written report profile data | | `X_rdk_req_hdlr` | Parameters under the internal `X_RDK_PREFIX_STR` namespace | Thin mutex-protected wrapper around `X_rdk_profile`, used for RDK-specific parameters that are not part of the main standard object handlers | diff --git a/src/hostif/handlers/include/hostIf_XREClient_ReqHandler.h b/src/hostif/handlers/include/hostIf_XREClient_ReqHandler.h index 2f4cb38c0..109a05058 100755 --- a/src/hostif/handlers/include/hostIf_XREClient_ReqHandler.h +++ b/src/hostif/handlers/include/hostIf_XREClient_ReqHandler.h @@ -18,12 +18,13 @@ */ /** * @file hostIf_XREClient_ReqHandler.h - * @brief The header file provides HostIf XRE Client request handler information APIs. + * @brief Minimal handler for Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow parameter. + * @note All XRE/Xcalibur profile features except xconfCheckNow have been removed. */ /** * @defgroup TR-069HOSTIF_XRECLIENT_REQHANDLER_CLASSES XREClient RequestHandler Public Classes - * Describe the details about classes used in TR-069 XREClient request handler. + * Describe the minimal classes used in TR-069 xconfCheckNow request handler. * @ingroup TR-069HOSTIF_DEVICECLIENT_HANDLER */ @@ -48,12 +49,11 @@ #define HOSTIF_XRECLIENT_REQHANDLER_H_ #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. + * @brief Minimal handler for xconfCheckNow parameter only. * @ingroup TR-069HOSTIF_XRECLIENT_REQHANDLER_CLASSES */ class XREClientReqHandler : public msgHandler @@ -61,10 +61,8 @@ class XREClientReqHandler : public msgHandler XREClientReqHandler() {}; ~XREClientReqHandler() {}; static class XREClientReqHandler *pInstance; - static updateCallback mUpdateCallback; static GMutex m_mutex; static void getLock(); - static int numOfEntries; public: virtual bool init(); virtual bool unInit(); @@ -75,7 +73,6 @@ class XREClientReqHandler : public msgHandler static void releaseLock(); static void checkForUpdates(); static void reset(); - static void registerUpdateCallback(updateCallback cb); static msgHandler* getInstance(); }; diff --git a/src/hostif/handlers/src/gtest/Makefile.am b/src/hostif/handlers/src/gtest/Makefile.am index d1ff02945..da85d3c30 100644 --- a/src/hostif/handlers/src/gtest/Makefile.am +++ b/src/hostif/handlers/src/gtest/Makefile.am @@ -31,7 +31,7 @@ COMMON_LDADD = -lgtest -lgtest_main -lgmock_main -lgmock -lgcov $(GLIB_LIBS) -l # Define the compiler flags COMMON_CXXFLAGS = -frtti $(GLIB_CFLAGS) -fprofile-arcs -ftest-coverage -handlers_gtest_SOURCES = handlers_test.cpp $(TOP_DIR)/src/hostif/parodusClient/startParodus/startParodus.cpp $(TOP_DIR)/src/hostif/src/hostIf_utils.cpp $(TOP_DIR)/src/hostif/src/IniFile.cpp $(TOP_DIR)/src/unittest/stubs/secure_wrapper.c $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFCStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFC.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStoreJournal.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_NotificationHandler.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_notification.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_attribute.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_parameter.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/libpd.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_adapter.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_msgHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus_Process.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_DisplayDevice_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_HDMI_Thunder.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface_Stats.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface.cpp $(TOP_DIR)/src/hostif/profiles/Time/Device_Time.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_updateHandler.cpp $(TOP_DIR)/src/hostif/profiles/Device/x_rdk_profile.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_rbus_Dml_Provider.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Capabilities_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_SPDIF_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoDecoder_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_AudioOutput_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoOutput_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_Stats.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_ActivePort.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Diagnostics_IPPing.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_IPv4Address.cpp $(TOP_DIR)/src/hostif/handlers/src/x_rdk_req_handler.cpp $(TOP_DIR)/src/unittest/stubs/dm_stubs.cpp $(TOP_DIR)/src/hostif/parodusClient/waldb/waldb.cpp $(TOP_DIR)/src/unittest/stubs/wdmp-c.c $(TOP_DIR)/src/unittest/stubs/wdmp_internal.c $(TOP_DIR)/src/hostif/httpserver/src/http_server.cpp $(TOP_DIR)/src/hostif/httpserver/src/request_handler.cpp $(TOP_DIR)/src/hostif/httpserver/src/XrdkCentralComRFCVar.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_Processor.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus.cpp $(TOP_DIR)/src/unittest/stubs/ds/libprocps.cpp $(TOP_DIR)/src/unittest/stubs/file_writer.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DHCPv4Client_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DHCPv4/Device_DHCPv4_Client.cpp +handlers_gtest_SOURCES = handlers_test.cpp $(TOP_DIR)/src/hostif/parodusClient/startParodus/startParodus.cpp $(TOP_DIR)/src/hostif/src/hostIf_utils.cpp $(TOP_DIR)/src/hostif/src/IniFile.cpp $(TOP_DIR)/src/unittest/stubs/secure_wrapper.c $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFCStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFC.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStoreJournal.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_NotificationHandler.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_notification.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_attribute.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_parameter.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/libpd.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_adapter.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_msgHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus_Process.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_DisplayDevice_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_HDMI_Thunder.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface_Stats.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface.cpp $(TOP_DIR)/src/hostif/profiles/Time/Device_Time.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_updateHandler.cpp $(TOP_DIR)/src/hostif/profiles/Device/x_rdk_profile.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_rbus_Dml_Provider.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Capabilities_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_SPDIF_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoDecoder_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_AudioOutput_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoOutput_Thunder.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_Stats.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_ActivePort.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Diagnostics_IPPing.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_IPv4Address.cpp $(TOP_DIR)/src/hostif/handlers/src/x_rdk_req_handler.cpp $(TOP_DIR)/src/unittest/stubs/dm_stubs.cpp $(TOP_DIR)/src/hostif/parodusClient/waldb/waldb.cpp $(TOP_DIR)/src/unittest/stubs/wdmp-c.c $(TOP_DIR)/src/unittest/stubs/wdmp_internal.c $(TOP_DIR)/src/hostif/httpserver/src/http_server.cpp $(TOP_DIR)/src/hostif/httpserver/src/request_handler.cpp $(TOP_DIR)/src/hostif/httpserver/src/XrdkCentralComRFCVar.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_Processor.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus.cpp $(TOP_DIR)/src/unittest/stubs/ds/libprocps.cpp $(TOP_DIR)/src/unittest/stubs/file_writer.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DHCPv4Client_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DHCPv4/Device_DHCPv4_Client.cpp # Apply common properties to each program handlers_gtest_CPPFLAGS = $(COMMON_CPPFLAGS) diff --git a/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp b/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp index 3f67b39a4..2d6a9554d 100644 --- a/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp +++ b/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp @@ -19,7 +19,8 @@ /** * @file hostIf_XREClient_ReqHandler.cpp - * @brief The header file provides HostIf IP XREClient request handler information APIs. + * @brief Minimal handler for Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow parameter. + * @note All XRE/Xcalibur profile features except xconfCheckNow have been removed. */ /** @@ -32,18 +33,10 @@ #include "hostIf_main.h" #include "hostIf_utils.h" -#ifdef USE_XRESRC #include "hostIf_XREClient_ReqHandler.h" -#include "Device_XComcast_Xcalibur_Client_XRE.h" -#include "Device_XComcast_Xcalibur_Client_XRE_ConnectionTable.h" -#include "Device_XComcast_Xcalibur_TRM.h" -#include "libIBus.h" -static bool resetEnable = false; XREClientReqHandler* XREClientReqHandler::pInstance = NULL; -updateCallback XREClientReqHandler::mUpdateCallback = NULL; GMutex XREClientReqHandler::m_mutex; -int XREClientReqHandler::numOfEntries = 0; #define XCONF_CHECKNOW_SCRIPT_CMD "backgroundrun /usr/bin/rdkvfwupgrader 0 3 >> /opt/logs/swupdate.log" @@ -92,8 +85,6 @@ void XREClientReqHandler::reset() { getLock(); RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Entering..\n", __FUNCTION__, __FILE__); - numOfEntries = 0; - resetEnable = true; RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s] Exiting..\n", __FUNCTION__, __FILE__); releaseLock(); } @@ -112,9 +103,7 @@ void XREClientReqHandler::releaseLock() } /** - * @brief This function use to handle the set message request of XREClient interface - * and set the attributes such as "xreEnable", "xreRefreshXreSession", "xreFlushLocalCache", "xreLogLevel", - * "xconfCheckNow", "xreReceiverRestart" and "xreRestartXreApp". + * @brief Handle set message requests for xconfCheckNow parameter. * * @param[out] stMsgData TR-069 Host interface message request. * @@ -138,41 +127,6 @@ int XREClientReqHandler::handleSetMsg(HOSTIF_MsgData_t *stMsgData) { ret = set_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow (stMsgData); } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable") == 0) - { - ret = set_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreEnable(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSession") == 0) - { - ret = set_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreRefreshXreSession(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSessionWithRR") == 0) - { - ret = set_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreRefreshXreSessionWithRR(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRestartXreApp") == 0) - { - ret = set_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreRestartXreApp(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreFlushLocalCache") == 0) - { - ret = set_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreFlushLocalCache(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLogLevel") == 0) - { - ret = set_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreLogLevel(stMsgData); - } - #ifdef RDKV_TR69 - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreReceiverRestart") == 0) - { - ret = setXreReceiverRestart(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.DevApp.devAppRestartRequest") == 0) - { - // xreReceiverRestart uses /lib/rdk/restartReceiver.sh, which sometimes doesn't start receiver back - ret = setDevAppRestartRequest(stMsgData); - } - #endif else { stMsgData->faultCode = fcInvalidParameterName; @@ -184,9 +138,7 @@ int XREClientReqHandler::handleSetMsg(HOSTIF_MsgData_t *stMsgData) } /** - * @brief This function use to handle the get message request of XREClient interface - * and get the attributes such as "xreEnable", "xreStatus", "xreVersion", "xreReceiverId", - * "xreSessionId", "xreSessionLastModTs", "xreSessionUptime" etc.. + * @brief Handle get message requests for xconfCheckNow parameter. * * @param[out] stMsgData TR-069 Host interface message request. * @@ -199,8 +151,6 @@ int XREClientReqHandler::handleSetMsg(HOSTIF_MsgData_t *stMsgData) int XREClientReqHandler::handleGetMsg(HOSTIF_MsgData_t *stMsgData) { int ret = NOT_HANDLED; - const char *pSetting = NULL; - int instanceNumber = 0; getLock(); @@ -208,255 +158,15 @@ int XREClientReqHandler::handleGetMsg(HOSTIF_MsgData_t *stMsgData) RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%s:%d] Found string as %s\n", __FUNCTION__, __FILE__, __LINE__, stMsgData->paramName); - if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreEnable(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.xconfCheckNow") == 0) + 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); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreVersion") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreVersion(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreReceiverId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreReceiverId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreSessionId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionLastModTs") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreSessionLastModTs(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreSessionUptime") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreSessionUptime(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLastURLAccessed") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreLastURLAccessed(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreMinCmdProcTime") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreMinCmdProcTime(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreAvgCmdProcTime") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreAvgCmdProcTime(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreMaxCmdProcTime") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreMaxCmdProcTime(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"device.x_comcast-com_xcalibur.client.xre.xreCommandCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreCommandCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreErrorCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreErrorCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotViewCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotViewCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotAppCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotAppCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotRectCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotRectCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotTxtCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotTxtCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotHtmlTxtCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotHtmlTxtCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotTxtIpCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotTxtIpCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotFontCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotFontCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotVideoCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotVideoCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotSoundCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotSoundCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotStyleshtCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotStyleshtCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotImgCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotImgCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotNineSliceImgCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotNineSliceImgCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotFlashCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotFlashCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreTotAnimCnt") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotAnimCnt(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreRefreshXreSession") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreRefreshXreSession(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreFlushLocalCache") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreFlushLocalCache(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLogLevel") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreLogLevel(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreGetTWPDiags") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreGetTWPDiags(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreChannelMapId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreChannelMapId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreControllerId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreControllerId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xrePlantId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xrePlantId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreVodId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreVodId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreGatewaySTBMAC") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreGatewaySTBMAC(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreLastVideoUrl") == 0) - { - ret = get_XreLastVideoUrl(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.DevApp.devAppNumAps") == 0) - { - ret = get_DevAppNumAps(stMsgData); - } - else if(matchComponent(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.DevApp.devAppTable",&pSetting,instanceNumber)) - { - ret = get_DevAppTable(stMsgData, pSetting, instanceNumber); - } -#if 0 - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.numberOfConnections") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_numberOfConnections(stMsgData); - } - else if(matchComponent(stMsgData->paramName, "Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable", &pSetting, instanceNumber)) - { - if ((pSetting != NULL) && (instanceNumber != 0)) - { - if(strcasecmp(pSetting, "xreAppId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreAppId(stMsgData, instanceNumber); - } - else if(strcasecmp(pSetting, "xreConnURL") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnURL(stMsgData, instanceNumber); - } - else if(strcasecmp(pSetting, "xreConnStatus") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnStatus(stMsgData, instanceNumber); - } - else if(strcasecmp(pSetting, "xreConnIfName") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnIfName(stMsgData, instanceNumber); - } - else if(strcasecmp(pSetting, "xreConnEstTs") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnEstTs(stMsgData, instanceNumber); - } - else if(strcasecmp(pSetting, "xreConnRetryAttempts") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnRetryAttempts(stMsgData, instanceNumber); - } - else - { - RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%d] Parameter \'%s\' is Not Supported \n", __FUNCTION__, __LINE__, stMsgData->paramName); - stMsgData->faultCode = fcInvalidParameterName; - ret = NOK; - } - } - } -#endif - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreAppId") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreAppId(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnURL") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnURL(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnStatus") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnStatus(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnIfName") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnIfName(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnEstTs") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnEstTs(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.xreConnRetryAttempts") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnRetryAttempts(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewaySTBMAC") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_TRM_trmGatewaySTBMAC(stMsgData); - ret = OK; // always returning OK to fix Delia-28157 - - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayMoCAMAC") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_TRM_trmGatewayMoCAMAC(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayMoCAIP") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_TRM_trmGatewayMoCAIP(stMsgData); - } - else if(strcasecmp(stMsgData->paramName,"Device.X_COMCAST-COM_Xcalibur.TRM.trmGatewayDeviceFriendlyName") == 0) - { - ret = get_Device_X_COMCAST_COM_Xcalibur_TRM_trmGatewayDeviceFriendlyName(stMsgData); - } - else + else { - RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%d] Parameter : \'%s\' is Not Supported \n", __FUNCTION__, __LINE__, stMsgData->paramName); - stMsgData->faultCode = fcInvalidParameterName; - ret = NOK; + RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%d] Parameter : \'%s\' is Not Supported \n", __FUNCTION__, __LINE__, stMsgData->paramName); + stMsgData->faultCode = fcInvalidParameterName; + ret = NOK; } releaseLock(); @@ -481,11 +191,12 @@ int XREClientReqHandler::handleSetAttributesMsg(HOSTIF_MsgData_t *stMsgData) releaseLock(); return ret; } -void XREClientReqHandler::registerUpdateCallback(updateCallback cb) -{ - mUpdateCallback = cb; -} +/** + * @brief Set xconfCheckNow parameter to trigger firmware update check. + * @param[in] stMsgData Message data containing the parameter value. + * @return OK on success, NOK on failure. + */ int set_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stMsgData) { FILE *file = fopen("/tmp/xconfchecknow_val", "w"); @@ -516,6 +227,11 @@ int set_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stM return OK; } +/** + * @brief Get xconfCheckNow parameter value. + * @param[out] stMsgData Message data to store the parameter value. + * @return OK on success, NOK on failure. + */ int get_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stMsgData) { FILE *file = fopen("/tmp/xconfchecknow_val", "r"); @@ -523,493 +239,26 @@ int get_Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow(HOSTIF_MsgData_t *stM 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); + if (fscanf(file, "%9s", stMsgData->paramValue) != 1) { + RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF, "[%s:%s:%d]Device_X_COMCAST_COM_Xcalibur_Client_xconfCheckNow: Error reading file.\n",__FILE__,__FUNCTION__,__LINE__); + fclose(file); + return NOK; + } fclose(file); return OK; } +/** + * @brief Check for parameter updates. Minimal implementation. + * @note XRE-specific parameter update checking has been removed. + */ void XREClientReqHandler::checkForUpdates() { - HOSTIF_MsgData_t msgData; - bool bChanged; - char tmp_buff[TR69HOSTIFMGR_MAX_PARAM_LEN]; getLock(); -#if 0 - RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%d] Entering..\n", __FUNCTION__, __LINE__); - - if(resetEnable && get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_numberOfConnections(&msgData) == OK) - { - short tmpNoDev = get_int(msgData.paramValue); - char tmp[TR69HOSTIFMGR_MAX_PARAM_LEN] = ""; - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable"); - - while(numOfEntries > tmpNoDev) - { - snprintf(tmp,TR69HOSTIFMGR_MAX_PARAM_LEN,"%s.%d.",tmp_buff,tmpNoDev); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_REMOVE,tmp, NULL, hostIf_IntegerType); - RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,"[%s:%d] IARM_Bus_BroadcastEvent : 'IARM_BUS_TR69HOSTIFMGR_EVENT_REMOVE for \'%s\' object. \n", __FUNCTION__, __LINE__, tmp); - tmpNoDev++; - } - while(numOfEntries < tmpNoDev) - { - snprintf(tmp,TR69HOSTIFMGR_MAX_PARAM_LEN,"%s.",tmp_buff); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_ADD,tmp, NULL, hostIf_IntegerType); - RDK_LOG(RDK_LOG_INFO, LOG_TR69HOSTIF,"[%s:%d] IARM_Bus_BroadcastEvent : Sending (%d) 'IARM_BUS_TR69HOSTIFMGR_EVENT_ADD' for \'%s\' object. \n", __FUNCTION__, __LINE__, tmpNoDev, tmp); - tmpNoDev--; - } - numOfEntries = get_int(msgData.paramValue); - } -#endif -#ifdef HAVE_VALUE_CHANGE_EVENT - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreEnable(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreEnable"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreStatus(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreStatus"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreVersion(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreVersion"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreReceiverId(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreReceiverId"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreSessionId(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreSessionId"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreSessionLastModTs(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreSessionLastModTs"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreSessionUptime(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreSessionUptime"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreLastURLAccessed(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreLastURLAccessed"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreMinCmdProcTime(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreMinCmdProcTime"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreAvgCmdProcTime(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreAvgCmdProcTime"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreMaxCmdProcTime(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreMaxCmdProcTime"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreCommandCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreCommandCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreErrorCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreErrorCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotViewCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotViewCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotAppCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotAppCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotRectCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotRectCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotTxtCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotTxtCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotHtmlTxtCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotHtmlTxtCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotTxtIpCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotTxtIpCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotFontCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotFontCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotVideoCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotVideoCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotSoundCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotSoundCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotStyleshtCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotStyleshtCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); //CID:84676 - Bad sizeof and 88167 mimatch - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotImgCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotImgCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotNineSliceImgCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotNineSliceImgCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotFlashCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotFlashCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreTotAnimCnt(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreTotAnimCnt"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreRefreshXreSession(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreRefreshXreSession"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreFlushLocalCache(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreFlushLocalCache"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreLogLevel(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreLogLevel"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreGetTWPDiags(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreGetTWPDiags"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreChannelMapId(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreChannelMapId"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreControllerId(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreControllerId"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xrePlantId(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xrePlantId"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } - - - memset(&msgData,0,sizeof(msgData)); - memset(tmp_buff,0,TR69HOSTIFMGR_MAX_PARAM_LEN); - bChanged = false; - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_xreVodId(&msgData,&bChanged); - if(bChanged) - { - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.%s","xreVodId"); - if(mUpdateCallback) mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED,tmp_buff, msgData.paramValue, msgData.paramtype); - } -#if 0 - if(mUpdateCallback) - { - memset(&msgData, 0, sizeof(&msgData)); - memset(tmp_buff, 0, TR69HOSTIFMGR_MAX_PARAM_LEN); - unsigned int connections = 0; - unsigned int loopCnt = 0; - - /* Get Number of Connections */ - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_numberOfConnections(&msgData); - - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.numberOfConnections"); - connections = atoi (msgData.paramValue); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - - for (loopCnt = 1; loopCnt <= connections; loopCnt++) - { - memset(&msgData, 0, sizeof(&msgData)); - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreAppId(&msgData, loopCnt); - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.%d.xreAppId", loopCnt); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - } - - for (loopCnt = 1; loopCnt <= connections; loopCnt++) - { - memset(&msgData, 0, sizeof(&msgData)); - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnURL(&msgData, loopCnt); - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.%d.xreConnURL", loopCnt); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - } - - for (loopCnt = 1; loopCnt <= connections; loopCnt++) - { - memset(&msgData, 0, sizeof(&msgData)); - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnStatus(&msgData, loopCnt); - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.%d.xreConnStatus", loopCnt); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - } - for (loopCnt = 1; loopCnt <= connections; loopCnt++) - { - memset(&msgData, 0, sizeof(&msgData)); - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnIfName(&msgData, loopCnt); - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.%d.xreConnIfName", loopCnt); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - } - for (loopCnt = 1; loopCnt <= connections; loopCnt++) - { - memset(&msgData, 0, sizeof(&msgData)); - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnEstTs(&msgData, loopCnt); - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.%d.xreConnEstTs", loopCnt); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - } - for (loopCnt = 1; loopCnt <= connections; loopCnt++) - { - memset(&msgData, 0, sizeof(&msgData)); - get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnRetryAttempts(&msgData, loopCnt); - snprintf(tmp_buff,TR69HOSTIFMGR_MAX_PARAM_LEN,"Device.X_COMCAST-COM_Xcalibur.Client.XRE.ConnectionTable.%d.xreConnRetryAttempts", loopCnt); - mUpdateCallback(IARM_BUS_TR69HOSTIFMGR_EVENT_VALUECHANGED, tmp_buff, msgData.paramValue, msgData.paramtype); - } - } -#endif -#endif /* HAVE_VALUE_CHANGE_EVENT */ - RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%d] Exiting..\n", __FUNCTION__, __LINE__); + RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s:%d] Minimal xconfCheckNow handler.\n", __FUNCTION__, __LINE__); releaseLock(); } -#endif /*USE_XRESRC*/ - /** @} */ /** @} */ + diff --git a/src/hostif/handlers/src/hostIf_msgHandler.cpp b/src/hostif/handlers/src/hostIf_msgHandler.cpp index b780b4679..fa0b6d230 100644 --- a/src/hostif/handlers/src/hostIf_msgHandler.cpp +++ b/src/hostif/handlers/src/hostIf_msgHandler.cpp @@ -39,11 +39,9 @@ #include "hostIf_dsClient_ReqHandler.h" #include "hostIf_DeviceClient_ReqHandler.h" #include "hostIf_XrdkCentralT2_ReqHandler.h" +#include "hostIf_XREClient_ReqHandler.h" #include "safec_lib.h" -#ifdef USE_XRESRC -#include "hostIf_XREClient_ReqHandler.h" -#endif /* USE_XRESRC */ #ifdef USE_MoCA_PROFILE #include "hostIf_MoCAClient_ReqHandler.h" #endif /* USE_MoCA_PROFILE */ @@ -427,12 +425,10 @@ bool hostIf_initalize_ConfigManger() mgrName = HOSTIF_MoCAMgr; } #endif /* USE_MoCA_PROFILE*/ -#ifdef USE_XRESRC else if(strcasecmp(mgr, "xreMgr") == 0) { mgrName = HOSTIF_XREMgr; } -#endif /* USE_XRESRC*/ else if(strcasecmp(mgr, "ethernetMgr") == 0) { mgrName = HOSTIF_EthernetMgr; @@ -521,11 +517,9 @@ msgHandler* HostIf_GetMgr(HOSTIF_MsgData_t *stMsgHandlerData) case HOSTIF_DSMgr: pRet = DSClientReqHandler::getInstance(); break; -#ifdef USE_XRESRC case HOSTIF_XREMgr: pRet = XREClientReqHandler::getInstance(); break; -#endif /*USE_XRESRC*/ case HOSTIF_DeviceMgr: pRet = DeviceClientReqHandler::getInstance(); break; @@ -643,12 +637,10 @@ bool hostIf_ConfigProperties_Init() mgrName = HOSTIF_MoCAMgr; } #endif /* USE_MoCA_PROFILE*/ -#ifdef USE_XRESRC else if(strcasecmp(value, "xreMgr") == 0) { mgrName = HOSTIF_XREMgr; } -#endif /* USE_XRESRC*/ else if(strcasecmp(value, "ethernetMgr") == 0) { mgrName = HOSTIF_EthernetMgr; diff --git a/src/hostif/handlers/src/hostIf_updateHandler.cpp b/src/hostif/handlers/src/hostIf_updateHandler.cpp index f68a4a8b4..679382d5f 100644 --- a/src/hostif/handlers/src/hostIf_updateHandler.cpp +++ b/src/hostif/handlers/src/hostIf_updateHandler.cpp @@ -29,7 +29,6 @@ #include "hostIf_updateHandler.h" #include "hostIf_MoCAClient_ReqHandler.h" -#include "hostIf_XREClient_ReqHandler.h" #include "hostIf_EthernetClient_ReqHandler.h" #include "hostIf_IPClient_ReqHandler.h" #include "hostIf_TimeClient_ReqHandler.h" @@ -50,10 +49,6 @@ #include "hostIf_InterfaceStackClient_ReqHandler.h" #endif /* USE_INTFSTACK_PROFILE */ -#ifdef USE_XRESRC -#include "Device_XComcast_Xcalibur_Client_XRE_ConnectionTable.h" -#endif - #ifdef USE_XRDK_BT_PROFILE #include "XrdkBlueTooth.h" #endif @@ -69,7 +64,6 @@ void updateHandler::Init() MoCAClientReqHandler::registerUpdateCallback(notifyCallback); #endif /*USE_MoCA_PROFILE*/ - /* XREClientReqHandler::registerUpdateCallback(notifyCallback); */ EthernetClientReqHandler::registerUpdateCallback(notifyCallback); /* DSClientReqHandler::registerUpdateCallback(notifyCallback);*/ IPClientReqHandler::registerUpdateCallback(notifyCallback); @@ -83,10 +77,6 @@ void updateHandler::Init() InterfaceStackClientReqHandler::registerUpdateCallback(notifyCallback); #endif /* USE_STORAGESERVICE_PROFILE */ -#ifdef USE_XRESRC - XREClientReqHandler::registerUpdateCallback(notifyCallback); -#endif - #ifdef USE_XRDK_BT_PROFILE hostIf_DeviceInfoRdk_xBT::registerUpdateCallback(notifyCallback); #endif // USE_XRDK_BT_PROFILE @@ -113,11 +103,6 @@ void updateHandler::reset() #ifdef USE_INTFSTACK_PROFILE InterfaceStackClientReqHandler::reset(); #endif -#if 0 -#ifdef USE_XRESRC - XREClientReqHandler::reset(); -#endif -#endif #ifdef USE_XRDK_BT_PROFILE hostIf_DeviceInfoRdk_xBT::reset(); #endif @@ -148,19 +133,11 @@ gpointer updateHandler::run(gpointer ptr) InterfaceStackClientReqHandler::checkForUpdates(); #endif /* USE_STORAGESERVICE_PROFILE */ - /* No need to update now, since it has one instances */ - /*XREClientReqHandler::checkForUpdates();*/ - /* Here no need to add event by agent. The agent will not * be responsible for creating instances. The ACS can create * instance and get the value for that instances. */ /*DSClientReqHandler::checkForUpdates();*/ /*TimeClientReqHandler::checkForUpdates(); */ -#if 0 -#ifdef USE_XRESRC - XREClientReqHandler::checkForUpdates(); -#endif -#endif #ifdef USE_XRDK_BT_PROFILE hostIf_DeviceInfoRdk_xBT::checkForUpdates(); #endif diff --git a/src/hostif/httpserver/src/gtest/Makefile.am b/src/hostif/httpserver/src/gtest/Makefile.am index 54c1abfc8..e43c10bf1 100644 --- a/src/hostif/httpserver/src/gtest/Makefile.am +++ b/src/hostif/httpserver/src/gtest/Makefile.am @@ -29,7 +29,7 @@ COMMON_LDADD = -lgtest -lgtest_main -lgmock_main -lgmock -lgcov $(GLIB_LIBS) -l # Define the compiler flags COMMON_CXXFLAGS = -frtti $(GLIB_CFLAGS) $(SOUP_LIBS) -fprofile-arcs -ftest-coverage -httpserver_gtest_SOURCES = $(TOP_DIR)/src/hostif/src/hostIf_utils.cpp $(TOP_DIR)/src/hostif/src/IniFile.cpp $(TOP_DIR)/src/unittest/stubs/secure_wrapper.c $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFCStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFC.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStoreJournal.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_NotificationHandler.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_notification.cpp $(TOP_DIR)/src/unittest/stubs/dm_stubs.cpp $(TOP_DIR)/src/hostif/parodusClient/waldb/waldb.cpp $(TOP_DIR)/src/unittest/stubs/wdmp-c.c $(TOP_DIR)/src/unittest/stubs/wdmp_internal.c $(TOP_DIR)/src/hostif/httpserver/src/http_server.cpp $(TOP_DIR)/src/hostif/httpserver/src/request_handler.cpp $(TOP_DIR)/src/hostif/httpserver/src/XrdkCentralComRFCVar.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_Processor.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_attribute.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_parameter.cpp $(TOP_DIR)/src/unittest/stubs/file_writer.cpp $(TOP_DIR)/src/hostif/httpserver/src/gtest/gtest_httpserver.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/libpd.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_adapter.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_msgHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus_Process.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_DisplayDevice.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface_Stats.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface.cpp $(TOP_DIR)/src/hostif/profiles/Time/Device_Time.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_updateHandler.cpp $(TOP_DIR)/src/hostif/profiles/Device/x_rdk_profile.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_rbus_Dml_Provider.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Capabilities.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_SPDIF.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoDecoder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_AudioOutput.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_HDMI.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoOutput.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_Stats.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_ActivePort.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Diagnostics_IPPing.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_IPv4Address.cpp $(TOP_DIR)/src/hostif/handlers/src/x_rdk_req_handler.cpp $(TOP_DIR)/src/unittest/stubs/ds/libprocps.cpp +httpserver_gtest_SOURCES = $(TOP_DIR)/src/hostif/src/hostIf_utils.cpp $(TOP_DIR)/src/hostif/src/IniFile.cpp $(TOP_DIR)/src/unittest/stubs/secure_wrapper.c $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFCStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFC.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStoreJournal.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_NotificationHandler.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_notification.cpp $(TOP_DIR)/src/unittest/stubs/dm_stubs.cpp $(TOP_DIR)/src/hostif/parodusClient/waldb/waldb.cpp $(TOP_DIR)/src/unittest/stubs/wdmp-c.c $(TOP_DIR)/src/unittest/stubs/wdmp_internal.c $(TOP_DIR)/src/hostif/httpserver/src/http_server.cpp $(TOP_DIR)/src/hostif/httpserver/src/request_handler.cpp $(TOP_DIR)/src/hostif/httpserver/src/XrdkCentralComRFCVar.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_Processor.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_attribute.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_parameter.cpp $(TOP_DIR)/src/unittest/stubs/file_writer.cpp $(TOP_DIR)/src/hostif/httpserver/src/gtest/gtest_httpserver.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/libpd.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_adapter.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_msgHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus_Process.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_DisplayDevice.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface_Stats.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface.cpp $(TOP_DIR)/src/hostif/profiles/Time/Device_Time.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_updateHandler.cpp $(TOP_DIR)/src/hostif/profiles/Device/x_rdk_profile.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_rbus_Dml_Provider.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Capabilities.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_SPDIF.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoDecoder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_AudioOutput.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_HDMI.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoOutput.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_Stats.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_ActivePort.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Diagnostics_IPPing.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_IPv4Address.cpp $(TOP_DIR)/src/hostif/handlers/src/x_rdk_req_handler.cpp $(TOP_DIR)/src/unittest/stubs/ds/libprocps.cpp # Apply common properties to each program httpserver_gtest_CPPFLAGS = $(COMMON_CPPFLAGS) diff --git a/src/hostif/parodusClient/gtest/Makefile.am b/src/hostif/parodusClient/gtest/Makefile.am index ba4a499bc..7e694393d 100644 --- a/src/hostif/parodusClient/gtest/Makefile.am +++ b/src/hostif/parodusClient/gtest/Makefile.am @@ -31,7 +31,7 @@ COMMON_LDADD = -lgtest -lgtest_main -lgmock_main -lgmock -lgcov $(GLIB_LIBS) -l COMMON_CXXFLAGS = -frtti $(GLIB_CFLAGS) -fprofile-arcs -ftest-coverage -dm_gtest_SOURCES = dm_test.cpp $(TOP_DIR)/src/hostif/parodusClient/startParodus/startParodus.cpp $(TOP_DIR)/src/hostif/src/hostIf_utils.cpp $(TOP_DIR)/src/hostif/src/IniFile.cpp $(TOP_DIR)/src/unittest/stubs/secure_wrapper.c $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFCStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFC.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStoreJournal.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_NotificationHandler.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_notification.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_attribute.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_parameter.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/libpd.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_adapter.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_msgHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus_Process.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_DisplayDevice.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface_Stats.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface.cpp $(TOP_DIR)/src/hostif/profiles/Time/Device_Time.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_updateHandler.cpp $(TOP_DIR)/src/hostif/profiles/Device/x_rdk_profile.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_rbus_Dml_Provider.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Capabilities.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_SPDIF.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoDecoder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_AudioOutput.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_HDMI.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoOutput.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_Stats.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_ActivePort.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Diagnostics_IPPing.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_IPv4Address.cpp $(TOP_DIR)/src/hostif/handlers/src/x_rdk_req_handler.cpp $(TOP_DIR)/src/unittest/stubs/dm_stubs.cpp $(TOP_DIR)/src/hostif/parodusClient/waldb/waldb.cpp $(TOP_DIR)/src/unittest/stubs/wdmp-c.c $(TOP_DIR)/src/unittest/stubs/wdmp_internal.c $(TOP_DIR)/src/hostif/httpserver/src/http_server.cpp $(TOP_DIR)/src/hostif/httpserver/src/request_handler.cpp $(TOP_DIR)/src/hostif/httpserver/src/XrdkCentralComRFCVar.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_Processor.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus.cpp $(TOP_DIR)/src/unittest/stubs/ds/libprocps.cpp $(TOP_DIR)/src/unittest/stubs/file_writer.cpp +dm_gtest_SOURCES = dm_test.cpp $(TOP_DIR)/src/hostif/parodusClient/startParodus/startParodus.cpp $(TOP_DIR)/src/hostif/src/hostIf_utils.cpp $(TOP_DIR)/src/hostif/src/IniFile.cpp $(TOP_DIR)/src/unittest/stubs/secure_wrapper.c $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFCStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComRFC.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStore.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/XrdkCentralComBSStoreJournal.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_NotificationHandler.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_notification.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_attribute.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_parameter.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/libpd.cpp $(TOP_DIR)/src/hostif/parodusClient/pal/webpa_adapter.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_msgHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XrdkCentralT2_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_IPClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_DeviceClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus_Process.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_DisplayDevice.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_EthernetClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_XREClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/Ethernet/Device_Ethernet_Interface_Stats.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_TimeClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface.cpp $(TOP_DIR)/src/hostif/profiles/Time/Device_Time.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_updateHandler.cpp $(TOP_DIR)/src/hostif/profiles/Device/x_rdk_profile.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_dsClient_ReqHandler.cpp $(TOP_DIR)/src/hostif/handlers/src/hostIf_rbus_Dml_Provider.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Capabilities.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_SPDIF.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoDecoder.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_AudioOutput.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_HDMI.cpp $(TOP_DIR)/src/hostif/profiles/STBService/Components_VideoOutput.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_Stats.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_ActivePort.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Diagnostics_IPPing.cpp $(TOP_DIR)/src/hostif/profiles/IP/Device_IP_Interface_IPv4Address.cpp $(TOP_DIR)/src/hostif/handlers/src/x_rdk_req_handler.cpp $(TOP_DIR)/src/unittest/stubs/dm_stubs.cpp $(TOP_DIR)/src/hostif/parodusClient/waldb/waldb.cpp $(TOP_DIR)/src/unittest/stubs/wdmp-c.c $(TOP_DIR)/src/unittest/stubs/wdmp_internal.c $(TOP_DIR)/src/hostif/httpserver/src/http_server.cpp $(TOP_DIR)/src/hostif/httpserver/src/request_handler.cpp $(TOP_DIR)/src/hostif/httpserver/src/XrdkCentralComRFCVar.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_Processor.cpp $(TOP_DIR)/src/hostif/profiles/DeviceInfo/Device_DeviceInfo_ProcessStatus.cpp $(TOP_DIR)/src/unittest/stubs/ds/libprocps.cpp $(TOP_DIR)/src/unittest/stubs/file_writer.cpp # Apply common properties to each program dm_gtest_CPPFLAGS = $(COMMON_CPPFLAGS) diff --git a/src/hostif/parodusClient/waldb/data-model-generic.xml b/src/hostif/parodusClient/waldb/data-model-generic.xml index fce647473..5da609d89 100644 --- a/src/hostif/parodusClient/waldb/data-model-generic.xml +++ b/src/hostif/parodusClient/waldb/data-model-generic.xml @@ -179,71 +179,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml b/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml index ade87bbc7..55aedbd4f 100644 --- a/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml +++ b/src/hostif/parodusClient/waldb/data-model/data-model-generic.xml @@ -216,23 +216,6 @@ - - - - - - - - - - - - - - - - - @@ -1692,298 +1675,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/hostif/parodusClient/waldb/data-model/data-model-tv.xml b/src/hostif/parodusClient/waldb/data-model/data-model-tv.xml index 876ba3601..d50324fc9 100644 --- a/src/hostif/parodusClient/waldb/data-model/data-model-tv.xml +++ b/src/hostif/parodusClient/waldb/data-model/data-model-tv.xml @@ -265,18 +265,6 @@ - - - - - - - - - - - - diff --git a/src/hostif/parodusClient/waldb/waldb.cpp b/src/hostif/parodusClient/waldb/waldb.cpp index 184ad0d56..7dbfbbff4 100644 --- a/src/hostif/parodusClient/waldb/waldb.cpp +++ b/src/hostif/parodusClient/waldb/waldb.cpp @@ -40,7 +40,6 @@ using namespace tinyxml2; #define BLUETOOTH_DISCOVERED_DEVICE_COUNT_PARAM "Device.DeviceInfo.X_RDKCENTRAL-COM_xBlueTooth.DiscoveredDeviceCnt" #define BLUETOOTH_PAIRED_DEVICE_COUNT_PARAM "Device.DeviceInfo.X_RDKCENTRAL-COM_xBlueTooth.PairedDeviceCnt" #define BLUETOOTH_CONNECTED_DEVICE_COUNT_PARAM "Device.DeviceInfo.X_RDKCENTRAL-COM_xBlueTooth.ConnectedDeviceCnt" -#define DEVAPPS_COUNT_PARAM "Device.X_COMCAST-COM_Xcalibur.DevApp.devAppNumAps" /** * @briefGHashTable For holding Parameter count query strings @@ -167,7 +166,6 @@ void initNumEntityParamList() g_hash_table_insert(instanceNumParamHash, (gpointer)"Device.DeviceInfo.X_RDKCENTRAL-COM_xBlueTooth.DiscoveredDevice", (gpointer)BLUETOOTH_DISCOVERED_DEVICE_COUNT_PARAM); g_hash_table_insert(instanceNumParamHash,(gpointer) "Device.DeviceInfo.X_RDKCENTRAL-COM_xBlueTooth.PairedDevice",(gpointer) BLUETOOTH_PAIRED_DEVICE_COUNT_PARAM); g_hash_table_insert(instanceNumParamHash, (gpointer)"Device.DeviceInfo.X_RDKCENTRAL-COM_xBlueTooth.ConnectedDevice", (gpointer)BLUETOOTH_CONNECTED_DEVICE_COUNT_PARAM); - g_hash_table_insert(instanceNumParamHash, (gpointer)"Device.X_COMCAST-COM_Xcalibur.DevApp.devAppTable", (gpointer)DEVAPPS_COUNT_PARAM); } } diff --git a/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp b/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp index 593591046..270cde5dd 100644 --- a/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp +++ b/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp @@ -96,9 +96,6 @@ #ifdef USE_MoCA_PROFILE #include "Device_MoCA_Interface.h" #endif -#ifdef USE_XRESRC -#include "Device_XComcast_Xcalibur_Client_XRE_ConnectionTable.h" -#endif #include "hostIf_NotificationHandler.h" #include "safec_lib.h" @@ -111,7 +108,6 @@ #define FORWARD_SSH_FILE "/opt/secure/.RFC_ForwardSSH" #define GATEWAY_NAME_SIZE 4 #define IPREMOTE_SUPPORT_STATUS_FILE "/opt/.ipremote_status" -#define XRE_CONTAINER_SUPPORT_STATUS_FILE "/opt/XRE_container_enable" #define IPREMOTE_INTERFACE_INFO "/tmp/ipremote_interface_info" #define MODEL_NAME_FILE "/tmp/.model" #define IUI_VERSION_FILE "/tmp/.iuiVersion" @@ -2029,7 +2025,6 @@ int hostIf_DeviceInfo::get_Device_DeviceInfo_MemoryStatus_Free (HOSTIF_MsgData_t * Joining MoCA Network * Connection successful * Acquiring IP Address from Gateway - * Contacting XRE * * @param[out] stMsgData TR-069 Host interface message request. * @param[in] pChanged Status of the operation. @@ -2058,23 +2053,6 @@ int hostIf_DeviceInfo::get_Device_DeviceInfo_X_RDKCENTRAL_COM_BootStatus (HOSTIF mocaStatus = mIf->check_MoCABootStatus(statusStr); #endif - /** - * Check for Xre Connection State - * 4. XRE connection established - Successful - */ - -#ifdef USE_XRESRC - if(get_Device_X_COMCAST_COM_Xcalibur_Client_XRE_ConnectionTable_xreConnStatus(stMsgData) == OK) - { - const char* xreConn = "XRE connection established - Successful"; - - if(strcasecmp(stMsgData->paramValue, "Connected" ) == 0) { - memset(stMsgData->paramValue, '\0', TR69HOSTIFMGR_MAX_PARAM_LEN); - snprintf(statusStr, TR69HOSTIFMGR_MAX_PARAM_LEN -1, xreConn); - } - } -#endif /*USE_XRESRC*/ - RDK_LOG(RDK_LOG_DEBUG,LOG_TR69HOSTIF,"[%s:%s] BootStatus string: %s \n", __FILE__, __FUNCTION__, statusStr); strncpy(stMsgData->paramValue, statusStr, TR69HOSTIFMGR_MAX_PARAM_LEN); stMsgData->paramLen = strlen(statusStr); @@ -3783,10 +3761,6 @@ int hostIf_DeviceInfo::set_xRDKCentralComRFC(HOSTIF_MsgData_t * stMsgData) { ret = set_xRDKCentralComDABRFCEnable(stMsgData); } - else if (strcasecmp(stMsgData->paramName,XRE_CONTAINER_RFC_ENABLE) == 0) - { - ret = set_xRDKCentralComXREContainerRFCEnable(stMsgData); - } else if (strcasecmp(stMsgData->paramName,RFC_CTL_RETRIEVE_NOW) == 0) { ret = set_xRDKCentralComRFCRetrieveNow(stMsgData); @@ -4485,52 +4459,6 @@ int hostIf_DeviceInfo::set_xRDKCentralComDABRFCEnable(HOSTIF_MsgData_t *stMsgDat return ret; } -int hostIf_DeviceInfo::set_xRDKCentralComXREContainerRFCEnable(HOSTIF_MsgData_t *stMsgData) -{ - int ret = NOK; - bool enable; - LOG_ENTRY_EXIT; - if(stMsgData->paramtype == hostIf_BooleanType) - { - enable = get_boolean(stMsgData->paramValue); - if( enable ) - { - RDK_LOG (RDK_LOG_INFO, LOG_TR69HOSTIF,"[%s] XRE_ContainerSupport enable request\n", __FUNCTION__); - ofstream ofp(XRE_CONTAINER_SUPPORT_STATUS_FILE); - RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s] Created File %s, XRE_ContainerSupport is enabled\n", __FUNCTION__, XRE_CONTAINER_SUPPORT_STATUS_FILE); - ret = OK; - } - else - { - RDK_LOG (RDK_LOG_INFO, LOG_TR69HOSTIF,"[%s] XRE_ContainerSupport disable request\n", __FUNCTION__); - ifstream ifp(XRE_CONTAINER_SUPPORT_STATUS_FILE); - if(ifp.is_open()) - { - ifp.close(); - if(remove(XRE_CONTAINER_SUPPORT_STATUS_FILE) == 0) - { - RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s] Removed File %s, XRE_ContainerSupport is disabled\n", __FUNCTION__, XRE_CONTAINER_SUPPORT_STATUS_FILE); - ret = OK; - } - else - { - RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s] Unable to remove File %s, XRE_ContainerSupport Status unchanged\n", __FUNCTION__, XRE_CONTAINER_SUPPORT_STATUS_FILE); - } - } - else - { - RDK_LOG(RDK_LOG_INFO,LOG_TR69HOSTIF,"[%s] File %s is already removed, XRE_ContainerSupport is disabled already\n", __FUNCTION__, XRE_CONTAINER_SUPPORT_STATUS_FILE); - ret = OK; - } - } - } - else - { - RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF,"[%s:%d] Failed due to wrong data type for %s, please use boolean(0/1) to set.\n", __FUNCTION__, __LINE__, stMsgData->paramName); - } - return ret; -} - void executeRfcMgr() { diff --git a/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.h b/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.h index 9e4e40671..e66a878da 100644 --- a/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.h +++ b/src/hostif/profiles/DeviceInfo/Device_DeviceInfo.h @@ -168,7 +168,6 @@ #define MS12_DE_RFC_ENABLE "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.MS12.DE_Enable" #define LE_RFC_ENABLE "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.LoudnessEquivalence.Enable" #define DAB_RFC_ENABLE "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DAB.Enable" -#define XRE_CONTAINER_RFC_ENABLE "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.LXC.XRE.Enable" #define TR181_AUTOREBOOT_ENABLE "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.AutoReboot.Enable" #define SHORTS_RFC_ENABLE "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.SHORTS.Enable" /* Profile: X_RDKCENTRAL-COM_RFC.Control */ @@ -292,7 +291,6 @@ class hostIf_DeviceInfo { int set_xRDKCentralComTelemetryRFCEnable(HOSTIF_MsgData_t *); int set_xRDKCentralComDABRFCEnable(HOSTIF_MsgData_t *stMsgData); - int set_xRDKCentralComXREContainerRFCEnable(HOSTIF_MsgData_t *); int set_xRDKCentralComRFCLoudnessEquivalenceEnable(HOSTIF_MsgData_t *); // This is to set wl roam_trigger @@ -329,19 +327,14 @@ class hostIf_DeviceInfo { FRIEND_TEST(deviceTest, getEstbIp); FRIEND_TEST(deviceTest, NewNtpEnable); FRIEND_TEST(deviceTest, set_xRDKCentralComRFCLoudnessEquivalenceEnable); - FRIEND_TEST(deviceTest, set_xRDKCentralComXREContainerRFCEnable); - FRIEND_TEST(deviceTest, set_xRDKCentralComXREContainerRFCDisable); - FRIEND_TEST(deviceTest, set_xRDKCentralComXREContainerRFCInvalidtype); FRIEND_TEST(deviceTest, set_xOpsRPCRebootPendingNotification); FRIEND_TEST(deviceTest, set_xRDKCentralComApparmorBlocklist); FRIEND_TEST(deviceTest, set_xOpsRPCFwDwldCompletedNotification); FRIEND_TEST(deviceTest, set_xOpsRPCFwDwldStartedNotification); FRIEND_TEST(deviceTest, set_xOpsRPCDevManageableNotification); - FRIEND_TEST(deviceTest, set_xRDKCentralComXREContainerRFCEnable); FRIEND_TEST(deviceTest, get_xOpsRPCFwDwldCompletedNotification); FRIEND_TEST(deviceInfoTest, findLocalPortAvailable); FRIEND_TEST(deviceTest, set_xRDKCentralComRFCRetrieveNow); - FRIEND_TEST(deviceTest, set_xRDKCentralComXREContainerRFCEnable); FRIEND_TEST(deviceTest, set_xOpsRPCDevManageableNotification); FRIEND_TEST(deviceTest, get_xOpsRPCFwDwldCompletedNotification); FRIEND_TEST(deviceTest, set_xOpsRPCRebootPendingNotification); @@ -361,7 +354,6 @@ class hostIf_DeviceInfo { FRIEND_TEST(deviceTest, set_xRDKCentralComRFCRoamTrigger); FRIEND_TEST(deviceTest, set_xRDKCentralComRFCLoudnessEquivalenceEnable_InvalidType); FRIEND_TEST(deviceTest, set_xRDKCentralComRFCAutoRebootEnable_Invalidtype); - FRIEND_TEST(deviceTest, set_xRDKCentralComXREContainerRFCEnable_FileRemoved); FRIEND_TEST(deviceTest, NewNtpEnable_Disable_FileRemoved); FRIEND_TEST(deviceTest, get_xRDKCentralComRFCAccountId); #endif @@ -1045,7 +1037,6 @@ class hostIf_DeviceInfo { * Connection successful * Acquiring IP Address from Gateway * Contacting ACS - * Contacting XRE * * @return The status of the operation. When read, this parameter returns an enumeration string. * diff --git a/src/hostif/profiles/DeviceInfo/Makefile.am b/src/hostif/profiles/DeviceInfo/Makefile.am index 3206b2c63..acc30e177 100755 --- a/src/hostif/profiles/DeviceInfo/Makefile.am +++ b/src/hostif/profiles/DeviceInfo/Makefile.am @@ -24,9 +24,7 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/hostif/include \ -I$(top_srcdir)/src/hostif/handlers/include \ -I$(top_srcdir)/src/hostif/handlers/src \ -I$(top_srcdir)/src/hostif/profiles/moca \ --I$(top_srcdir)/src/hostif/profiles/X_COMCAST-COM/X_COMCAST-COM_Xcalibur/include \ --I$(top_srcdir)/src/hostif/profiles/moca \ -$(GLIB_CFLAGS) $(G_THREAD_CFLAGS) $(XREMGR_FLAGS) $(MOCAMGR_FLAGS) $(PROCPS_CFLAGS) $(YOCTO_FLAG) \ +$(GLIB_CFLAGS) $(G_THREAD_CFLAGS) $(MOCAMGR_FLAGS) $(PROCPS_CFLAGS) $(YOCTO_FLAG) \ -I=/usr/include/rdk/iarmbus/ \ -I=/usr/include/rdk/iarmmgrs/mfr/ \ -I=/usr/include/rdk/iarmmgrs-hal/ \ diff --git a/src/hostif/profiles/DeviceInfo/gtest/gtest_main.cpp b/src/hostif/profiles/DeviceInfo/gtest/gtest_main.cpp index 07dff15a1..5407b4353 100644 --- a/src/hostif/profiles/DeviceInfo/gtest/gtest_main.cpp +++ b/src/hostif/profiles/DeviceInfo/gtest/gtest_main.cpp @@ -898,103 +898,6 @@ TEST(deviceTest, get_Device_DeviceInfo_FirstUseDate_FileRemoved) { } } -TEST(deviceTest, set_xRDKCentralComXREContainerRFCDisable) { - HOSTIF_MsgData_t param; - bool bChanged; - int instanceNumber = 0; - memset(¶m,0,sizeof(HOSTIF_MsgData_t)); - param.reqType = HOSTIF_SET; - strncpy (param.paramName, "Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable", TR69HOSTIFMGR_MAX_PARAM_LEN - 1); - param.bsUpdate = HOSTIF_NONE; - param.requestor = HOSTIF_SRC_RFC; - - put_boolean(param.paramValue, false); - param.paramtype = hostIf_BooleanType; - param.paramLen = sizeof(hostIf_BooleanType); - - hostIf_DeviceInfo *pIface = hostIf_DeviceInfo::getInstance(instanceNumber); - if(pIface) - { - bChanged = false; - int ret = pIface->set_xRDKCentralComXREContainerRFCEnable(¶m); - cout << "param.paramValue = " << param.paramValue << endl; - EXPECT_EQ(ret, OK); - } -} - -TEST(deviceTest, set_xRDKCentralComXREContainerRFCInvalidtype) { - HOSTIF_MsgData_t param; - bool bChanged; - int instanceNumber = 0; - memset(¶m,0,sizeof(HOSTIF_MsgData_t)); - param.reqType = HOSTIF_SET; - strncpy (param.paramName, "Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable", TR69HOSTIFMGR_MAX_PARAM_LEN - 1); - param.bsUpdate = HOSTIF_NONE; - param.requestor = HOSTIF_SRC_RFC; - - strncpy(param.paramValue, "TestName2", TR69HOSTIFMGR_MAX_PARAM_LEN - 1); - param.paramtype = hostIf_StringType; - param.paramLen = strlen(param.paramValue); - - hostIf_DeviceInfo *pIface = hostIf_DeviceInfo::getInstance(instanceNumber); - if(pIface) - { - bChanged = false; - int ret = pIface->set_xRDKCentralComXREContainerRFCEnable(¶m); - cout << "param.paramValue = " << param.paramValue << endl; - EXPECT_EQ(ret, NOK); - } -} - -TEST(deviceTest, set_xRDKCentralComXREContainerRFCEnable) { - HOSTIF_MsgData_t param; - bool bChanged; - int instanceNumber = 0; - memset(¶m,0,sizeof(HOSTIF_MsgData_t)); - param.reqType = HOSTIF_SET; - strncpy (param.paramName, "Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable", TR69HOSTIFMGR_MAX_PARAM_LEN - 1); - param.bsUpdate = HOSTIF_NONE; - param.requestor = HOSTIF_SRC_RFC; - - put_boolean(param.paramValue, true); - param.paramtype = hostIf_BooleanType; - param.paramLen = sizeof(hostIf_BooleanType); - - hostIf_DeviceInfo *pIface = hostIf_DeviceInfo::getInstance(instanceNumber); - if(pIface) - { - bChanged = false; - int ret = pIface->set_xRDKCentralComXREContainerRFCEnable(¶m); - cout << "param.paramValue = " << param.paramValue << endl; - EXPECT_EQ(ret, OK); - } -} - -TEST(deviceTest, set_xRDKCentralComXREContainerRFCEnable_FileRemoved) { - std::remove("/opt/XRE_container_enable"); - HOSTIF_MsgData_t param; - bool bChanged; - int instanceNumber = 0; - memset(¶m,0,sizeof(HOSTIF_MsgData_t)); - param.reqType = HOSTIF_SET; - strncpy (param.paramName, "Device.X_COMCAST-COM_Xcalibur.Client.XRE.xreEnable", TR69HOSTIFMGR_MAX_PARAM_LEN - 1); - param.bsUpdate = HOSTIF_NONE; - param.requestor = HOSTIF_SRC_RFC; - - put_boolean(param.paramValue, false); - param.paramtype = hostIf_BooleanType; - param.paramLen = sizeof(hostIf_BooleanType); - - hostIf_DeviceInfo *pIface = hostIf_DeviceInfo::getInstance(instanceNumber); - if(pIface) - { - bChanged = false; - int ret = pIface->set_xRDKCentralComXREContainerRFCEnable(¶m); - cout << "param.paramValue = " << param.paramValue << endl; - EXPECT_EQ(ret, OK); - } -} - TEST(deviceTest, set_xOpsRPCDevManageableNotification) { HOSTIF_MsgData_t param; bool bChanged; @@ -3605,30 +3508,6 @@ TEST(deviceTest, set_xRDKCentralComRFC_RebootStopEnable_AUTOREBOOT) } } -TEST(deviceTest, set_xRDKCentralComRFC_RebootStopEnable_XRE_CONTAINER_RFC_ENABLE) -{ - int instanceNumber = 0; - bool pChanged; - HOSTIF_MsgData_t param = { 0 }; - memset(¶m,0,sizeof(HOSTIF_MsgData_t)); - param.reqType = HOSTIF_SET; - strncpy (param.paramName, "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.LXC.XRE.Enable", TR69HOSTIFMGR_MAX_PARAM_LEN - 1); - param.bsUpdate = HOSTIF_NONE; - param.requestor = HOSTIF_SRC_RFC; - - put_boolean(param.paramValue, true); - param.paramtype = hostIf_BooleanType; - param.paramLen = sizeof(hostIf_BooleanType); - - hostIf_DeviceInfo *pIface = hostIf_DeviceInfo::getInstance(instanceNumber); - if(pIface) - { - int ret = pIface->set_xRDKCentralComRFC(¶m); - cout << "msgData.paramValue = " << param.paramValue << endl; - EXPECT_EQ(ret, OK); - } -} - TEST(deviceTest, set_xRDKCentralComRFCRoamTrigger) { int instanceNumber = 0; diff --git a/src/integrationtest/conf/mgrlist.conf b/src/integrationtest/conf/mgrlist.conf index 3a162b07d..bd585c5dc 100644 --- a/src/integrationtest/conf/mgrlist.conf +++ b/src/integrationtest/conf/mgrlist.conf @@ -1,13 +1,13 @@ -Device.DeviceInfo deviceMgr -Device.Services.STBService dsMgr -Device.Services.StorageService storageSrvcMgr -Device.MoCA mocaMgr -Device.X_COMCAST-COM_Xcalibur xreMgr -Device.Ethernet ethernetMgr -Device.IP ipMgr -Device.Time timeMgr -Device.DHCPv4 dhcpv4Mgr -Device.InterfaceStack ifStackMgr -Device.X_RDK_WebConfig webConfigMgr -Device.X_RDKCENTRAL-COM_T2 telemetryMgr -Device.X_RDK_ rdkProfileMgr \ No newline at end of file +Device.DeviceInfo deviceMgr +Device.Services.STBService dsMgr +Device.Services.StorageService storageSrvcMgr +Device.MoCA mocaMgr +Device.X_COMCAST-COM_Xcalibur.Client xreMgr +Device.Ethernet ethernetMgr +Device.IP ipMgr +Device.Time timeMgr +Device.DHCPv4 dhcpv4Mgr +Device.InterfaceStack ifStackMgr +Device.X_RDK_WebConfig webConfigMgr +Device.X_RDKCENTRAL-COM_T2 telemetryMgr +Device.X_RDK_ rdkProfileMgr