lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fredronnv-dev/dhcp_failover'

Browse Source
This commit is contained in:
Ad Schellevis 2019-02-08 16:16:55 +01:00
commit f768bf743a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,7 +524,7 @@ EOD;
* yep, failover peer is defined.
* does it match up to a defined vip?
*/
$skew = 110;
$failover_primary=false;
if (!empty($config['virtualip']['vip'])) {
foreach ($config['virtualip']['vip'] as $vipent) {
if ($vipent['interface'] == $dhcpif) {
@ -532,9 +532,9 @@ EOD;
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;
$failover_primary=true;
}
break;
}
}
}
@ -542,16 +542,16 @@ EOD;
log_error('Warning! DHCP Failover setup and no CARP virtual IPs defined!');
}
$dhcpdconf_pri = "";
if ($skew > 10) {
$type = "secondary";
$my_port = "520";
$peer_port = "519";
} else {
if ($failover_primary) {
$my_port = "519";
$peer_port = "520";
$type = "primary";
$dhcpdconf_pri = "split 128;\n";
$dhcpdconf_pri .= " mclt 600;\n";
} else {
$type = "secondary";
$my_port = "520";
$peer_port = "519";
}
if (is_ipaddrv4($intip)) {