From a591cf14123f4fab9e23e801c71c9abf3453170e Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Mon, 29 Jan 2018 23:05:52 +0000 Subject: [PATCH] firewall: repair logic for ICMP fixup required by pfctl after refactor PR: https://forum.opnsense.org/index.php?topic=7060.0 --- .../mvc/app/library/OPNsense/Firewall/FilterRule.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php index 2bd8dc1b7..7d5bdc9a4 100644 --- a/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php +++ b/src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php @@ -222,14 +222,14 @@ class FilterRule extends Rule } // icmp-type switch (ipv4/ipv6) if ($rule['protocol'] == "icmp" && !empty($rule['icmptype'])) { - if ($ipproto == 'inet') { + if ($rule['ipprotocol'] == 'inet') { $rule['icmp-type'] = $rule['icmptype']; - } elseif ($ipproto == 'inet6') { + } elseif ($rule['ipprotocol']== 'inet6') { $rule['icmp6-type'] = $rule['icmptype']; } } // icmpv6 - if ($ipproto == 'inet6' && !empty($rule['protocol']) && $rule['protocol'] == "icmp") { + if ($rule['ipprotocol'] == 'inet6' && !empty($rule['protocol']) && $rule['protocol'] == "icmp") { $rule['protocol'] = 'ipv6-icmp'; } // set prio