From 2dbc3ab259cb7b141d1900b8dea8a503d17ddf72 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 14 Mar 2017 21:43:02 +0100 Subject: [PATCH] (gwlb.inc) ok, this looks odd, I can't find a valid use of "ipprotocol" in the gatewaygroups. (other then the one filter.inc) --- src/etc/inc/filter.inc | 2 -- src/etc/inc/gwlb.inc | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index 869d977e7..7c40058e3 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -913,8 +913,6 @@ function filter_generate_gateways() if (is_array($GatewayGroupsList)) { foreach ($GatewayGroupsList as $gateway => $members) { $route = ""; - /* hey, that's not a group member! */ - unset($members['ipprotocol']); if (count($members) > 0) { $foundlb = 0; $routeto = ""; diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index cca0ba37d..78550a759 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -860,7 +860,9 @@ function return_gateway_groups_array() } if (!empty($gateway['interface'])) { - $gateway_groups_array[$group['name']]['ipprotocol'] = $gateway['ipprotocol']; + if (empty($gateway_groups_array[$group['name']])) { + $gateway_groups_array[$group['name']] = array(); + } if (is_ipaddr($gatewayip)) { $groupmember = array(); $groupmember['int'] = $gateway['interface'];