diff options
author | Fredrik Rönnvall <fredronn@gmail.com> | 2016-09-23 15:14:05 +0200 |
---|---|---|
committer | Fredrik Rönnvall <fredronn@gmail.com> | 2016-09-23 15:14:05 +0200 |
commit | 5116a8aa60ad87c0a47aafeca422cc323147ea14 (patch) | |
tree | 7f685ad5ff48b4176ea05b34547d91e97fe376c6 /src | |
parent | b2ee641c325bd8e069c8dd4c6eddd62ed4432dfb (diff) | |
download | pfsense-5116a8aa60ad87c0a47aafeca422cc323147ea14.zip pfsense-5116a8aa60ad87c0a47aafeca422cc323147ea14.tar.gz |
Fix bug where CARP vip status is incorrent in the interface when more
than one CARP vip is configured for an interface.
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/pfsense-utils.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 236d02c..933485a 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -629,8 +629,11 @@ function get_carp_interface_status($carpid) { $interface = get_real_interface($carpiface); if ($interface == NULL) return ""; + $vip = get_configured_vip($carpid); + if ($vip == NULL || !isset($vip['vhid'])) + return ""; - $vhid = $carp['vhid']; + $vhid = $vip['vhid']; $carp_query = ''; $_gb = exec("/sbin/ifconfig $interface | /usr/bin/grep carp: | /usr/bin/grep \"vhid $vhid\"", $carp_query); foreach ($carp_query as $int) { |