diff options
-rwxr-xr-x | usr/local/www/services_dhcp.php | 2 | ||||
-rwxr-xr-x | usr/local/www/services_dhcp_relay.php | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php index d354a7c..89c0a84 100755 --- a/usr/local/www/services_dhcp.php +++ b/usr/local/www/services_dhcp.php @@ -52,7 +52,7 @@ foreach ($ifdescrs as $ifname => $ifdesc) { if (!is_ipaddr($oc['ipaddr']) && $is_olsr_enabled) $singleif_nostaticip = true; - else if ($oc['if'] && (!$oc['bridge'])) + else if ($oc['if']) $iflist[$ifname] = $ifdesc; } diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index a64bbc2..e9bcff2 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -63,14 +63,7 @@ $if = $_GET['if']; if ($_POST['if']) $if = $_POST['if']; -$ifdescrs = get_configured_interface_list(); -foreach ($ifdescrs as $ifname) { - $oc = $config['interfaces'][$ifname]; - - if ($oc['if'] && (!$oc['bridge'])) { - $iflist[$ifname] = $oc['descr']; - } -} +$iflist = get_configured_interface_with_descr(); if (!$if || !isset($iflist[$if])) $if = "lan"; |