diff options
| author | Kristof Provost <kp@FreeBSD.org> | 2025-12-12 18:07:19 +0100 |
|---|---|---|
| committer | Kristof Provost <kp@FreeBSD.org> | 2025-12-13 22:50:22 +0100 |
| commit | 1dee2336ab44e604f4871c46e7ccb2f7f1e33054 (patch) | |
| tree | 98b1df4e9b614df4261529bf8b6824848f5215a2 /sbin | |
| parent | 2f29d0f3e6d25599c188c94bf1e395d9cbeb2a4d (diff) | |
pfctl: report ICMP states consistently for IPv4/IPv6
Remove the '#ifndef INET6', which never actually mattered because this
define is never set. This makes us report ICMP states for IPv4 and IPv6
the same way (and also aligns us with OpenBSD).
This means we will now always report state 0:0 rather than
NO_TRAFFIC:NO_TRAFFIC for icmp6 (like we already did for icmp).
Reported by: Lev Prokofev <lev@netgate.com>
Sponsored by: Rubicon Communications, LLC ("Netgate")
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/pfctl/pf_print_state.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 417ff70de975..1c5a46f86b35 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -324,13 +324,8 @@ print_state(struct pfctl_state *s, int opts) } else if (proto == IPPROTO_SCTP) { printf(" %s:%s\n", sctp_state_name(src->state), sctp_state_name(dst->state)); -#ifndef INET6 - } else if (proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES && - dst->state < PFOTHERS_NSTATES) { -#else } else if (proto != IPPROTO_ICMP && proto != IPPROTO_ICMPV6 && src->state < PFOTHERS_NSTATES && dst->state < PFOTHERS_NSTATES) { -#endif /* XXX ICMP doesn't really have state levels */ const char *states[] = PFOTHERS_NAMES; |