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

Simplify/optimize code for carp [re]configuration. This is possibly related to Ticket #601. Also this speedups vip creation on large number of interfaces.

Browse Source
This commit is contained in:
Ermal 2010-06-14 12:11:47 +00:00
parent 2b6f65d736
commit 7de83e0304
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/inc/interfaces.inc
View File

@ -1616,26 +1616,14 @@ function interface_carp_configure(&$vip) {
return;
}
/* ensure CARP IP really exists prior to loading up */
/* XXX: this can be bound to only the interface choosen in the carp creation. Not yet since upgrade is needed! */
$found = false;
$iflist = get_configured_interface_list();
foreach($iflist as $if) {
$ww_subnet_ip = get_interface_ip($if);
$ww_subnet_bits = get_interface_subnet($if);
if (ip_in_subnet($vip['subnet'], gen_subnet($ww_subnet_ip, $ww_subnet_bits) . "/" . $ww_subnet_bits)) {
$found = true;
break;
}
}
if($found == false) {
/* Ensure CARP IP really exists prior to loading up. */
$ww_subnet_ip = find_interface_ip($realif);
$ww_subnet_bits = find_interface_subnet($realif);
if (!ip_in_subnet($vip['subnet'], gen_subnet($ww_subnet_ip, $ww_subnet_bits) . "/" . $ww_subnet_bits)) {
file_notice("CARP", "Sorry but we could not find a matching real interface subnet for the virtual IP address {$vip['subnet']}.", "Firewall: Virtual IP", "");
return;
}
/* invalidate interface cache */
get_interface_arr(true);
/* create the carp interface and setup */
if (does_interface_exist($vipif)) {
pfSense_interface_flags($vipif, -IFF_UP);