diff options
| author | Alexandr Nedvedicky <sashan@cvs.openbsd.org> | 2016-03-29 10:34:43 +0000 |
|---|---|---|
| committer | Alexandr Nedvedicky <sashan@cvs.openbsd.org> | 2016-03-29 10:34:43 +0000 |
| commit | f2b4b27f4de24cc98a1c3f409ecdf4f18a79ce58 (patch) | |
| tree | fad6e8b26a666134a9c10aceaa4ecbdb67f34d8d /sys/netinet | |
| parent | 2c1fc06372c63e3d5373612e211a9b6f5c58c0a8 (diff) | |
- packet must keep reference to statekey
this is the second attempt to get it in, the first
attempt got backed out on Jan 31 2016
the change also contains fixes contributed by Stefan Kempf
in earlier iteration.
OK srhen@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_input.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index e540c167ca3..e1260291d98 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.268 2016/01/31 00:18:07 sashan Exp $ */ +/* $OpenBSD: ip_input.c,v 1.269 2016/03/29 10:34:42 sashan Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -1458,6 +1458,9 @@ ip_forward(struct mbuf *m, struct ifnet *ifp, int srcrt) len = min(ntohs(ip->ip_len), 68); m_copydata(m, 0, len, mfake.m_pktdat); mfake.m_pkthdr.len = mfake.m_len = len; +#if NPF > 0 + pf_pkt_unlink_state_key(&mfake); +#endif /* NPF > 0 */ fake = 1; } |