Feature/rdkemw 14685 by Abhinavpv28 · Pull Request #369 · rdkcentral/tr69hostif

Abhinavpv28 · 2026-02-27T11:38:55Z

No description provided.

Copilot

Pull request overview

This PR appears to add support for the Device.DeviceInfo.ProductClass parameter in the WALDB data model and updates the DeviceInfo implementation to source the ProductClass value from device.properties (via fwutils).

Changes:

Link DeviceInfo profile against libfwutils and include fwutils header(s).
Re-implement get_Device_DeviceInfo_ProductClass to read DEVICE_NAME from device.properties.
Add ProductClass to the STB and TV WALDB data model XMLs under Device.DeviceInfo.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.

File	Description
`src/hostif/profiles/DeviceInfo/Makefile.am`	Adds `-lfwutils` to link DeviceInfo against fwutils for device property access.
`src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp`	Changes ProductClass getter to read `DEVICE_NAME` from `device.properties` using fwutils.
`src/hostif/parodusClient/waldb/data-model/data-model-tv.xml`	Exposes `Device.DeviceInfo.ProductClass` in the TV data model.
`src/hostif/parodusClient/waldb/data-model/data-model-stb.xml`	Exposes `Device.DeviceInfo.ProductClass` in the STB data model.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-27T11:43:06Z

+int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData)
 {


The function signature was changed to remove the bool *pChanged parameter, but the class header still declares get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t *, bool *pChanged = NULL) and there are existing call sites that pass a second argument (e.g., notification/value-changed paths). This will cause a build break and also removes change-detection behavior relied on for notifications. Please either restore the pChanged parameter (and implement change detection as before) or update the header and all callers/notification logic consistently.

rdkcmf-jenkins · 2026-02-27T11:51:47Z

 * @ingroup TR69_HOSTIF_DEVICEINFO_API
 */
-int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData, bool *pChanged)
+int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData)


Coverity issue no longer present as of: undefined

Show issue

Coverity Issue - Parse recovery warning

declaration is incompatible with "int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t *, bool *)" (declared at line 511 of "Device_DeviceInfo.h")

Low Impact, CWE-none
RW.NOT_COMPATIBLE_WITH_PREVIOUS_DECL

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-27T12:38:39Z

     * @see get_Device_DeviceInfo_ProductClass.
     */
-    int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *, bool *pChanged = NULL);
+    int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *);


The test code in gtest_main.cpp (lines 681, 699) still calls get_Device_DeviceInfo_SoftwareVersion with two parameters (including &bChanged), but the header signature was changed to only accept one parameter. This will cause test compilation failures.

Suggested change

int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *);

int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *, bool *pChanged = NULL);

Copilot · 2026-02-27T12:38:39Z

     * @see get_Device_DeviceInfo_ProductClass.
     */
-    int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *, bool *pChanged = NULL);
+    int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *);


The header file declares that get_Device_DeviceInfo_SoftwareVersion no longer has the second parameter (bool *pChanged), but the implementation in Device_DeviceInfo.cpp at line 447 still has the old signature with the bool *pChanged parameter. This mismatch will cause compilation errors. Additionally, call sites in hostIf_DeviceClient_ReqHandler.cpp (line 1146) still pass two parameters to this function. Either the implementation and all call sites need to be updated to match this header change, or this header change should be reverted.

Suggested change

int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *);

int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *, bool *pChanged = NULL);

Copilot · 2026-02-27T12:38:40Z

 * @ingroup TR69_HOSTIF_DEVICEINFO_API
 */
-int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData, bool *pChanged)
+int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData)


The documentation comment (lines 845-846) still references the pChanged parameter which was removed from the function signature. This outdated documentation should be updated to match the new function signature.

rdkcmf-jenkins · 2026-02-27T12:44:27Z

Coverity Issue - Parse recovery warning

declaration is incompatible with "int hostIf_DeviceInfo::get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *)" (declared at line 578 of "Device_DeviceInfo.h")

Low Impact, CWE-none
RW.NOT_COMPATIBLE_WITH_PREVIOUS_DECL

Issue location

This issue was discovered outside the diff for this Pull Request. You can find it at:
src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp:447

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-27T18:03:48Z

