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

Fixes a bug in primary DHCPD host detection for failover.

Browse Source 
Properly detect the master host based on CARP skew at setup time when used with HA.
This commit is contained in:
Luiz Souza 2018-01-24 13:39:59 -06:00
parent f1dc05b706
commit 97e6ec0974
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/etc/inc/services.inc
View File

@ -593,9 +593,14 @@ EOD;
$skew = 110;
if (is_array($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vipent) {
if ($vipent['mode'] != 'carp') {
continue;
}
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']}")) {
$carp_nw = gen_subnet($config['interfaces'][$dhcpif]['ipaddr'],
$config['interfaces'][$dhcpif]['subnet']);
$carp_nw .= "/{$config['interfaces'][$dhcpif]['subnet']}";
if (ip_in_subnet($dhcpifconf['failover_peerip'], $carp_nw)) {
/* this is the interface! */
if (is_numeric($vipent['advskew']) && (intval($vipent['advskew']) < 20)) {
$skew = 0;