Correctly check for gateways with interface_has_gateway()

1 files changed, 2 insertions, 2 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index b1b9e7f..ae5ef36 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2780,7 +2780,7 @@ function create_firewall_outgoing_rules_to_itself() {
 			$friendlytunif = convert_real_interface_to_friendly_interface_name("tun{$x}");
 			/* If the interface has a gateway we do not add a pass in rule. */
 			/* Some people use a TUN tunnel with public IP as a Multiwan interface */
-			if(isset($config['interfaces'][$friendlytunif]['gateway'])) {
+			if(interface_has_gateway("tun{$x}")) {
 				$rule .= "# Not adding default pass in rule for interface $friendlytunif - tun{$x} with a gateway!";
 			} else {
 				$rule .="pass in quick on tun{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n";
@@ -2793,7 +2793,7 @@ function create_firewall_outgoing_rules_to_itself() {
 			$friendlytapif = convert_real_interface_to_friendly_interface_name("tap{$x}");
 			/* If the interface has a gateway we do not add a pass in rule. */
 			/* Some people use a TAP tunnel with public IP as a Multiwan interface */
-			if(isset($config['interfaces'][$friendlytapif]['gateway'])) {
+			if(interface_has_gateway("tap{$x}")) {
 				$rule .= "# Not adding default pass in rule for interface $friendlytapif - tap{$x} with a gateway!";
 			} else {
 				$rule .="pass in quick on tap{$x} all keep state label \"let out anything from firewall host itself openvpn\"\n";