-    return ret;
-#endif /* FETCH_PRODUCTCLASS_FROM_MFRLIB */
+    fclose(fp);
+	strncpy((char *)stMsgData->paramValue, device_name,sizeof(stMsgData->paramValue)-1);


After copying device_name into stMsgData->paramValue, the code doesn’t ensure NUL-termination and doesn’t update stMsgData->paramLen. Other getters in this file set both, and downstream serialization/response formatting relies on paramLen being accurate.

Suggested change

strncpy((char *)stMsgData->paramValue, device_name,sizeof(stMsgData->paramValue)-1);

size_t bufSize = sizeof(stMsgData->paramValue);

if (bufSize > 0)

{

strncpy((char *)stMsgData->paramValue, device_name, bufSize - 1);

((char *)stMsgData->paramValue)[bufSize - 1] = '\0';

stMsgData->paramLen = strlen((char *)stMsgData->paramValue);

}

Copilot · 2026-02-27T18:03:48Z

 int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData, bool *pChanged)
 {
-    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s()]\n", __FUNCTION__);
    stMsgData->paramtype = hostIf_StringType;
+    RDK_LOG(RDK_LOG_TRACE1,LOG_TR69HOSTIF,"[%s()]\n", __FUNCTION__);



The Doxygen comment for get_Device_DeviceInfo_ProductClass (immediately above this function) still states “Currently not implemented” and describes a -1 return, but the function is now implemented and returns OK/NOK. Please update the comment block to match the current behavior and document that the value is read from /etc/device.properties (key DEVICE_NAME).

Copilot · 2026-02-27T18:03:48Z

 AM_CXXFLAGS += $(BLE_TILE_PROFILE)
 endif
-
+AM_LDFLAGS = -lfwutils


AM_LDFLAGS is being reassigned to -lfwutils, which overwrites the existing link flags declared earlier in this Makefile (and any conditionally appended flags). This will drop required libs like -lIARMBus, -lrbus, etc. If fwutils is needed, append it (or add it to the libtool library’s *_LIBADD) rather than replacing the whole variable.

Suggested change

AM_LDFLAGS = -lfwutils

AM_LDFLAGS += -lfwutils

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-27T18:17:41Z

+    fclose(fp);
+    strncpy((char *)stMsgData->paramValue, device_name,sizeof(stMsgData->paramValue)-1);
+    return OK;


get_Device_DeviceInfo_ProductClass populates stMsgData->paramValue but never sets stMsgData->paramLen, which can lead to truncated/incorrect responses for callers that rely on paramLen. Also, strncpy(..., sizeof(paramValue)-1) will pad thousands of NUL bytes unnecessarily. Populate paramValue with a bounded formatting/copy that guarantees NUL-termination, then set paramLen to the resulting string length.

Copilot · 2026-02-27T18:17:42Z

+    while (fgets(line, sizeof(line), fp)) {
+        if (strncmp(line, "DEVICE_NAME=", 12) == 0) {
+            char *value = line + 12;
+            value[strcspn(value, "\r\n")] = 0;
+            strncpy(device_name, value, sizeof(device_name) - 1);
+            device_name[sizeof(device_name) - 1] = '\0';
+            break;
        }
    }
-    else
-    {
-        RDK_LOG(RDK_LOG_ERROR,LOG_TR69HOSTIF, "Failed in IARM_Bus_Call() for parameter : %s [param.type:%d with error code:%d]\n",stMsgData->paramName,param.type, ret);
-        ret = NOK;
-    }
-    return ret;
-#endif /* FETCH_PRODUCTCLASS_FROM_MFRLIB */
+    fclose(fp);
+    strncpy((char *)stMsgData->paramValue, device_name,sizeof(stMsgData->paramValue)-1);
+    return OK;


pChanged/backupProductClass/bCalledProductClass are part of this class’s change-notification pattern (used by other DeviceInfo getters), but this updated implementation no longer sets *pChanged or updates the backup value when ProductClass changes. To keep value-change notifications consistent, compare against backupProductClass, set *pChanged = true when it differs, and update the backup + bCalledProductClass.

Abhinavpv28 added 9 commits February 27, 2026 13:10

