diff options
author | Renato Botelho <renato@netgate.com> | 2017-01-12 12:40:12 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2017-01-16 11:54:38 -0200 |
commit | 3661dfdc9d2bb217d6069c1078575828b1f29b45 (patch) | |
tree | e4e1f3de04be40200cc7cce4315ca9a18ccbde5a /src/etc | |
parent | 92b50e1a1df8a1da4f432bc7924fc862eceecd55 (diff) | |
download | pfsense-3661dfdc9d2bb217d6069c1078575828b1f29b45.zip pfsense-3661dfdc9d2bb217d6069c1078575828b1f29b45.tar.gz |
Fix #7105: Old rules may not have ipprotocol defined, consider it icmp6-type only when ipprotocol is inet6
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/filter.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/inc/filter.inc b/src/etc/inc/filter.inc index a065392..fecfba2 100644 --- a/src/etc/inc/filter.inc +++ b/src/etc/inc/filter.inc @@ -2819,7 +2819,7 @@ function filter_generate_user_rule($rule) { $aline['dst'] = "to $dst "; if ($rule['protocol'] == "icmp" && $rule['icmptype']) { - $icmptype_key = ($rule['ipprotocol'] == 'inet' ? 'icmp-type' : 'icmp6-type'); + $icmptype_key = ($rule['ipprotocol'] == 'inet6' ? 'icmp6-type' : 'icmp-type'); $icmptype_text = (strpos($rule['icmptype'], ",") === false ? $rule['icmptype'] : '{ ' . $rule['icmptype'] . ' }'); $aline[$icmptype_key] = "{$icmptype_key} {$icmptype_text} "; } |