summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/services_router_advertisements.php
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-02-19 08:28:44 -0200
committerRenato Botelho <renato@netgate.com>2016-02-19 10:57:32 -0200
commit2bf455caa3aaca83287309b6a7629c7d3a328652 (patch)
treed86087d0db6abc692d570e9f2dde7067675b0ffb /src/usr/local/www/services_router_advertisements.php
parent934b8a98b29b01978f6d36d9487423df1b2f7339 (diff)
downloadpfsense-2bf455caa3aaca83287309b6a7629c7d3a328652.zip
pfsense-2bf455caa3aaca83287309b6a7629c7d3a328652.tar.gz
Ticket #3029
Import patch from @Robert-Nelson to enable DHCPv6 Server/RA to interfaces configured to track DHCP-PD This patch only works for PD with length 64
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, 3 insertions, 2 deletions
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index 3a4746d..9ef58e1 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -102,8 +102,9 @@ $iflist = get_configured_interface_with_descr();
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']));
+ $valid_if_ipaddrv6 = (bool) ($oc['ipaddrv6'] == 'track6' ||
+ (is_ipaddrv6($oc['ipaddrv6']) &&
+ !is_linklocal($oc['ipaddrv6'])));
if ((!is_array($config['dhcpdv6'][$ifent]) ||
!isset($config['dhcpdv6'][$ifent]['enable'])) &&
OpenPOWER on IntegriCloud