diff options
| author | Fredrik Rönnvall <fredronn@gmail.com> | 2016-09-23 15:14:05 +0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-11-10 08:01:28 -0200 |
| commit | 5ad698557ca70489b34557354d2b2a6a1341135f (patch) | |
| tree | 433848be2f5abe8ed2ffef34ff5f0fe735fc468f /src/etc/inc/pfsense-utils.inc | |
| parent | 0cc7eec55dc995e4435f381dff7013f9b524b48b (diff) | |
| download | pfsense-5ad698557ca70489b34557354d2b2a6a1341135f.zip pfsense-5ad698557ca70489b34557354d2b2a6a1341135f.tar.gz | |
Fix bug where CARP vip status is incorrent in the interface when more
than one CARP vip is configured for an interface.
(cherry picked from commit 5116a8aa60ad87c0a47aafeca422cc323147ea14)
Diffstat (limited to 'src/etc/inc/pfsense-utils.inc')
| -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 3d2f5c4..2b9480f 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -661,8 +661,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) { |