Add ProductClass parameter to Device.DeviceInfo object

14c82a8

Update Device_DeviceInfo.h

2bd90c9

Update data-model-stb.xml

5e6b2e8

Add ProductClass parameter to data-model-tv.xml

ad98d5d

Update Device_DeviceInfo.h

3aaad54

Update data-model-generic.xml

c488971

Update data-model-generic.xml

94c3fc1

Update Device_DeviceInfo.cpp

19d2dae

Update Makefile.am

44d683b

Abhinavpv28 requested a review from a team as a code owner February 27, 2026 11:38

Copilot AI review requested due to automatic review settings February 27, 2026 11:38

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 11:39 View session

Copilot AI reviewed Feb 27, 2026

View reviewed changes

rdkcmf-jenkins reviewed Feb 27, 2026

View reviewed changes

Abhinavpv28 added 2 commits February 27, 2026 18:01

Update Device_DeviceInfo.h

68a8a4b

Update Device_DeviceInfo.h

3b4d46c

Copilot AI review requested due to automatic review settings February 27, 2026 12:33

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 12:34 View session

Copilot AI reviewed Feb 27, 2026

View reviewed changes

Update Device_DeviceInfo.cpp

bff1dff

Copilot AI review requested due to automatic review settings February 27, 2026 12:41

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 12:42 View session

rdkcmf-jenkins reviewed Feb 27, 2026

View reviewed changes

Comment thread src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp

Copilot AI reviewed Feb 27, 2026

View reviewed changes

Comment thread src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp Outdated

Comment thread src/hostif/profiles/DeviceInfo/Device_DeviceInfo.cpp Outdated

Abhinavpv28 added 2 commits February 27, 2026 18:40

Update Device_DeviceInfo.h

b8d6d73

Update Device_DeviceInfo.h

e24341c

Copilot AI review requested due to automatic review settings February 27, 2026 13:13

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 13:13 View session

Copilot AI reviewed Feb 27, 2026

View reviewed changes

Comment thread src/hostif/profiles/DeviceInfo/Makefile.am Outdated

Update Device_DeviceInfo.h

1de0fd9

Copilot AI review requested due to automatic review settings February 27, 2026 13:28

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 13:31 View session

Copilot AI reviewed Feb 27, 2026

View reviewed changes

Abhinavpv28 added 2 commits February 27, 2026 22:14

Update Makefile.am

fee4598

Update Device_DeviceInfo.cpp

fe9de43

Copilot AI review requested due to automatic review settings February 27, 2026 17:59

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 17:59 View session

Copilot AI reviewed Feb 27, 2026

View reviewed changes

Update Makefile.am

8294a1a

Copilot AI review requested due to automatic review settings February 27, 2026 18:12

Copilot started reviewing on behalf of Abhinavpv28 February 27, 2026 18:12 View session

Abhinavpv28 and others added 2 commits February 27, 2026 23:45

Add C++11 standard flag to DeviceInfo Makefile

aa60da6

Apply suggestion from @Copilot

be09331

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Feb 27, 2026

View reviewed changes

		int hostIf_DeviceInfo::get_Device_DeviceInfo_ProductClass(HOSTIF_MsgData_t * stMsgData)
		{

	int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t *);
	int get_Device_DeviceInfo_SoftwareVersion(HOSTIF_MsgData_t , bool pChanged = NULL);

-	strncpy((char *)stMsgData->paramValue, device_name,sizeof(stMsgData->paramValue)-1);
+    size_t bufSize = sizeof(stMsgData->paramValue);
+    if (bufSize > 0)
+    {
+        strncpy((char *)stMsgData->paramValue, device_name, bufSize - 1);
+        ((char *)stMsgData->paramValue)[bufSize - 1] = '\0';
+        stMsgData->paramLen = strlen((char *)stMsgData->paramValue);
+    }

Conversation

Abhinavpv28 commented Feb 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rdkcmf-jenkins Feb 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Coverity Issue - Parse recovery warning

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rdkcmf-jenkins commented Feb 27, 2026

Coverity Issue - Parse recovery warning

Issue location

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 27, 2026

Choose a reason for hiding this comment

Uh oh!

rdkcmf-jenkins Feb 27, 2026 •

edited

Loading