Re: wg: fix build without pf

2020-07-13 Thread Theo Buehler 
On Sun, Jul 12, 2020 at 07:44:47PM +0200, Klemens Nanni wrote:
> Feedback? OK?

You need to have pf.h in scope to condition on NPF > 0.

panic: kernel diagnostic assertion "m->m_ptheader.pf.statekey == NULL" failed: 
file "/usr/src/sys/net/pf.c" line 7455

Index: sys/net/if_wg.c
===
RCS file: /var/cvs/src/sys/net/if_wg.c,v
retrieving revision 1.10
diff -u -p -r1.10 if_wg.c
--- sys/net/if_wg.c 12 Jul 2020 18:54:23 -  1.10
+++ sys/net/if_wg.c 13 Jul 2020 06:27:30 -
@@ -18,6 +18,7 @@
  */
 
 #include "bpfilter.h"
+#include "pf.h"
 
 #include 
 #include

Re: wg: fix build without pf

2020-07-12 Thread Vitaliy Makkoveev 
On Sun, Jul 12, 2020 at 07:44:47PM +0200, Klemens Nanni wrote:

OK mvs@

> Feedback? OK?
> 
> 
> Index: sys/net/if_wg.c
> ===
> RCS file: /cvs/src/sys/net/if_wg.c,v
> retrieving revision 1.9
> diff -u -p -r1.9 if_wg.c
> --- sys/net/if_wg.c   10 Jul 2020 13:26:42 -  1.9
> +++ sys/net/if_wg.c   12 Jul 2020 16:31:03 -
> @@ -1666,7 +1666,9 @@ wg_decap(struct wg_softc *sc, struct mbu
>   m->m_pkthdr.ph_ifidx = sc->sc_if.if_index;
>   m->m_pkthdr.ph_rtableid = sc->sc_if.if_rdomain;
>   m->m_flags &= ~(M_MCAST | M_BCAST);
> +#if NPF > 0
>   pf_pkt_addr_changed(m);
> +#endif /* NPF > 0 */
>  
>  done:
>   t->t_mbuf = m;
>

Re: fix build without pf

2020-07-12 Thread Jason A. Donenfeld 
ok zx2c4

wg: fix build without pf

2020-07-12 Thread Klemens Nanni 
Feedback? OK?


Index: sys/net/if_wg.c
===
RCS file: /cvs/src/sys/net/if_wg.c,v
retrieving revision 1.9
diff -u -p -r1.9 if_wg.c
--- sys/net/if_wg.c 10 Jul 2020 13:26:42 -  1.9
+++ sys/net/if_wg.c 12 Jul 2020 16:31:03 -
@@ -1666,7 +1666,9 @@ wg_decap(struct wg_softc *sc, struct mbu
m->m_pkthdr.ph_ifidx = sc->sc_if.if_index;
m->m_pkthdr.ph_rtableid = sc->sc_if.if_rdomain;
m->m_flags &= ~(M_MCAST | M_BCAST);
+#if NPF > 0
pf_pkt_addr_changed(m);
+#endif /* NPF > 0 */
 
 done:
t->t_mbuf = m;