diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 73c243b51..22c1ca45c 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -596,13 +596,13 @@ function _interfaces_gre_configure($gre) $gre['greif'], $gre['tunnel-local-addr'], $gre['tunnel-remote-net'], - ]); + ]); } else { mwexecf('/sbin/ifconfig %s inet6 %s %s prefixlen 128', [ $gre['greif'], $gre['tunnel-local-addr'], $gre['tunnel-remote-addr'], - ]); + ]); } } else { mwexecf('/sbin/ifconfig %s inet6 ifdisabled', [$gre['greif']]); diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php index 26b706435..d2a0fb60f 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php @@ -282,7 +282,7 @@ abstract class Rule $rule[$target] = "!" . $rule[$target]; } if (isset($rule['protocol']) && in_array(strtolower($rule['protocol']), array("tcp","udp","tcp/udp"))) { - $port =!empty($rule[$tag]['port']) ? str_replace('-', ':', $rule[$tag]['port']) : null; + $port = !empty($rule[$tag]['port']) ? str_replace('-', ':', $rule[$tag]['port']) : null; if (strpos($port, ':any') !== false xor strpos($port, 'any:') !== false) { // convert 'any' to upper or lower bound when provided in range. e.g. 80:any --> 80:65535 $port = str_replace('any', strpos($port, ':any') !== false ? '65535' : '1', $port);