mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify logic

Browse Source
This commit is contained in:
Renato Botelho 2016-02-18 08:30:54 -02:00
parent 00f2980292
commit 4860277428
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/usr/local/www/services_dhcpv6.php
View File

@ -99,9 +99,12 @@ $iflist = array_merge($iflist, get_configured_pppoe_server_interfaces());
if (!$if || !isset($iflist[$if])) {
foreach ($iflist as $ifent => $ifname) {
$oc = $config['interfaces'][$ifent];
$valid_if_ipaddrv6 = (bool) (is_ipaddrv6($oc['ipaddrv6']) &&
!is_linklocal($oc['ipaddrv6']));
if ((is_array($config['dhcpdv6'][$ifent]) && !isset($config['dhcpdv6'][$ifent]['enable']) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))) ||
(!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6']))))) {
if ((!is_array($config['dhcpdv6'][$ifent]) ||
!isset($config['dhcpdv6'][$ifent]['enable'])) &&
!$valid_if_ipaddrv6) {
continue;
}
$if = $ifent;

8
src/usr/local/www/services_router_advertisements.php
View File

@ -102,8 +102,12 @@ $iflist = get_configured_interface_with_descr();
if (!$if || !isset($iflist[$if])) {
foreach ($iflist as $ifent => $ifname) {
$oc = $config['interfaces'][$ifent];
if ((is_array($config['dhcpdv6'][$ifent]) && !isset($config['dhcpdv6'][$ifent]['enable']) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6'])))) ||
(!is_array($config['dhcpdv6'][$ifent]) && !(is_ipaddrv6($oc['ipaddrv6']) && (!is_linklocal($oc['ipaddrv6']))))) {
$valid_if_ipaddrv6 = (bool) (is_ipaddrv6($oc['ipaddrv6']) &&
!is_linklocal($oc['ipaddrv6']));
if ((!is_array($config['dhcpdv6'][$ifent]) ||
!isset($config['dhcpdv6'][$ifent]['enable'])) &&
!$valid_if_ipaddrv6) {
continue;
}
$if = $ifent;