Use a global array to prevent errors on rulesets which have invalid gateways. If such are found do not use the gateway at all. Probably the rule should be skipped too?.

1 files changed, 12 insertions, 3 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index aef2b7a..a68094f 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -51,6 +51,9 @@ $time_based_rules = false;
 /* Used to hold the interface list that will be used on ruleset creation. */
 $FilterIflist = array();
 
+/* Create a global array to avoid errors on rulesets. */
+$GatewaysList = array();
+
 /* Used for the hostname dns resolver */
 $filterdns = "";
 
@@ -531,7 +534,7 @@ function filter_generate_aliases() {
 }
 
 function filter_generate_gateways() {
-	global $config, $g;
+	global $config, $g, $GatewaysList;
 
 	$rules = "# Gateways\n";
 
@@ -588,6 +591,9 @@ function filter_generate_gateways() {
 		}
 	}
 
+	/* Create a global array to avoid errors on rulesets. */
+	$GatewaysList = array_merge($GatewaysList, $GatewayGroupsList);
+
 	$rules .= "\n";
 
 	return $rules;
@@ -1544,8 +1550,11 @@ function filter_generate_user_rule($rule) {
 	}
 	/* if user has selected a custom gateway, lets work with it */
 	else if($rule['gateway'] <> "") {
-		/* Add the load balanced gateways */
-		$aline['route'] = " \$GW{$rule['gateway']} ";
+		if (isset($GatewaysList[$rule['gateway']]))
+			/* Add the load balanced gateways */
+			$aline['route'] = " \$GW{$rule['gateway']} ";
+		else
+			log_error("The gateway: {$rule['gateway']} is invalid/unkown not using it.");
 	}
 
 	if(isset($rule['protocol'])) {