firewall: repair logic for ICMP fixup required by pfctl after refactor

PR: https://forum.opnsense.org/index.php?topic=7060.0
This commit is contained in:
Franco Fichtner 2018-01-29 23:05:52 +00:00
parent 4adf757079
commit a591cf1412

View File

@ -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