RDKB-63098: Handle IPv6 delegation for business vs residential Partner ID as part of single build by rirfha948 · Pull Request #188 · rdkcentral/wan-manager

rirfha948 · 2026-02-19T04:46:51Z

Reason for change: Added One Stack MACRO handling
Test Procedure:

TBD
Risks: None
Priority: P1
Signed-off-by: rirfha948 rasina_irfhan@comcast.com

Is this a Bug or a User Story (US)?

User Story

If it is a User Story:
- Have all dependent PRs from other components been listed (if any)?
- Does the commit message include both the User Story ticket and the Subtask ticket?

Yes
* Will be all changes related to the User Story squashed and merged in a single commit?
No
* Has the PR been raised only after completing all changes for the User Story (no partial changes)?
Yes
* Has code development for the User Story been completed?
* If yes, has the Gerrit topic or list of all dependent PRs across components (including meta-layer changes) been shared?
Yes

Is there a validation log available in the Jira ticket for verifying builds with the updated generic-srcrev.inc across all platforms?
- If yes, have the links to validation comments been shared?

Reason for change: Added Single Build- OneStack handling Test Procedure: - TBD Risks: None Priority: P3 Signed-off-by: rirfha948 <rasina_irfhan@comcast.com>

Copilot

Pull request overview

This pull request implements runtime feature detection for IPv6 delegation to support both business and residential Partner IDs in a single build for OneStack products. The changes introduce the _ONESTACK_PRODUCT_REQ_ macro and use the isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION) function to determine at runtime whether IPv6 delegation should be enabled, replacing the previous compile-time-only approach.

Changes:

Added runtime feature detection using isFeatureSupportedInCurrentMode() to conditionally enable IPv6 delegation based on product mode
Integrated rdkb_feature_mode_gate library and related OneStack dependencies into the build system
Modified DHCPv6 client operations (start/stop) and prefix handling logic to support both delegation modes in a single binary

Reviewed changes

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

File	Description
source/WanManager/wanmgr_dhcpv6_apis.c	Added runtime feature detection for DHCPv6 client operations and IPv6 prefix delegation/handling with conditional compilation using `_ONESTACK_PRODUCT_REQ_`
source/WanManager/wanmgr_dhcp_legacy_apis.c	Updated legacy DHCPv6 APIs with runtime feature checks for prefix length handling and server restart operations
source/WanManager/Makefile.am	Added linker dependencies for OneStack libraries (devicemode, onestack_syscfg, onestack_log, rdkb_feature_mode_gate)
configure.ac	Added AM_CONDITIONAL for ONESTACK_PRODUCT_REQ to enable OneStack feature detection in the build system

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

Copilot · 2026-02-19T04:51:52Z

source/WanManager/wanmgr_dhcpv6_apis.c

+#ifdef _ONESTACK_PRODUCT_REQ_
+	if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+	{
+


There is an empty line (line 453) inside the if block that serves no purpose. This should be removed to maintain clean code formatting and consistency with the rest of the codebase.

Suggested change

Copilot · 2026-02-19T04:51:52Z

source/WanManager/wanmgr_dhcpv6_apis.c

+#if defined(_ONESTACK_PRODUCT_REQ_)
+    if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
+    { 


There is trailing whitespace after the opening brace on line 2203. This should be removed to maintain clean code formatting.

Suggested change

{

{

Copilot · 2026-02-19T04:51:53Z

source/WanManager/wanmgr_dhcpv6_apis.c

+	{
+	    sysevent_set(sysevent_fd, sysevent_token, "dhcpv6_client-start", "", 0);
+	}
+	else 


There is trailing whitespace after "else" on line 575. This should be removed to maintain clean code formatting.

Suggested change

else

else

Copilot · 2026-02-19T04:51:53Z

source/WanManager/wanmgr_dhcpv6_apis.c

+#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+#if defined(_ONESTACK_PRODUCT_REQ_)
+		    if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
+		    {
+			/* Use the delegated prefix length directly for platforms that support prefix delegation to LAN clients */
+			strncpy(prefix, pVirtIf->IP.Ipv6Data.sitePrefix, sizeof(prefix) - 1);
+		    }
+#endif
+#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+#if defined(_ONESTACK_PRODUCT_REQ_)
+		    if (!isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
+		    {
+			strncat(prefix, "/64", sizeof(prefix) - 1);
+		    }
 #endif
-                    sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIELD_IPV6_PREFIX, prefix, 0);
+		    sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIELD_IPV6_PREFIX, prefix, 0);


The indentation in this block uses tabs instead of spaces, which is inconsistent with the surrounding code. Lines 1811-1828 appear to use hard tabs for indentation, while the codebase generally uses spaces for indentation. This inconsistency should be corrected to maintain uniform code style.

Copilot · 2026-02-19T04:51:53Z

source/WanManager/wanmgr_dhcpv6_apis.c

+	    if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
+	    {
+		/* Use the delegated prefix length directly for platforms that support prefix delegation to LAN clients */
+		strncpy(lanPrefix, pVirtIf->IP.Ipv6Data.sitePrefix, sizeof(lanPrefix) - 1);
+	    }
+#endif
+#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+#if defined(_ONESTACK_PRODUCT_REQ_)
+	    if (!isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
+	    {
+		strncat(lanPrefix, "/64", sizeof(lanPrefix) - strlen(lanPrefix) - 1);
+	    }


The indentation in this block uses tabs instead of spaces, which is inconsistent with the surrounding code. This inconsistency should be corrected to maintain uniform code style.

Suggested change

if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))

#endif

{

/* Use the delegated prefix length directly for platforms that support prefix delegation to LAN clients */

strncpy(lanPrefix, pVirtIf->IP.Ipv6Data.sitePrefix, sizeof(lanPrefix) - 1);

}

#endif

#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)

#if defined(_ONESTACK_PRODUCT_REQ_)

if (!isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))

#endif

{

strncat(lanPrefix, "/64", sizeof(lanPrefix) - strlen(lanPrefix) - 1);

}

if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))

