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

Actually call interfaces_carp_setup after the carp interfaces are created so carp traffic can only flow after we have all vips up and running. This prevents premption more early than necessary. Ticket #1432.

Browse Source
This commit is contained in:
Ermal 2011-04-22 18:28:01 +00:00
parent d8da6350bc
commit bce14123ad
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etc/inc/interfaces.inc
View File

@ -1578,7 +1578,6 @@ function interfaces_carp_setup() {
unset($pfsyncenabled);
}
$cmdchain->add("Allow CARP", "/sbin/sysctl net.inet.carp.allow=1", true);
if($balanacing) {
$cmdchain->add("Enable CARP ARP-balancing", "/sbin/sysctl net.inet.carp.arpbalance=1", true);
$cmdchain->add("Disallow CARP preemption", "/sbin/sysctl net.inet.carp.preempt=0", true);
@ -1725,10 +1724,8 @@ function interfaces_vips_configure($interface = "") {
case "carp":
if ($interface <> "" && $vip['interface'] <> $interface)
continue;
if ($carp_setuped == false) {
interfaces_carp_setup();
if ($carp_setuped == false)
$carp_setuped = true;
}
interface_carp_configure($vip);
break;
case "carpdev-dhcp":
@ -1738,7 +1735,8 @@ function interfaces_vips_configure($interface = "") {
break;
}
}
if ($carp_setuped == true)
interfaces_carp_setup();
if ($anyproxyarp == true)
interface_proxyarp_configure();
}