diff options
| author | Chris Buechler <cmb@pfsense.org> | 2010-07-21 23:18:00 -0400 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2010-07-21 23:18:00 -0400 |
| commit | c55e45800d839e6e46d2704097d43563247fb06c (patch) | |
| tree | bdd6328daf4e027e6a358debf7bdaad0f6a2e0a9 | |
| parent | 5c49cf58c79f6d3c22182e1a4139be82df1bfa80 (diff) | |
| download | pfsense-c55e45800d839e6e46d2704097d43563247fb06c.zip pfsense-c55e45800d839e6e46d2704097d43563247fb06c.tar.gz | |
only match with a space behind the IP, otherwise 10.0.0.6 CARP IP may match against interface IP 10.0.0.60, and show incorrect info on the CARP status page
| -rw-r--r-- | etc/inc/interfaces.inc | 4 | ||||
| -rwxr-xr-x | usr/local/www/carp_status.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 64e3b37..73e5554 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -2765,7 +2765,7 @@ function find_carp_interface($ip) { foreach ($config['virtualip']['vip'] as $vip) { if ($vip['mode'] == "carp" || $vip['mode'] == "carpdev") { $carp_ip = get_interface_ip($vip['interface']); - $if = `ifconfig | grep '$ip' -B1 | head -n1 | cut -d: -f1`; + $if = `ifconfig | grep '$ip ' -B1 | head -n1 | cut -d: -f1`; if ($if) return $if; } @@ -3210,4 +3210,4 @@ function setup_pppoe_reset_file($pppif, $iface="") { unlink_if_exists($cron_file); } -?> +?>
\ No newline at end of file diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index 793a9ae..44dee95 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -107,7 +107,7 @@ include("head.inc"); <p> <table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td class="listhdrr"><b><center>Carp Interface</center></b></td> + <td class="listhdrr"><b><center>CARP Interface</center></b></td> <td class="listhdrr"><b><center>Virtual IP</center></b></td> <td class="listhdrr"><b><center>Status</center></b></td> </tr> |