#endif

{

/* Use the delegated prefix length directly for platforms that support prefix delegation to LAN clients */

strncpy(lanPrefix, pVirtIf->IP.Ipv6Data.sitePrefix, sizeof(lanPrefix) - 1);

}

#endif

#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)

#if defined(_ONESTACK_PRODUCT_REQ_)

if (!isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))

#endif

{

strncat(lanPrefix, "/64", sizeof(lanPrefix) - strlen(lanPrefix) - 1);

}

Copilot · 2026-02-19T04:51:54Z

source/WanManager/wanmgr_dhcpv6_apis.c

@@ -548,15 +567,30 @@ static int _dibbler_client_operation(char * arg)
        /*TCXB6 is also calling service_dhcpv6_client.sh but the actuall script is installed from meta-rdk-oem layer as the intel specific code
         had to be removed */
        CcspTraceInfo(("%s  Callin service_dhcpv6_client.sh enable \n", __func__));


Spelling error: "Callin" should be "Calling". This typo exists in the comment on line 569 and is visible in the context of this change.

Suggested change

CcspTraceInfo(("%s Callin service_dhcpv6_client.sh enable \n", __func__));

CcspTraceInfo(("%s Calling service_dhcpv6_client.sh enable \n", __func__));

Copilot · 2026-02-19T04:51:54Z

source/WanManager/wanmgr_dhcp_legacy_apis.c

-/* handle message from wan dchcp6 client */
-    WanMgr_DmlDhcpv6SMsgHandler(NULL);
-
+    #ifdef _ONESTACK_PRODUCT_REQ_


The preprocessor directive is indented with spaces, which is inconsistent with standard C preprocessor directive style. Preprocessor directives typically start at column 0. While this code will compile correctly, it deviates from conventional style.

Suggested change

#ifdef _ONESTACK_PRODUCT_REQ_

#ifdef _ONESTACK_PRODUCT_REQ_

Copilot · 2026-02-19T04:51:54Z

source/WanManager/wanmgr_dhcp_legacy_apis.c

