Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 6 additions & 19 deletions source/Styles/xb3/jst/connection_status.jst
Original file line number Diff line number Diff line change
Expand Up @@ -171,25 +171,12 @@ if($OperatingChannelBandwidth == "6GHz")
//-----------------------WAN IPv6 Address - Start
$WANIPv6 = "";
$fistUSif = getFirstUpstreamIpInterface();
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
if (strpos($partnerId, "sky-") !== false) {
$ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6=$val;
break;
}else{$WANIPv6='';}
}
}
else {
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6 = $val;
break;
}
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6 = $val;
break;
}
}
//-----------------------WAN IPv6 Address - End
Expand Down
30 changes: 5 additions & 25 deletions source/Styles/xb3/jst/network_setup.jst
Original file line number Diff line number Diff line change
Expand Up @@ -108,42 +108,22 @@ function sec2dhm($sec)
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
$fistUSif = getFirstUpstreamIpInterface();
$WANIPv4 = getStr($fistUSif+"IPv4Address.1.IPAddress");
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
$WANIPv6="";
$DHCP_LET_IPv6="";
$WANIPv6LinkLocal="";
if (strpos($partnerId, "sky-") !== false) {
$fistDSif = getFirstDownstreamIpInterface();
$ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6=$val;
//DHCP Lease Expire Time (IPv6):
// echo $fistUSif."IPv6Address.$i.X_Comcast_com_LeaseTime";
$sec = getStr($fistDSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
$DHCP_LET_IPv6 = sec2dhm($sec);
}
if (strstr($val, "fe80::")){
$WANIPv6LinkLocal = $val;
}
}
}
else{
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6 = $val;
//DHCP Lease Expire Time (IPv6):
// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
$DHCP_LET_IPv6 = sec2dhm($sec);
//DHCP Lease Expire Time (IPv6):
// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
$DHCP_LET_IPv6 = sec2dhm($sec);
}
if (strstr($val, "fe80::")){
$WANIPv6LinkLocal = $val;
}
}
}
$dhcpv6_server_type = getStr("Device.DHCPv6.Server.X_CISCO_COM_Type");
if(strpos($partnerId, "sky-") !== false && $dhcpv6_server_type == "Stateless") {
Expand Down
4 changes: 0 additions & 4 deletions source/Styles/xb3/jst/remote_management.jst
Original file line number Diff line number Diff line change
Expand Up @@ -812,10 +812,6 @@ function remote_access_block(){
<br/>
<span id="remmess2">Remote Management Address (IPv6):</span>
<?%
/* Fiber devices use brlan0 ipv6 address */
if ((get_wan_type() == "DSL" && strpos($partnerId, "sky-") !== false)) {
$fistUSif = getFirstDownstreamIpInterface();
}
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
Expand Down
23 changes: 5 additions & 18 deletions source/Styles/xb6/jst/connection_status_onewifi.jst
Original file line number Diff line number Diff line change
Expand Up @@ -168,24 +168,11 @@ if($OperatingChannelBandwidth == "6GHz")
//-----------------------WAN IPv6 Address - Start
$WANIPv6 = "";
$fistUSif = getFirstUpstreamIpInterface();
$partnerId = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_Syndication.PartnerId");
if (strpos($partnerId, "sky-") !== false) {
$ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6=$val;
break;
}else{$WANIPv6='';}
}
}
else {
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6 = $val;
}
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6 = $val;
}
}
//-----------------------WAN IPv6 Address - End
Expand Down
30 changes: 5 additions & 25 deletions source/Styles/xb6/jst/network_setup.jst
Original file line number Diff line number Diff line change
Expand Up @@ -97,42 +97,22 @@ function sec2dhm($sec)
}
else
$WANIPv4 = getStr($fistUSif+"IPv4Address.1.IPAddress");
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
$WANIPv6="";
$DHCP_LET_IPv6="";
$WANIPv6LinkLocal="";
if (strpos($partnerId, "sky-") !== false) {
$fistDSif = getFirstDownstreamIpInterface();
$ids = explode(",", getInstanceIds($fistDSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistDSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6=$val;
//DHCP Lease Expire Time (IPv6):
// echo $fistUSif."IPv6Address.$i.X_Comcast_com_LeaseTime";
$sec = getStr($fistDSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
$DHCP_LET_IPv6 = sec2dhm($sec);
}
if (strstr($val, "fe80::")){
$WANIPv6LinkLocal = $val;
}
}
}
else{
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
$ids = explode(",", getInstanceIds($fistUSif+"IPv6Address."));
for(var $keytmp in $ids) { $i=$ids[$keytmp];/*p2j-foreach*/
$val = getStr($fistUSif+"IPv6Address."+$i+".IPAddress");
if (!strstr($val, "fe80::")){
$WANIPv6 = $val;
//DHCP Lease Expire Time (IPv6):
// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
$DHCP_LET_IPv6 = sec2dhm($sec);
//DHCP Lease Expire Time (IPv6):
// echo $fistUSif."IPv6Address."+$i+".X_Comcast_com_LeaseTime";
$sec = getStr($fistUSif+"IPv6Address."+$i+".X_CISCO_COM_PreferredLifetime");
$DHCP_LET_IPv6 = sec2dhm($sec);
}
if (strstr($val, "fe80::")){
$WANIPv6LinkLocal = $val;
}
}
}
if (!$WANIPv6) {
$WANIPv6 = getStr("Device.DeviceInfo.X_COMCAST-COM_WAN_IPv6");
Expand Down
Loading