From afacbf8498e9a6aa5c450d98e3fe72cb153250b1 Mon Sep 17 00:00:00 2001 From: claudio Date: Wed, 26 Jun 2019 08:13:13 +0000 Subject: The MPLS edge devices get the packets from the MPLS stack which never passed though pf_test(). So there is no need to try to call pf_pkt_addr_changed() instead just check that the PF statekey is NULL. Initial problem of not including pf.h found by jsg@ OK jsg@ sashan@ --- sys/net/if_mpe.c | 7 +++---- sys/net/if_mpip.c | 7 +++---- sys/net/if_mpw.c | 7 +++---- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'sys/net') diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index b037e053038..0cb2242672c 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.93 2019/04/19 07:39:37 dlg Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.94 2019/06/26 08:13:13 claudio Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard @@ -540,9 +540,8 @@ mpe_input(struct ifnet *ifp, struct mbuf *m) m->m_pkthdr.ph_ifidx = ifp->if_index; m->m_pkthdr.ph_rtableid = ifp->if_rdomain; -#if NPF > 0 - pf_pkt_addr_changed(m); -#endif + /* packet has not been processed by PF yet. */ + KASSERT(m->m_pkthdr.pf.statekey == NULL); #if NBPFILTER > 0 if (ifp->if_bpf) { diff --git a/sys/net/if_mpip.c b/sys/net/if_mpip.c index 8843afd5bcf..f4f11781e82 100644 --- a/sys/net/if_mpip.c +++ b/sys/net/if_mpip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpip.c,v 1.7 2019/04/19 07:39:37 dlg Exp $ */ +/* $OpenBSD: if_mpip.c,v 1.8 2019/06/26 08:13:13 claudio Exp $ */ /* * Copyright (c) 2015 Rafael Zalamena @@ -602,9 +602,8 @@ mpip_input(struct mpip_softc *sc, struct mbuf *m) m->m_pkthdr.ph_ifidx = ifp->if_index; m->m_pkthdr.ph_rtableid = ifp->if_rdomain; -#if NPF > 0 - pf_pkt_addr_changed(m); -#endif + /* packet has not been processed by PF yet. */ + KASSERT(m->m_pkthdr.pf.statekey == NULL); #if NBPFILTER > 0 { diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c index bcef7de8209..ae3c18a04c0 100644 --- a/sys/net/if_mpw.c +++ b/sys/net/if_mpw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpw.c,v 1.54 2019/04/23 10:53:45 dlg Exp $ */ +/* $OpenBSD: if_mpw.c,v 1.55 2019/06/26 08:13:13 claudio Exp $ */ /* * Copyright (c) 2015 Rafael Zalamena @@ -608,9 +608,8 @@ mpw_input(struct mpw_softc *sc, struct mbuf *m) m->m_pkthdr.ph_ifidx = ifp->if_index; m->m_pkthdr.ph_rtableid = ifp->if_rdomain; -#if NPF > 0 - pf_pkt_addr_changed(m); -#endif + /* packet has not been processed by PF yet. */ + KASSERT(m->m_pkthdr.pf.statekey == NULL); if_vinput(ifp, m); return; -- cgit v1.2.3-59-g8ed1b