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

Do not request prefix delegation if no tracking interfaces are setup to

Browse Source 
use it. Ticket #4436
This commit is contained in:
k-paulius 2015-02-16 22:13:48 -06:00 committed by Renato Botelho
parent 3adf6f272f
commit 83fa2c736a
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etc/inc/interfaces.inc
View File

@ -3452,10 +3452,16 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
$dhcp6cconf .= " script \"{$g['varetc_path']}/dhcp6c_{$interface}_script.sh\"; # we'd like some nameservers please\n";
$dhcp6cconf .= "};\n";
} else {
$iflist = link_interface_to_track6($interface);
foreach ($iflist as $ifname => $ifcfg) {
if (is_numeric($ifcfg['track6-prefix-id']))
$trackiflist[$ifname] = $ifcfg;
}
/* skip address request if this is set */
if(!isset($wancfg['dhcp6prefixonly']))
$dhcp6cconf .= " send ia-na 0; # request stateful address\n";
if(is_numeric($wancfg['dhcp6-ia-pd-len']))
if(is_numeric($wancfg['dhcp6-ia-pd-len']) && !empty($trackiflist))
$dhcp6cconf .= " send ia-pd 0; # request prefix delegation\n";
$dhcp6cconf .= "\trequest domain-name-servers;\n";
@ -3467,25 +3473,22 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
if(!isset($wancfg['dhcp6prefixonly']))
$dhcp6cconf .= "id-assoc na 0 { };\n";
if(is_numeric($wancfg['dhcp6-ia-pd-len'])) {
if(is_numeric($wancfg['dhcp6-ia-pd-len']) && !empty($trackiflist)) {
/* Setup the prefix delegation */
$dhcp6cconf .= "id-assoc pd 0 {\n";
$preflen = 64 - $wancfg['dhcp6-ia-pd-len'];
if (isset($wancfg['dhcp6-ia-pd-send-hint']))
$dhcp6cconf .= " prefix ::/{$preflen} infinity;\n";
$iflist = link_interface_to_track6($interface);
foreach ($iflist as $friendly => $ifcfg) {
if (is_numeric($ifcfg['track6-prefix-id'])) {
if ($g['debug'])
log_error("setting up $ifdescr - {$ifcfg['track6-prefix-id']}");
$realif = get_real_interface($friendly);
$dhcp6cconf .= " prefix-interface {$realif} {\n";
$dhcp6cconf .= " sla-id {$ifcfg['track6-prefix-id']};\n";
$dhcp6cconf .= " sla-len {$wancfg['dhcp6-ia-pd-len']};\n";
$dhcp6cconf .= " };\n";
}
foreach ($trackiflist as $friendly => $ifcfg) {
if ($g['debug'])
log_error("setting up $ifdescr - {$ifcfg['track6-prefix-id']}");
$realif = get_real_interface($friendly);
$dhcp6cconf .= " prefix-interface {$realif} {\n";
$dhcp6cconf .= " sla-id {$ifcfg['track6-prefix-id']};\n";
$dhcp6cconf .= " sla-len {$wancfg['dhcp6-ia-pd-len']};\n";
$dhcp6cconf .= " };\n";
}
unset($preflen, $iflist, $ifcfg);
unset($preflen, $iflist, $ifcfg, $ifname, $trackiflist);
$dhcp6cconf .= "};\n";
}
}