Use _vip as identified for CARP vip IPs to allow easier upgrade code. This way only ipaliases on carp need to be upgraded.

1 files changed, 2 insertions, 3 deletions

diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index 5129047..9967484 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -148,8 +148,7 @@ include("head.inc");
 						$vhid = $carp['vhid'];
 						$advskew = $carp['advskew'];
 						$advbase = $carp['advbase'];
-						$carp_int = get_real_interface($carp['interface']) . "@{$carp['vhid']}";
-						$status = get_carp_interface_status($carp_int);
+						$status = get_carp_interface_status("{$carp['interface']}_vip{$carp['vhid']}");
 						echo "<tr>";
 						$align = "valign='middle'";
 						if($carp_enabled == false) {
@@ -164,7 +163,7 @@ include("head.inc");
 								$icon = "<img {$align} src='/themes/".$g['theme']."/images/icons/icon_log.gif'>";
 							}
 						}
-						echo "<td class=\"listlr\"><center>" . $carp_int . "&nbsp;</td>";
+						echo "<td class=\"listlr\"><center>" . convert_friendly_interface_to_friendly_descr($carp['interface']) . "@{$vhid} &nbsp;</td>";
 						echo "<td class=\"listlr\"><center>" . $ipaddress . "&nbsp;</td>";
 						echo "<td class=\"listlr\"><center>{$icon}&nbsp;&nbsp;" . $status . "&nbsp;</td>";
 						echo "</tr>";