diff options
| author | Renato Botelho <garga@pfSense.org> | 2014-03-04 10:03:11 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2014-03-04 10:03:11 -0300 |
| commit | ebe2b407b330ef3ad32600c36da9752d162e3681 (patch) | |
| tree | 1bc42cc51a28fd73a79b8baa7eca3eca702614d0 /etc/inc/gwlb.inc | |
| parent | faddd381089b93443f9fe52235818bd8f2d793f9 (diff) | |
| parent | 088a4eed18e192c7577ce79406fc914a9b4a708a (diff) | |
| download | pfsense-ebe2b407b330ef3ad32600c36da9752d162e3681.zip pfsense-ebe2b407b330ef3ad32600c36da9752d162e3681.tar.gz | |
Merge pull request #984 from phil-davis/master
Return GWG IP protocol (version) when no gateway IP
Diffstat (limited to 'etc/inc/gwlb.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 2beaa9c..f08ef60 100644 --- a/etc/inc/gwlb.inc +++ b/etc/inc/gwlb.inc @@ -830,15 +830,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; + } } } } |
