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

Fix didn't help -- backing this out and the change that made it necessary. Revert "Correctly check the secondary/primary parameter setting on dhcp failover configuration"

Browse Source 
This reverts commit 2467086682.
This commit is contained in:
jim-p 2013-09-10 11:07:38 -04:00
parent 408ebb78ab
commit a3d6166bb2
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/inc/services.inc
View File

@ -440,7 +440,9 @@ EOD;
continue;
if($dhcpifconf['failover_peerip'] <> "") {
$intip = get_interface_ip($dhcpif);
$int = guess_interface_from_ip($dhcpifconf['failover_peerip']);
$intip = find_interface_ip($int);
$real_dhcpif = convert_friendly_interface_to_real_interface_name($dhcpif);
/*
* yep, failover peer is defined.
* does it match up to a defined vip?
@ -448,15 +450,10 @@ EOD;
$skew = 110;
if(is_array($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vipent) {
if($vipent['interface'] == $dhcpif) {
$carp_nw = gen_subnet($vipent['subnet'], $vipent['subnet_bits']);
if (ip_in_subnet($dhcpifconf['failover_peerip'], "{$carp_nw}/{$vipent['subnet_bits']}")) {
/* this is the interface! */
if(is_numeric($vipent['advskew']) && (intval($vipent['advskew']) < 20)) {
$skew = 0;
break;
}
}
if($vipent['subnet'] == $intip) {
/* this is the interface! */
if(is_numeric($vipent['advskew']) && ($vipent['advskew'] < "20"))
$skew = 0;
}
}
} else {
@ -474,8 +471,6 @@ EOD;
$dhcpdconf_pri = "split 128;\n";
$dhcpdconf_pri .= " mclt 600;\n";
}
if (is_ipaddrv4($intip)) {
$dhcpdconf .= <<<EOPP
failover peer "dhcp_{$dhcpif}" {
{$type};
@ -490,7 +485,6 @@ failover peer "dhcp_{$dhcpif}" {
}
EOPP;
}
}
}