d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check packet directions more properly instead of just checking received

Browse Source 
interface is null.

PR:		kern/123138
Submitted by:	Dmitry (hanabana at mail dot ru)
MFC after:	1 week
This commit is contained in:
Jung-uk Kim 2008-04-28 19:42:11 +00:00
parent 34f36b232b
commit f81a2a4956
1 changed files with 5 additions and 5 deletions

10
sys/net/bpf.c

@ -1571,9 +1571,9 @@ bpf_tap(struct bpf_if *bp, u_char *pkt, u_int pktlen)
BPFIF_UNLOCK(bp);
}
#define BPF_CHECK_DIRECTION(d, i) \
(((d)->bd_direction == BPF_D_IN && (i) == NULL) || \
((d)->bd_direction == BPF_D_OUT && (i) != NULL))
#define BPF_CHECK_DIRECTION(d, r, i) \
(((d)->bd_direction == BPF_D_IN && (r) != (i)) || \
((d)->bd_direction == BPF_D_OUT && (r) == (i)))
/*
* Incoming linkage from device drivers, when packet is in an mbuf chain.
@ -1598,7 +1598,7 @@ bpf_mtap(struct bpf_if *bp, struct mbuf *m)
BPFIF_LOCK(bp);
LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif))
if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp))
continue;
BPFD_LOCK(d);
++d->bd_rcount;
@ -1662,7 +1662,7 @@ bpf_mtap2(struct bpf_if *bp, void *data, u_int dlen, struct mbuf *m)
BPFIF_LOCK(bp);
LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif))
if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif, bp->bif_ifp))
continue;
BPFD_LOCK(d);
++d->bd_rcount;