diff options
| author | Renato Botelho <garga@pfSense.org> | 2014-03-10 17:17:13 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2014-03-10 17:17:13 -0300 |
| commit | 11e4dcc72f235368eb827e040413e70e86014602 (patch) | |
| tree | 26677bd3a3c787102e88a4884502fbdf2294bf22 /etc/inc | |
| parent | e6b1b1c15f21b32506df04a8331d7edb532b8202 (diff) | |
| parent | cd962bb9ef47da7d6dece0587a92694d599d2314 (diff) | |
| download | pfsense-11e4dcc72f235368eb827e040413e70e86014602.zip pfsense-11e4dcc72f235368eb827e040413e70e86014602.tar.gz | |
Merge pull request #991 from phil-davis/RELENG_2_1
Return GWG IP protocol (version) when no gateway IP - 2.1 version
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/gwlb.inc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/etc/inc/gwlb.inc b/etc/inc/gwlb.inc index a436439..4e90ed7 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -787,15 +787,17 @@ function return_gateway_groups_array() { else if (!empty($int)) $gatewayip = get_interface_gateway($gateway['friendlyiface']); - if (!empty($int) && is_ipaddr($gatewayip)) { - $groupmember = 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']][$member])) - $groupmember['vip'] = $gwvip_arr[$group['name']][$member]; + if (!empty($int)) { $gateway_groups_array[$group['name']]['ipprotocol'] = $gateway['ipprotocol']; - $gateway_groups_array[$group['name']][] = $groupmember; + if (is_ipaddr($gatewayip)) { + $groupmember = 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']][$member])) + $groupmember['vip'] = $gwvip_arr[$group['name']][$member]; + $gateway_groups_array[$group['name']][] = $groupmember; + } } } } |
