diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-18 08:30:54 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-18 08:30:54 -0200 |
| commit | 4860277428bd3af0bbb53ac4d2be2de5a924c22e (patch) | |
| tree | e15d9442163b28f433c686fc1842c6b7083c7cfb /src/usr/local/www/services_dhcpv6.php | |
| parent | 00f298029285114925a733af2ab29222351b12fd (diff) | |
| download | pfsense-4860277428bd3af0bbb53ac4d2be2de5a924c22e.zip pfsense-4860277428bd3af0bbb53ac4d2be2de5a924c22e.tar.gz | |
Simplify logic
Diffstat (limited to 'src/usr/local/www/services_dhcpv6.php')
| -rw-r--r-- | src/usr/local/www/services_dhcpv6.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php index e8ac503..afd294d 100644 --- a/src/usr/local/www/services_dhcpv6.php +++ b/src/usr/local/www/services_dhcpv6.php @@ -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; |
