D45532.diff
No OneTemporary
Actions

Size

697 B

Referenced Files

None

Subscribers

None

D45532.diff
View Options

	diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
	--- a/sys/netpfil/pf/if_pflog.c
	+++ b/sys/netpfil/pf/if_pflog.c
	@@ -223,9 +223,10 @@
	struct pfloghdr hdr;

	if (kif == NULL \|\| m == NULL \|\| rm == NULL \|\| pd == NULL)
	- return ( 1);
	+ return (1);

	- if ((ifn = V_pflogifs[rm->logif]) == NULL \|\| !ifn->if_bpf)
	+ ifn = V_pflogifs[rm->logif];
	+ if (ifn == NULL \|\| !bpf_peers_present(ifn->if_bpf))
	return (0);

	bzero(&hdr, sizeof(hdr));
	@@ -274,7 +275,7 @@

	if_inc_counter(ifn, IFCOUNTER_OPACKETS, 1);
	if_inc_counter(ifn, IFCOUNTER_OBYTES, m->m_pkthdr.len);
	- BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m);
	+ bpf_mtap2(ifn->if_bpf, &hdr, PFLOG_HDRLEN, m);

	return (0);
	}