diff --git a/source/Styles/xb3/jst/includes/utility.jst b/source/Styles/xb3/jst/includes/utility.jst index e1a7a0a..5ccbefe 100644 --- a/source/Styles/xb3/jst/includes/utility.jst +++ b/source/Styles/xb3/jst/includes/utility.jst @@ -1262,18 +1262,24 @@ function current_operationalMode() */ function get_dhcp_client_interfaces() { + $dhcpmgr_enabled = file_exists("/tmp/dhcpmgr_initialized"); var $dhcp_client_interfaces = { v4: "", v6: "" }; - $ids = explode(",", getInstanceIds("Device.X_RDK_WanManager.Interface.")); - wanInterfaceLoop: for($key in $ids) { $j = $ids[$key]; - $status = getStr("Device.X_RDK_WanManager.Interface."+$j+".Status"); - if($status == "true" || $status == "Up" || $status == "Active"){ - $dhcp_client_interfaces.v4 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv4Interface"); - $dhcp_client_interfaces.v6 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv6Interface"); - break wanInterfaceLoop; + if($dhcpmgr_enabled) { + $ids = explode(",", getInstanceIds("Device.X_RDK_WanManager.Interface.")); + wanInterfaceLoop: for($key in $ids) { $j = $ids[$key]; + $status = getStr("Device.X_RDK_WanManager.Interface."+$j+".Status"); + if($status == "true" || $status == "Up" || $status == "Active"){ + $dhcp_client_interfaces.v4 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv4Interface"); + $dhcp_client_interfaces.v6 = getStr("Device.X_RDK_WanManager.Interface."+$j+".VirtualInterface.1.IP.DHCPv6Interface"); + break wanInterfaceLoop; + } } + if($dhcp_client_interfaces.v4 == "") $dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1"; + if($dhcp_client_interfaces.v6 == "") $dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1"; + } else { + $dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1"; + $dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1"; } - if($dhcp_client_interfaces.v4 == "") $dhcp_client_interfaces.v4 = "Device.DHCPv4.Client.1"; - if($dhcp_client_interfaces.v6 == "") $dhcp_client_interfaces.v6 = "Device.DHCPv6.Client.1"; return $dhcp_client_interfaces; }