mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
I see no reason to retain this "braindeadedness". Create each CARP VIP with its VHID, and destroy accordingly.
Resolves #151
This commit is contained in:
parent
6593dae667
commit
12fafaf755
@ -786,6 +786,11 @@ function interface_vip_bring_down(&$vip) {
|
||||
mwexec("/sbin/ifconfig " . get_real_interface($vip['interface']) . " delete {$vip['subnet']}");
|
||||
break;
|
||||
case "carp":
|
||||
$vipif = "vip" . $vip['vhid'];
|
||||
mwexec("/sbin/ifconfig {$vipif} delete");
|
||||
mwexec("/sbin/ifconfig {$vipif} down");
|
||||
mwexec("/sbin/ifconfig {$vipif} destroy");
|
||||
break;
|
||||
case "carpdev-dhcp":
|
||||
$vipif = "vip" . $vip['vhid'];
|
||||
mwexec("/sbin/ifconfig {$vipif} delete");
|
||||
@ -1180,11 +1185,8 @@ function interface_carp_configure(&$vip) {
|
||||
if ($vip['password'] != "")
|
||||
$password = " pass \"" . $vip_password . "\"";
|
||||
|
||||
// This is the most brain dead decision taken for carp
|
||||
// Carp vhid is confirmed by GUI to be sequencial and limited to 256
|
||||
// eri@ I am leaving the comment but not touching the code
|
||||
// since someone thinks he/she knows better.
|
||||
$vipif = find_next_available_vip();
|
||||
// set the vip interface to the vhid
|
||||
$vipif = "vip{$vip['vhid']}";
|
||||
|
||||
$interface = interface_translate_type_to_real($vip['interface']);
|
||||
/*
|
||||
@ -2815,4 +2817,4 @@ function setup_pppoe_reset_file($interface, $status) {
|
||||
unlink_if_exists(CRON_PPPOE_CMD_FILE);
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
Loading…
Reference in New Issue
Block a user