Skip to content

Commit 8d6eb2f

Browse files
Nithishkumar-TNithishkumar-T
committed
Merge branch 'release/1.0.1'
2 parents 16e50a4 + 2ab8588 commit 8d6eb2f

18 files changed

+171
-84
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,17 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.0.1](https://github.com/rdkcentral/webui/compare/1.0.0...1.0.1)
8+
9+
- RDKCOM-5360 RDKBNETWOR-63: Incorrect MAP-T Sharing Ratio and .. [`#10`](https://github.com/rdkcentral/webui/pull/10)
10+
- RDKB-59618: Observed Mac filter setting is not working in mso page [`#3`](https://github.com/rdkcentral/webui/pull/3)
11+
- RDKCOM-5360: RDKBNETWOR-63: Incorrect MAP-T Sharing Ratio and .. [`6425239`](https://github.com/rdkcentral/webui/commit/642523972acc13b1aeecb5b8b1e3b225391bd904)
12+
- Merge tag '1.0.0' into develop [`c86754d`](https://github.com/rdkcentral/webui/commit/c86754d349ba3928cb53db9013533bcbdd2da4a0)
13+
714
#### 1.0.0
815

16+
> 23 July 2025
17+
918
- Import of source (stable2) [`f1505f9`](https://github.com/rdkcentral/webui/commit/f1505f9593c018c386cdc71b1f95886ffdf0ee8c)
1019
- Deploy cla action [`b8e77d6`](https://github.com/rdkcentral/webui/commit/b8e77d64d36bb9646769dd044499b15f79eef2b0)
1120
- Deploy fossid_integration_stateless_diffscan_target_repo action [`828525e`](https://github.com/rdkcentral/webui/commit/828525ea0dbbc5908fec3de44da7dd43ebca579f)

‎source/Styles/xb3/jst/DPoE.jst‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@
2525
</div><!-- end #sub-header -->
2626
<?% include('includes/nav.jst'); ?>
2727
<?%
28-
$NetworkName = "";
29-
$NetworkName = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.RDKB_UIBranding.HelpTip.NetworkName");
28+
$NetworkName = "";
29+
$NetworkName = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.RDKB_UIBranding.HelpTip.NetworkName");
30+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
31+
$dhcp_client_interface_v4 = $dhcp_client_interfaces.v4;
32+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
3033
?>
3134
<script type="text/javascript">
3235
$(document).ready(function() {
@@ -141,7 +144,7 @@ function sec2dhms($sec)
141144
<?%
142145
//echo getStr("Device.Routing.Router.1.IPv4Forwarding.1.GatewayIPAddress");
143146
/* For BWG, we just use the DHCP GW received from upstream as the wan side GW */
144-
echo( getStr("Device.DHCPv4.Client.1.IPRouters"));
147+
echo( getStr($dhcp_client_interface_v4+".IPRouters"));
145148
?>
146149
</span>
147150
</div>
@@ -223,15 +226,15 @@ function sec2dhms($sec)
223226
</div>
224227
<div class="form-row ">
225228
<span class="readonlyLabel" id="dhcliv6">DHCP Client (IPv6):</span> <span class="value">
226-
<?% echo( ("true"==getStr("Device.DHCPv6.Client.1.Enable")) ? "Enabled" : "Disabled");?>
229+
<?% echo( ("true"==getStr($dhcp_client_interface_v6+".Enable")) ? "Enabled" : "Disabled");?>
227230
</span>
228231
</div>
229232
<div class="form-row odd">
230233
<span class="readonlyLabel" id="dhlease">DHCP Lease Expire Time (IPv4):</span>
231234
<span class="value">
232235
<?%
233236
$sec = 0;
234-
$sec = getStr("Device.DHCPv4.Client.1.LeaseTimeRemaining");
237+
$sec = getStr($dhcp_client_interface_v4+".LeaseTimeRemaining");
235238
$tmp = div_mod($sec, 24*60*60);
236239
$day = $tmp[0];
237240
$tmp = div_mod($tmp[1], 60*60);

‎source/Styles/xb3/jst/connection_status.jst‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,22 @@
2727
<?% include('includes/nav.jst'); ?>
2828
<?% $ForceDisable = getStr("Device.WiFi.X_RDK-CENTRAL_COM_ForceDisable"); ?>
2929
<?%
30-
$fistDSif = getFirstDownstreamIpInterface();
31-
$autoWanEnable= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_AutowanFeatureSupport");
32-
$OperatingChannelBandwidth = "";
33-
$RadioNumberOfEntries = getStr("Device.WiFi.RadioNumberOfEntries");
34-
if($RadioNumberOfEntries)
35-
{
36-
for($r=1; $r <= $RadioNumberOfEntries ; $r++)
30+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
31+
$dhcp_client_interface_v4 = $dhcp_client_interfaces.v4;
32+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
33+
$fistDSif = getFirstDownstreamIpInterface();
34+
$autoWanEnable= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_AutowanFeatureSupport");
35+
$OperatingChannelBandwidth = "";
36+
$RadioNumberOfEntries = getStr("Device.WiFi.RadioNumberOfEntries");
37+
if($RadioNumberOfEntries)
3738
{
38-
$OperatingChannelBandwidth = getStr("Device.WiFi.Radio."+$r+".OperatingFrequencyBand");
39-
if($OperatingChannelBandwidth == "6GHz")
40-
break;
39+
for($r=1; $r <= $RadioNumberOfEntries ; $r++)
40+
{
41+
$OperatingChannelBandwidth = getStr("Device.WiFi.Radio."+$r+".OperatingFrequencyBand");
42+
if($OperatingChannelBandwidth == "6GHz")
43+
break;
44+
}
4145
}
42-
}
4346
// $fistDSif = "Device.IP.Interface.2.";
4447
// initial some variable to suppress some error
4548
$ipv6_local_addr = "";
@@ -433,23 +436,23 @@ if(($allowEthWan=="true") || ($autoWanEnable=="true")) {
433436
echo('<span class="value" id="actautwan">Active Auto WAN');
434437
}
435438
}
436-
}
439+
}
437440
?>
438441
</span>
439442
</div>
440443
<div class="form-row ">
441444
<span class="readonlyLabel" id="wanip4">WAN IP Address (IPv4):</span> <span class="value">
442445
<?%
443446
$mapT ="";
444-
$mapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
447+
$mapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
445448
//$mapT = "MAPT";
446449
$jsMapEnable="false";
447450
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
448451
if(($mapT=="MAPT") && (strpos($partnerId, "sky-") === false)){
449452
$jsMapEnable = "true";
450453
}
451454
if($jsMapEnable == "true")
452-
$WANIPv4 = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapIpv4Address");
455+
$WANIPv4 = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapIpv4Address");
453456
else
454457
$WANIPv4 = getStr($fistUSif+"IPv4Address.1.IPAddress");
455458
echo( $WANIPv4);
@@ -495,7 +498,7 @@ if(($allowEthWan=="true") || ($autoWanEnable=="true")) {
495498
echo("<span class='value' id='act'>Active</span>");
496499
}
497500
else{
498-
echo("<span class='value' id='inact'>Inactive</span>");
501+
echo("<span class='value' id='inact'>Inactive</span>");
499502
}
500503
}
501504
}
@@ -505,10 +508,10 @@ if(($allowEthWan=="true") || ($autoWanEnable=="true")) {
505508
$WAN_IP_Address = '';
506509
$address_style = '';
507510
if(strpos($partnerId, "sky-") !== false){
508-
$isMapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
511+
$isMapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
509512
if($isMapT == 'MAPT'){
510-
$WANIPv4 = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapIpv4Address");
511-
$WANIPv4 += '<span id="shrdMpT_cs"> (Shared using MAP-T)</span>';
513+
$WANIPv4 = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapIpv4Address");
514+
$WANIPv4 += '<span id="shrdMpT_cs"> (Shared using MAP-T)</span>';
512515
//$WANIPv4Gateway = '-NA-';
513516
$WAN_IP_Address = $WANIPv4;
514517
$address_style = 'connection_address';
@@ -547,7 +550,7 @@ if(($allowEthWan=="true") || ($autoWanEnable=="true")) {
547550
<div class="form-row">
548551
<span class="readonlyLabel" id="dhcpexploc">DHCP Expire Time:</span> <span class="value">
549552
<?%
550-
$expire_time = getStr("Device.DHCPv4.Client.1.LeaseTimeRemaining");
553+
$expire_time = getStr($dhcp_client_interface_v4+".LeaseTimeRemaining");
551554
echo( sec2dhms($expire_time));
552555
?>
553556
</span>

‎source/Styles/xb3/jst/device_discovery.jst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@
2626
</div><!-- end #sub-header -->
2727
<?% include('includes/nav.jst'); ?>
2828
<?%
29-
//start by licha
29+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
30+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
3031
$enableUPnP = getStr("Device.UPnP.Device.UPnPIGD");
3132
$adPeriod = getStr("Device.UPnP.Device.X_CISCO_COM_IGD_AdvertisementPeriod");
3233
$timeToLive = getStr("Device.UPnP.Device.X_CISCO_COM_IGD_TTL");
3334
$enableZero = getStr("Device.X_CISCO_COM_DeviceControl.EnableZeroConfig");
3435
$mapT ="";
35-
$mapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
36+
$mapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
3637
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
3738
//$mapT = "MAPT";
3839
$jsMapEnable="false";

‎source/Styles/xb3/jst/dmz.jst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ else{
3737
$idadv="connhom1";
3838
$idadv2 = "dmzmess";
3939
}
40+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
41+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
4042
$enableDMZ = getStr("Device.NAT.X_CISCO_COM_DMZ.Enable");
4143
$host = getStr("Device.NAT.X_CISCO_COM_DMZ.InternalIP");
4244
$hostv6 = getStr("Device.NAT.X_CISCO_COM_DMZ.IPv6Host");
@@ -46,7 +48,7 @@ $IPv6Prefix = getStr("Device.IP.Interface.1.IPv6Prefix.1.Prefix");
4648
$beginAddr = getStr("Device.DHCPv4.Server.Pool.1.MinAddress");
4749
$endAddr = getStr("Device.DHCPv4.Server.Pool.1.MaxAddress");
4850
$mapT ="";
49-
$mapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
51+
$mapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
5052
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
5153
$jsMapEnable="false";
5254
if(($mapT=="MAPT") && (strpos($partnerId, "sky-") === false)){

‎source/Styles/xb3/jst/includes/userbar.jst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@
4949
$MoCA = false;
5050
$battery = false;
5151
}
52+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
53+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
5254
?>
5355
<script type="text/javascript">
5456
setTimeout(function(){
@@ -150,7 +152,7 @@ setTimeout(function(){
150152
?>
151153
var ipv4_status = '<?% echo ($ipv4_status); ?>';
152154
var ipv6_status = '<?% echo ($ipv6_status); ?>';
153-
var map_mode = '<?% echo (getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode")); ?>';
155+
var map_mode = '<?% echo (getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode")); ?>';
154156
if((ipv6_status == 'up' || ipv4_status == 'up')&& map_mode =='MAPT'){
155157
$('#sta_inet').removeClass('off');
156158
}

‎source/Styles/xb3/jst/includes/utility.jst‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1248,5 +1248,27 @@ function current_operationalMode()
12481248
}
12491249
return $selectedOperationalMode;
12501250
}
1251-
?>
12521251

1252+
/**
1253+
* Description:
1254+
* DHCP-manager will have individual DHCP client interfaces for each WAN interface.
1255+
* We have to identify the current active interface and use its DHCP interface details.
1256+
* return the active DHCP client interfaces as JSON
1257+
*/
1258+
function get_dhcp_client_interfaces()
1259+
{
1260+
var $dhcp_client_interfaces = { v4: "", v6: "" };
1261+
$ids = explode(",", getInstanceIds("Device.X_RDK_WanManager.Interface."));
1262+
wanInterfaceLoop: for($key in $ids) { $j = $ids[$key];
1263+
$status = getStr("Device.X_RDK_WanManager.Interface."+$j+".Status");
1264+
if($status == "true" || $status == "Up" || $status == "Active"){
1265+
$dhcp_client_interfaces.v4 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv4Interface");
1266+
$dhcp_client_interfaces.v6 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv6Interface");
1267+
break wanInterfaceLoop;
1268+
}
1269+
}
1270+
if($dhcp_client_interfaces.v4 == "") $dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1";
1271+
if($dhcp_client_interfaces.v6 == "") $dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1";
1272+
return $dhcp_client_interfaces;
1273+
}
1274+
?>

‎source/Styles/xb3/jst/local_ip_configuration.jst‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424
<?% include('includes/userbar.jst'); ?>
2525
</div><!-- end #sub-header -->
2626
<?% include('includes/nav.jst'); ?>
27-
<?%
27+
<?%
28+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
29+
$dhcp_client_interface_v4 = $dhcp_client_interfaces.v4;
2830
$device_ctrl_param = {
2931
"LanGwIP" : "Device.X_CISCO_COM_DeviceControl.LanManagementEntry.1.LanIPAddress",
3032
"DeviceMode" : "Device.X_CISCO_COM_DeviceControl.DeviceMode",
@@ -48,7 +50,7 @@ $ula_size = count($ula_v6_prefix_arr);
4850
//CM GW IP Address
4951
$CM_GW_IP_Address = getStr("Device.X_CISCO_COM_CableModem.Gateway");
5052
//WAN GW IP Address (IPv4)
51-
$WAN_GW_IPv4_Address =getStr("Device.DHCPv4.Client.1.IPRouters");
53+
$WAN_GW_IPv4_Address =getStr($dhcp_client_interface_v4+".IPRouters");
5254
//Virtual LAN_GW_IPv4_Address
5355
$LAN_GW_IPv4_Address = "";
5456
$out={};

‎source/Styles/xb3/jst/network_setup.jst‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,14 @@
2525
</div><!-- end #sub-header -->
2626
<?% include('includes/nav.jst'); ?>
2727
<?%
28+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
29+
$dhcp_client_interface_v4 = $dhcp_client_interfaces.v4;
30+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
2831
$NetworkName = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.RDKB_UIBranding.HelpTip.NetworkName");
2932
$wanType = get_wan_type();
3033
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
3134
$mapT ="";
32-
$mapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
35+
$mapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
3336
$jsMapEnable="false";
3437
$maptEnabled = "Disabled";
3538
$maptSpanId = "disablespanid_mapt";
@@ -38,7 +41,7 @@
3841
$maptEnabled = "Enabled";
3942
$maptSpanId = "enablespanid_mapt";
4043
}
41-
$maptRatio = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapRatio");
44+
$maptRatio = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapRatio");
4245
if (strpos($partnerId, "sky-") !== false) {
4346
$maptRatio += ":1";
4447
}
@@ -147,9 +150,9 @@ function sec2dhms($sec)
147150
$sta_inet = (getStr("Device.DeviceInfo.X_RDKCENTRAL-COM.InternetStatus")=="true") ? "true" : "false";
148151
//in Bridge mode > Internet connectivity status is always active
149152
$sta_inet = ($_SESSION["lanMode"] == "bridge-static") ? "true" : $sta_inet ;
150-
$WANIPv4Gateway = getStr("Device.DHCPv4.Client.1.IPRouters");
153+
$WANIPv4Gateway = getStr($dhcp_client_interface_v4+".IPRouters");
151154
if(strpos($partnerId, "sky-") !== false){
152-
$isMapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
155+
$isMapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
153156
if($isMapT == 'MAPT'){
154157
/*$WANIPv4_val = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapRuleIPv4Prefix");
155158
$WANIPv4_val_array = explode('.',$WANIPv4_val);
@@ -158,7 +161,7 @@ function sec2dhms($sec)
158161
$Add_val_int = intval($Add_val_int);
159162
$WANIPv4_val_array[3]=$Convert_int+$Add_val_int;
160163
$WANIPv4 = $WANIPv4_val_array[0]+'.'+$WANIPv4_val_array[1]+'.'+$WANIPv4_val_array[2]+'.'+$WANIPv4_val_array[3]+' (Shared using MAP-T)';*/
161-
$WANIPv4 = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapIpv4Address");
164+
$WANIPv4 = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapIpv4Address");
162165
$WANIPv4 += '<span id="shrdMpT_ns"> (Shared using MAP-T)</span>';
163166
$WANIPv4Gateway = '-NA-';
164167
}
@@ -313,7 +316,7 @@ function sec2dhms($sec)
313316
<?%
314317
//echo getStr("Device.Routing.Router.1.IPv4Forwarding.1.GatewayIPAddress");
315318
/* For BWG, we just use the DHCP GW received from upstream as the wan side GW */
316-
$wanDefaultGatewayAddressIPv4 = getStr("Device.DHCPv4.Client.1.IPRouters");
319+
$wanDefaultGatewayAddressIPv4 = getStr($dhcp_client_interface_v4+".IPRouters");
317320
if(get_mapt_status()) $wanDefaultGatewayAddressIPv4 = "NA";
318321
if((strpos($partnerId, "sky-") !== false) && !$is_wan_connected) $wanDefaultGatewayAddressIPv4 = "0.0.0.0";
319322
echo($wanDefaultGatewayAddressIPv4);
@@ -406,19 +409,19 @@ function sec2dhms($sec)
406409
<div class="form-row ">
407410
<span class="readonlyLabel" id="dhcliv6">DHCP Client (IPv6):</span>
408411
<?%
409-
var idEnabled =("true"==getStr("Device.DHCPv6.Client.1.Enable")) ? "enablespanid" : "disablespanid";
412+
var idEnabled =("true"==getStr($dhcp_client_interface_v6+".Enable")) ? "enablespanid" : "disablespanid";
410413
?>
411414
<span class="value" id="<?% echo(idEnabled); ?>">
412-
<?% echo( ("true"==getStr("Device.DHCPv6.Client.1.Enable")) ? "Enabled" : "Disabled");?>
415+
<?% echo( ("true"==getStr($dhcp_client_interface_v6+".Enable")) ? "Enabled" : "Disabled");?>
413416
</span>
414-
</div>
417+
</div>
415418
<div class="form-row odd">
416419
<span class="readonlyLabel" id="dhlease">DHCP Lease Expire Time (IPv4):</span>
417420
<span class="value">
418421
<?%
419422
if(strpos($partnerId, "sky-") !== false){
420423
if($Wan_Port_Status !="Disconnected"){
421-
$sec = getStr("Device.DHCPv4.Client.1.LeaseTimeRemaining");
424+
$sec = getStr($dhcp_client_interface_v4+".LeaseTimeRemaining");
422425
$tmp = div_mod($sec, 24*60*60);
423426
$day = $tmp[0];
424427
$tmp = div_mod($tmp[1], 60*60);
@@ -428,7 +431,7 @@ function sec2dhms($sec)
428431
echo( $day+"d:"+$hor+"h:"+$min+"m");
429432
}
430433
}else{
431-
$sec = getStr("Device.DHCPv4.Client.1.LeaseTimeRemaining");
434+
$sec = getStr($dhcp_client_interface_v4+".LeaseTimeRemaining");
432435
$tmp = div_mod($sec, 24*60*60);
433436
$day = $tmp[0];
434437
$tmp = div_mod($tmp[1], 60*60);

‎source/Styles/xb3/jst/port_forwarding.jst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ else{
4343
$idadv = "connhom1";
4444
$idadv2 = "portmess";
4545
}
46-
$mapT = getStr("Device.DHCPv6.Client.1.X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
46+
$dhcp_client_interfaces = get_dhcp_client_interfaces();
47+
$dhcp_client_interface_v6 = $dhcp_client_interfaces.v6;
48+
$mapT = getStr($dhcp_client_interface_v6+".X_RDKCENTRAL-COM_RcvOption.MapTransportMode");
4749
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
4850
$jsMapEnable="false";
4951
if(($mapT=="MAPT") && (strpos($partnerId, "sky-") === false)){

0 commit comments

Comments
 (0)