sync code with last improvements from OpenBSD
This commit is contained in:
parent
cac1167ac2
commit
0e5a54c21a
19 changed files with 662 additions and 356 deletions
10
sys/net/pf.c
10
sys/net/pf.c
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: pf.c,v 1.1184 2023/07/31 11:13:09 dlg Exp $ */
|
||||
/* $OpenBSD: pf.c,v 1.1185 2023/09/07 09:59:43 sashan Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2001 Daniel Hartmeier
|
||||
|
@ -4148,6 +4148,10 @@ enter_ruleset:
|
|||
(r->rule_flag & PFRULE_STATESLOPPY) == 0 &&
|
||||
ctx->icmp_dir != PF_IN),
|
||||
TAILQ_NEXT(r, entries));
|
||||
/* icmp packet must match existing state */
|
||||
PF_TEST_ATTRIB(r->keep_state && ctx->state_icmp &&
|
||||
(r->rule_flag & PFRULE_STATESLOPPY) == 0,
|
||||
TAILQ_NEXT(r, entries));
|
||||
break;
|
||||
|
||||
case IPPROTO_ICMPV6:
|
||||
|
@ -4165,6 +4169,10 @@ enter_ruleset:
|
|||
ctx->icmp_dir != PF_IN &&
|
||||
ctx->icmptype != ND_NEIGHBOR_ADVERT),
|
||||
TAILQ_NEXT(r, entries));
|
||||
/* icmp packet must match existing state */
|
||||
PF_TEST_ATTRIB(r->keep_state && ctx->state_icmp &&
|
||||
(r->rule_flag & PFRULE_STATESLOPPY) == 0,
|
||||
TAILQ_NEXT(r, entries));
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue