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

Remove track6 dhcp configuration since dhcp6 will do this for us.

Browse Source
This commit is contained in:
Ermal 2013-02-09 13:12:40 +00:00
parent 20e15197bd
commit 6ebfa0ccfd
1 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
etc/inc/interfaces.inc
View File

@ -2995,7 +2995,7 @@ function interface_track6_configure($interface = "lan", $wancfg) {
case "dhcp6":
if ($g['debug'])
log_error("Interface {$interface} configured via {$wancfg['track6-interface']} type {$type}");
interface_track6_dhcp6_configure($interface, $wancfg);
/* NOTE dhcp6c will do the work for us so no need to do anything here. */
break;
}
@ -3121,45 +3121,6 @@ function interface_track6_6to4_configure($interface = "lan", $lancfg) {
return 0;
}
function interface_track6_dhcp6_configure($interface = "lan", $lancfg) {
global $config, $g;
if (!is_array($lancfg))
return;
/* If the interface is not configured via another, exit */
if (empty($lancfg['track6-interface']))
return;
if (!is_numeric($lancfg['track6-prefix-id']))
$lancfg['track6-prefix-id'] = 0;
$wancfg = $config['interfaces'][$lancfg['track6-interface']];
if (empty($wancfg)) {
log_error("Interface {$interface} tracking non-existant interface {$lancfg['track6-interface']}");
return;
}
$wanif = get_real_interface($lancfg['track6-interface']);
$ifcfgipv6 = find_interface_ipv6($wanif);
if (is_ipaddrv6($ifcfgipv6)) {
$dhcp6lanarr = explode(":", Net_IPv6::uncompress($ifcfgipv6));
$dhcp6lanarr[4] = 0;
$dhcp6lanarr[5] = 0;
$dhcp6lanarr[6] = 0;
$dhcp6lanarr[7] = 1;
$dhcp6lan = Net_IPv6::compress(implode(":", $dhcp6lanarr));
$lanif = get_real_interface($interface);
$oip = find_interface_ipv6($lanif);
if (is_ipaddrv6($oip))
mwexec("/sbin/ifconfig {$lanif} inet6 {$oip} delete");
log_error("dhcp6 {$interface} with ipv6 address {$dhcp6lan} based on {$lancfg['track6-interface']}");
mwexec("/sbin/ifconfig {$lanif} inet6 {$dhcp6lan} prefixlen 64");
}
return 0;
}
function interface_6rd_configure($interface = "wan", $wancfg) {
global $config, $g;