summaryrefslogtreecommitdiffstats
path: root/etc/inc/gwlb.inc
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-09-02 08:00:07 -0300
committerRenato Botelho <garga@FreeBSD.org>2013-09-02 08:00:07 -0300
commit22234bbb2f3ea46fc61bb5adeabec1e94ccf167f (patch)
tree0d08dcf1e3145711ab4b3a24b8bd8967844a99a4 /etc/inc/gwlb.inc
parentce4aea3a29c6d7802ed3c258488e4b4702ce0d69 (diff)
downloadpfsense-22234bbb2f3ea46fc61bb5adeabec1e94ccf167f.zip
pfsense-22234bbb2f3ea46fc61bb5adeabec1e94ccf167f.tar.gz
Fix #3172, return_gateway_groups_array() was returning the last vip since it was using wrong variable name on iteration
Diffstat (limited to 'etc/inc/gwlb.inc')
-rw-r--r--etc/inc/gwlb.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc
index a1c86ad..1adc751 100644
--- a/etc/inc/gwlb.inc
+++ b/etc/inc/gwlb.inc
@@ -691,7 +691,7 @@ function return_gateway_groups_array() {
list($gwname, $tier, $vipname) = explode("|", $item);
if (is_ipaddr($carplist[$vipname])) {
- if (!is_array($group['name']))
+ if (!is_array($gwvip_arr[$group['name']]))
$gwvip_arr[$group['name']] = array();
$gwvip_arr[$group['name']][$gwname] = $vipname;
}
@@ -763,8 +763,8 @@ function return_gateway_groups_array() {
$groupmember['int'] = $int;
$groupmember['gwip'] = $gatewayip;
$groupmember['weight'] = isset($gateway['weight']) ? $gateway['weight'] : 1;
- if (is_array($gwvip_arr[$group['name']])&& !empty($gwvip_arr[$group['name']][$gwname]))
- $groupmember['vip'] = $gwvip_arr[$group['name']][$gwname];
+ if (is_array($gwvip_arr[$group['name']])&& !empty($gwvip_arr[$group['name']][$member]))
+ $groupmember['vip'] = $gwvip_arr[$group['name']][$member];
$gateway_groups_array[$group['name']]['ipprotocol'] = $gateway['ipprotocol'];
$gateway_groups_array[$group['name']][] = $groupmember;
}
OpenPOWER on IntegriCloud