From 8d774968690dc44705d661352093ecf012e53144 Mon Sep 17 00:00:00 2001 From: rirfha948 Date: Thu, 26 Feb 2026 06:44:18 +0000 Subject: [PATCH 1/3] RDKB-63098: OneStack - IPV6 PREFIX DELEGATION handling. Reason for change: Added Single Build- OneStack handling Test Procedure: - TBD Risks: None Priority: P3 Signed-off-by: rirfha948 --- configure.ac | 1 + source/DHCPMgrUtils/Makefile.am | 3 +++ source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c | 10 +++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6a0c78e4..c6ec7d8b 100644 --- a/configure.ac +++ b/configure.ac @@ -241,6 +241,7 @@ AM_CONDITIONAL(VOICE_MTA_SUPPORT, test x"$voice_support" = x"yes") # Check ra_monitor_support AM_CONDITIONAL([RA_MONITOR_SUPPORT], [test "$RA_MONITOR_SUPPORT" = "yes"]) +AM_CONDITIONAL([ONESTACK_PRODUCT_REQ], [test "x$ONESTACK_PRODUCT_REQ" = "xtrue"]) # Checks for header files. AC_CHECK_HEADERS([stdlib.h string.h unistd.h]) diff --git a/source/DHCPMgrUtils/Makefile.am b/source/DHCPMgrUtils/Makefile.am index fe9d2169..b8521515 100644 --- a/source/DHCPMgrUtils/Makefile.am +++ b/source/DHCPMgrUtils/Makefile.am @@ -45,3 +45,6 @@ libCcspDhcpMgrUtils_la_LIBADD = -lccsp_common -ltelemetry_msgsender -lulog -lsys ${top_builddir}/source/DHCPClientUtils/DHCPv6Client/libCcspDhcpMgr_Dhcpv6Client.la \ -lhal_platform \ ${top_builddir}/source/DHCPMgrUtils/CustomOptions/libcustomoptions.la +if ONESTACK_PRODUCT_REQ +AM_LDFLAGS += -lrdkb_feature_mode_gate -ldevicemode +endif diff --git a/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c b/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c index 6835893c..10216d2f 100644 --- a/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c +++ b/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c @@ -25,7 +25,12 @@ #include "dhcpmgr_recovery_handler.h" #include "dhcpmgr_custom_options.h" #include "ifl.h" - +#if defined(_ONESTACK_PRODUCT_REQ_) +#include +#endif // _ONESTACK_PRODUCT_REQ_ +#if defined(_ONESTACK_PRODUCT_REQ_) +#define COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME "ipv6_prefix_delegation" +#endif #define COSA_DML_WANIface_PREF_SYSEVENT_NAME "tr_%s_dhcpv6_client_v6pref" #define COSA_DML_WANIface_PREF_IAID_SYSEVENT_NAME "tr_%s_dhcpv6_client_pref_iaid" #define COSA_DML_WANIface_PREF_T1_SYSEVENT_NAME "tr_%s_dhcpv6_client_pref_t1" @@ -287,6 +292,9 @@ static void ConfigureIpv6Sysevents(PCOSA_DML_DHCPCV6_FULL pDhcp6c) IPv6Events eventv6[] = { {ia_pd_prefix, COSA_DML_WANIface_PREF_SYSEVENT_NAME}, +#if defined(_ONESTACK_PRODUCT_REQ_) + {ia_pd_prefix, COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME}, +#endif {iapd_iaid, COSA_DML_WANIface_PREF_IAID_SYSEVENT_NAME}, {iapd_t1, COSA_DML_WANIface_PREF_T1_SYSEVENT_NAME}, {iapd_t2, COSA_DML_WANIface_PREF_T2_SYSEVENT_NAME}, From 2483635bd3b98fa4a20c2b6fa12d73159ba31b89 Mon Sep 17 00:00:00 2001 From: rirfha948 Date: Sun, 1 Mar 2026 09:38:44 +0000 Subject: [PATCH 2/3] Review comment addressed --- source/DHCPMgrUtils/Makefile.am | 3 --- source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/source/DHCPMgrUtils/Makefile.am b/source/DHCPMgrUtils/Makefile.am index b8521515..fe9d2169 100644 --- a/source/DHCPMgrUtils/Makefile.am +++ b/source/DHCPMgrUtils/Makefile.am @@ -45,6 +45,3 @@ libCcspDhcpMgrUtils_la_LIBADD = -lccsp_common -ltelemetry_msgsender -lulog -lsys ${top_builddir}/source/DHCPClientUtils/DHCPv6Client/libCcspDhcpMgr_Dhcpv6Client.la \ -lhal_platform \ ${top_builddir}/source/DHCPMgrUtils/CustomOptions/libcustomoptions.la -if ONESTACK_PRODUCT_REQ -AM_LDFLAGS += -lrdkb_feature_mode_gate -ldevicemode -endif diff --git a/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c b/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c index 10216d2f..92272aa8 100644 --- a/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c +++ b/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c @@ -26,10 +26,7 @@ #include "dhcpmgr_custom_options.h" #include "ifl.h" #if defined(_ONESTACK_PRODUCT_REQ_) -#include -#endif // _ONESTACK_PRODUCT_REQ_ -#if defined(_ONESTACK_PRODUCT_REQ_) -#define COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME "ipv6_prefix_delegation" +#define COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME "ipv6_prefix_delegation" #endif #define COSA_DML_WANIface_PREF_SYSEVENT_NAME "tr_%s_dhcpv6_client_v6pref" #define COSA_DML_WANIface_PREF_IAID_SYSEVENT_NAME "tr_%s_dhcpv6_client_pref_iaid" From 60afb1bd036269fd6b926abfb65f4820c23dbfa6 Mon Sep 17 00:00:00 2001 From: rirfha948 Date: Thu, 5 Mar 2026 00:52:27 +0000 Subject: [PATCH 3/3] Review comment addressed -patch2 --- source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c b/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c index 92272aa8..b92eb3c3 100644 --- a/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c +++ b/source/DHCPMgrUtils/dhcpmgr_v6_lease_handler.c @@ -26,7 +26,8 @@ #include "dhcpmgr_custom_options.h" #include "ifl.h" #if defined(_ONESTACK_PRODUCT_REQ_) -#define COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME "ipv6_prefix_delegation" +#define COSA_DML_PREF_DELEGATION_SYSEVENT_NAME "ipv6_prefix_delegation" +#define COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME "ipv6_%s_prefix_delegation" #endif #define COSA_DML_WANIface_PREF_SYSEVENT_NAME "tr_%s_dhcpv6_client_v6pref" #define COSA_DML_WANIface_PREF_IAID_SYSEVENT_NAME "tr_%s_dhcpv6_client_pref_iaid" @@ -290,6 +291,7 @@ static void ConfigureIpv6Sysevents(PCOSA_DML_DHCPCV6_FULL pDhcp6c) IPv6Events eventv6[] = { {ia_pd_prefix, COSA_DML_WANIface_PREF_SYSEVENT_NAME}, #if defined(_ONESTACK_PRODUCT_REQ_) + {ia_pd_prefix, COSA_DML_PREF_DELEGATION_SYSEVENT_NAME}, {ia_pd_prefix, COSA_DML_WANIface_PREF_DELEGATION_SYSEVENT_NAME}, #endif {iapd_iaid, COSA_DML_WANIface_PREF_IAID_SYSEVENT_NAME},