diff options
| author | Phil Davis <phil.davis@inf.org> | 2014-02-27 19:04:19 -0800 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2014-02-27 19:04:19 -0800 |
| commit | c67088333833ee64460641e55295ea3d9ff413cb (patch) | |
| tree | 7fb4216f04fa692b5c6cc4da4b65ae8ee03b605f | |
| parent | edaa41be688c2211fb08d2303f327924b5d2e838 (diff) | |
| download | pfsense-c67088333833ee64460641e55295ea3d9ff413cb.zip pfsense-c67088333833ee64460641e55295ea3d9ff413cb.tar.gz | |
Return GWG IP protocol (version) when no gateway IP - 2.1 branch
| -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 9fd73d7..3ff1670 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -784,15 +784,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; + } } } } |
