summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/services_router_advertisements.php
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-02-19 23:55:27 -0600
committerChris Buechler <cmb@pfsense.org>2016-02-19 23:55:27 -0600
commit7a9f877471f2e4e48ab98d69b824236dee36c7b8 (patch)
tree57cd5752ef3f858e0ea8eb022aa8e8ca1b04a4bc /src/usr/local/www/services_router_advertisements.php
parent2915acf8d2ba0b6a073f6ba7d1175273283d4e3b (diff)
downloadpfsense-7a9f877471f2e4e48ab98d69b824236dee36c7b8.zip
pfsense-7a9f877471f2e4e48ab98d69b824236dee36c7b8.tar.gz
Simplify check for which interfaces can have RAs, and show track6 interfaces without having to enable DHCPv6 server. Ticket #3029
Diffstat (limited to 'src/usr/local/www/services_router_advertisements.php')
-rw-r--r--src/usr/local/www/services_router_advertisements.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index 9ef58e1..ad91cd7 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -262,9 +262,8 @@ $tabscounter = 0;
$i = 0;
foreach ($iflist as $ifent => $ifname) {
$oc = $config['interfaces'][$ifent];
- // We need at least one interface configured with a NON-LOCAL IPv6 static address. fd80:8dba:82e1::/64 fits the bill
- 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']))))) {
+ // We need interfaces configured with a static IPv6 address or track6 for PD.
+ if (!is_ipaddrv6($oc['ipaddrv6']) && $oc['ipaddrv6'] != "track6") {
continue;
}
OpenPOWER on IntegriCloud