+#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+    #if defined(_ONESTACK_PRODUCT_REQ_)
+    if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+    #endif
+    {
                            sprintf(v6pref+strlen(v6pref), "/%d", pref_len);
-#else
+    }
+#endif
+#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+    #if defined(_ONESTACK_PRODUCT_REQ_)
+    if (!isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+    #endif
+    {
                            sprintf(v6pref+strlen(v6pref), "/%d", 64);
+    }


The indentation in this section uses mixed indentation styles - preprocessor directives with leading spaces and inconsistent indentation of the if statement and braces. This should be normalized to follow consistent indentation standards throughout the file.

Copilot · 2026-02-19T04:51:54Z

source/WanManager/wanmgr_dhcpv6_apis.c

+#if (defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) && ! defined(DHCPV6_PREFIX_FIX)) || defined(_ONESTACK_PRODUCT_REQ_)
+#if defined(_ONESTACK_PRODUCT_REQ_)
+    if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
+    { 
+	CcspTraceWarning(("%s: setting dhcpv6_server-restart\n", __FUNCTION__));
+	sysevent_set(sysevent_fd, sysevent_token, "dhcpv6_server-restart", "", 0);
+    }
+#endif
+#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+#if defined(_ONESTACK_PRODUCT_REQ_)
+    if (!isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
+#endif
    {
-        fprintf(stderr, "open dhcpv6 server restart fifo when writing.\n");
-        return 1;
+	// Below code copied from CosaDmlDHCPv6sTriggerRestart(FALSE) PAm function.
+	int fd = 0;
+	char str[32] = "restart";
+	fd= open(DHCPS6V_SERVER_RESTART_FIFO, O_RDWR);
+	if (fd < 0)
+	{
+	    fprintf(stderr, "open dhcpv6 server restart fifo when writing.\n");
+	    return 1;
+	}
+	write( fd, str, sizeof(str) );
+	close(fd);
    }


The indentation in this block uses tabs instead of spaces, which is inconsistent with the surrounding code. This inconsistency should be corrected to maintain uniform code style.

Copilot · 2026-02-19T04:51:55Z

source/WanManager/wanmgr_dhcpv6_apis.c

@@ -444,15 +447,31 @@ static int _dibbler_client_operation(char * arg)
        CcspTraceInfo(("%s stop\n", __func__));
        /*TCXB6 is also calling service_dhcpv6_client.sh but the actuall script is installed from meta-rdk-oem layer as the intel specific code


Spelling error: "actuall" should be "actual". This typo exists in the comment on line 448 and is visible in the context of this change.

Suggested change

/*TCXB6 is also calling service_dhcpv6_client.sh but the actuall script is installed from meta-rdk-oem layer as the intel specific code

/*TCXB6 is also calling service_dhcpv6_client.sh but the actual script is installed from meta-rdk-oem layer as the intel specific code

kartikg33 · 2026-02-19T05:22:53Z

@rirfha948 @guto86
What is "OneStack"? Do we need a feature flag for this IPv6 change or could we just make this a default functionality?

S-Parthiban-Selvaraj · 2026-02-19T12:37:34Z

source/WanManager/wanmgr_dhcp_legacy_apis.c

+    !defined(_ONESTACK_PRODUCT_REQ_)

 #else
+#ifdef _ONESTACK_PRODUCT_REQ_


More build flags?
Why can't we write a generic code?

S-Parthiban-Selvaraj · 2026-02-19T12:38:41Z

source/WanManager/Makefile.am

 endif
+
+if ONESTACK_PRODUCT_REQ
+wanmanager_LDADD += -ldevicemode -lonestack_syscfg -lonestack_log -lrdkb_feature_mode_gate


What are these libraries?
What is the difference between existing rdk libaraies?

S-Parthiban-Selvaraj · 2026-02-19T12:42:50Z

source/WanManager/wanmgr_dhcpv6_apis.c

-                    strncat(prefix, "/64", sizeof(prefix) - 1);
+#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
+#if defined(_ONESTACK_PRODUCT_REQ_)
+		    if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))


As per the rdk design, we control the features based on the PSM/other DB internal to the app.
Why do we need all these implementations just to know if a platform supports prefix delegation?

guto86 · 2026-02-19T14:27:56Z

source/WanManager/wanmgr_dhcpv6_apis.c

+	    v_secure_system("/usr/bin/service_dhcpv6_client dhcpv6_client_service_disable");
+	    CcspTraceInfo(("%s  Calling service_dhcpv6_client.c with dhcpv6_client_service_disable from wanmgr_dhcpv6_apis.c\n", __func__));
+#else
+	    v_secure_system("/etc/utopia/service.d/service_dhcpv6_client.sh disable &");


What service_dhcpv6_client.sh script is resposible for?

snayak002c · 2026-02-20T22:20:27Z

source/WanManager/wanmgr_dhcpv6_apis.c

+		    }
 #endif
-                    sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIELD_IPV6_PREFIX, prefix, 0);
+		    sysevent_set(sysevent_fd, sysevent_token, SYSEVENT_FIELD_IPV6_PREFIX, prefix, 0);


why are we setting ipv6_prefix from wan manager, it should be ideally set from DHCP manager when DHCP manager is enabled.

rirfha948 and others added 3 commits February 18, 2026 11:02

RDKB-63098: OneStack - IPV6 PREFIX DELEGATION handling.

f94161f

Reason for change: Added Single Build- OneStack handling Test Procedure: - TBD Risks: None Priority: P3 Signed-off-by: rirfha948 <rasina_irfhan@comcast.com>

RDKB-63098: OneStack - IPV6 PREFIX DELEGATION handling.

f9a3130

Reason for change: Added Single Build- OneStack handling Test Procedure: - TBD Risks: None Priority: P3 Signed-off-by: rirfha948 <rasina_irfhan@comcast.com>

Merge branch 'rdkcentral:main' into main

a1b376b

Copilot AI review requested due to automatic review settings February 19, 2026 04:46

rirfha948 requested a review from a team as a code owner February 19, 2026 04:46

Copilot started reviewing on behalf of rirfha948 February 19, 2026 04:47 View session

Copilot AI reviewed Feb 19, 2026

View reviewed changes

S-Parthiban-Selvaraj requested changes Feb 19, 2026

View reviewed changes

guto86 reviewed Feb 19, 2026

View reviewed changes

snayak002c reviewed Feb 20, 2026

View reviewed changes

	CcspTraceInfo(("%s Callin service_dhcpv6_client.sh enable \n", __func__));
	CcspTraceInfo(("%s Calling service_dhcpv6_client.sh enable \n", __func__));

		@@ -444,15 +447,31 @@ static int _dibbler_client_operation(char * arg)
		CcspTraceInfo(("%s stop\n", __func__));
		/*TCXB6 is also calling service_dhcpv6_client.sh but the actuall script is installed from meta-rdk-oem layer as the intel specific code

Comments

Conversation

rirfha948 commented Feb 19, 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 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

kartikg33 commented Feb 19, 2026

Uh oh!

S-Parthiban-Selvaraj Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

S-Parthiban-Selvaraj Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

S-Parthiban-Selvaraj Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

guto86 Feb 19, 2026

Choose a reason for hiding this comment

Uh oh!

snayak002c Feb 20, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants