Skip to content

XB10-2633: [26Q2_Sprint][OS][Residential]Connected clients are not re… #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MonekaLakshmi merged 1 commit into from
May 9, 2026
Merged

XB10-2633: [26Q2_Sprint][OS][Residential]Connected clients are not re… #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions source/service_routed/service_routed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,10 +922,11 @@ STATIC int gen_zebra_conf(int sefd, token_t setok)
"!log stdout\n"
"log file /var/tmp/zebra.log errors\n"
"table 255\n";
#if defined(MULTILAN_FEATURE) || defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
int i = 0;
unsigned int l2_insts[4] = {0};
unsigned int enabled_iface_num = 0;
#if defined(MULTILAN_FEATURE) || defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
bool multilan_pd_enabled = false;
unsigned int l2_insts[4] = {0};
char evt_name[64] = {0};
#endif
int StaticDNSServersEnabled = 0;
Expand Down Expand Up @@ -1166,34 +1167,38 @@ STATIC int gen_zebra_conf(int sefd, token_t setok)
syscfg_get(NULL, "last_erouter_mode", rtmod, sizeof(rtmod));


#if defined(MULTILAN_FEATURE) || defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined (_ONESTACK_PRODUCT_REQ_)
int multilan_enabled = 0;
int pd_enabled = 0;

#if defined(MULTILAN_FEATURE)
multilan_enabled = 1;
#endif
#if defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION)
pd_enabled = 1;
#endif

#if defined(MULTILAN_FEATURE) || defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
get_active_lanif(sefd, setok, l2_insts, &enabled_iface_num);
#ifdef _ONESTACK_PRODUCT_REQ_
pd_enabled = isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION);
#endif

if (pd_enabled || multilan_enabled)
if (isFeatureSupportedInCurrentMode(FEATURE_IPV6_DELEGATION))
{
get_active_lanif(sefd, setok, l2_insts, &enabled_iface_num);
multilan_pd_enabled = true; // runtime-controlled
}
else
{
enabled_iface_num = 1; // single execution
}
#else
multilan_pd_enabled = true; // Cisco/MULTILAN → always enabled
#endif //_ONESTACK_PRODUCT_REQ_
#else
enabled_iface_num = 1; // single execution
#endif

for (i = 0; i < enabled_iface_num; i++)
{
snprintf(evt_name, sizeof(evt_name), "multinet_%d-name", l2_insts[i]);
sysevent_get(sefd, setok, evt_name, lan_if, sizeof(lan_if));
snprintf(evt_name, sizeof(evt_name), "ipv6_%s-prefix", lan_if);
sysevent_get(sefd, setok, evt_name, prefix, sizeof(prefix));
snprintf(evt_name, sizeof(evt_name), "ipv6_%s-addr", lan_if);
sysevent_get(sefd, setok, evt_name, lan_addr, sizeof(lan_addr));
#endif
//RDKB-47758
#if defined(MULTILAN_FEATURE) || defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
if (multilan_pd_enabled )
{
snprintf(evt_name, sizeof(evt_name), "multinet_%d-name", l2_insts[i]);
sysevent_get(sefd, setok, evt_name, lan_if, sizeof(lan_if));
snprintf(evt_name, sizeof(evt_name), "ipv6_%s-prefix", lan_if);
sysevent_get(sefd, setok, evt_name, prefix, sizeof(prefix));
snprintf(evt_name, sizeof(evt_name), "ipv6_%s-addr", lan_if);
sysevent_get(sefd, setok, evt_name, lan_addr, sizeof(lan_addr));
}
#endif
//RDKB-47758
#ifdef WAN_FAILOVER_SUPPORTED
if (gIpv6AddrAssignment == ULA_IPV6)
{
Expand Down Expand Up @@ -1776,10 +1781,7 @@ STATIC int gen_zebra_conf(int sefd, token_t setok)
fprintf(fp, "interface %s\n", lan_if);
fprintf(fp, " ip irdp multicast\n");

#if defined(MULTILAN_FEATURE) || defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
} //for (i = 0; i < enabled_iface_num; i++)
}
#endif

#if !defined(CISCO_CONFIG_DHCPV6_PREFIX_DELEGATION) || defined(_ONESTACK_PRODUCT_REQ_)
#ifdef _ONESTACK_PRODUCT_REQ_
Expand Down
Loading