diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-13 14:58:33 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-13 15:01:43 -0600 |
| commit | 0f98065bb8e53af526c36e19d438239b7656b58b (patch) | |
| tree | e91e8990ad9d249f71ab096d13b2dd788bf86f0c /src | |
| parent | 1bff2dc8799f6ff7bc376b77dbaca59a35782512 (diff) | |
| download | pfsense-0f98065bb8e53af526c36e19d438239b7656b58b.zip pfsense-0f98065bb8e53af526c36e19d438239b7656b58b.tar.gz | |
Fix the returned string when no status is found for this CARP.
No functional change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index e18c385..1abd642 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -423,33 +423,27 @@ function get_carp_interface_status($carpinterface) { global $config; foreach ($config['virtualip']['vip'] as $carp) { - if ($carp['mode'] != "carp") { + if ($carp['mode'] != "carp") continue; - } - $carpif = "_vip{$carp['uniqid']}"; - if ($carpinterface !== $carpif) { + if ($carpinterface !== "_vip{$carp['uniqid']}") continue; - } $interface = get_real_interface($carp['interface']); $vhid = $carp['vhid']; $carp_query = ''; $_gb = exec("/sbin/ifconfig $interface | /usr/bin/grep carp: | /usr/bin/grep \"vhid $vhid\"", $carp_query); foreach ($carp_query as $int) { - if (stripos($int, "MASTER")) { + if (stripos($int, "MASTER")) return "MASTER"; - } - if (stripos($int, "BACKUP")) { + elseif (stripos($int, "BACKUP")) return "BACKUP"; - } - if (stripos($int, "INIT")) { + elseif (stripos($int, "INIT")) return "INIT"; - } } break; } - return; + return ""; } /* |
