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

Correctly reconfigure vips when the underlying/parent interface gets reconfigured.

Browse Source
This commit is contained in:
Ermal Lui 2009-12-17 11:01:14 +00:00
parent 435f11c8b1
commit e5ac67edfd
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
etc/inc/interfaces.inc
View File

@ -1076,7 +1076,7 @@ function interface_proxyarp_configure() {
}
function interfaces_vips_configure() {
function interfaces_vips_configure($interface = "") {
global $g, $config;
if(isset($config['system']['developerspew'])) {
$mt = microtime();
@ -1085,15 +1085,23 @@ function interfaces_vips_configure() {
$paa = array();
if(is_array($config['virtualip']['vip'])) {
$carp_setuped = false;
$anyproxyarp = false;
foreach ($config['virtualip']['vip'] as $vip) {
switch ($vip['mode']) {
case "proxyarp":
/* nothing it is handled on interface_proxyarp_configure() */
if ($interface <> "" && $vip['interface'] <> $interface)
continue;
$anyproxyarp = true;
break;
case "ipalias":
if ($interface <> "" && $vip['interface'] <> $interface)
continue;
interface_ipalias_configure(&$vip);
break;
case "carp":
if ($interface <> "" && $vip['interface'] <> $interface)
continue;
if ($carp_setuped == false) {
interfaces_carp_setup();
$carp_setuped = true;
@ -1101,12 +1109,15 @@ function interfaces_vips_configure() {
interface_carp_configure($vip);
break;
case "carpdev-dhcp":
if ($interface <> "" && $vip['interface'] <> $interface)
continue;
interface_carpdev_configure($vip);
break;
}
}
interface_proxyarp_configure();
if ($anyproxyarp == true)
interface_proxyarp_configure();
}
}
@ -1727,6 +1738,9 @@ function interface_configure($interface = "wan", $reloadall = false) {
interface_bridge_configure($bridge);
}
if (link_interface_to_vip($interface))
interfaces_vips_configure($interface);
if ($interface == "lan")
/* make new hosts file */
system_hosts_generate();
@ -2522,6 +2536,15 @@ function link_ip_to_carp_interface($ip) {
return $carp_ints;
}
function link_interface_to_vips($int) {
global $config;
if (is_array($config['virtualip']['vip']))
foreach ($config['virtualip']['vip'] as $vip)
if($int == $vip['interface'])
return $vip;
}
/****f* interfaces/link_interface_to_bridge
* NAME
* link_interface_to_bridge - Finds out a bridge group for an interface