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

fixed a bug that local IPv6 traffic (to an address configured on an

Browse Source 
interface other than lo0) does not show up properly on any bpf.

Reported by: mlaier
Reviewed by: gnn, csjp
MFC after: 1 week
This commit is contained in:
SUZUKI Shinsuke 2006-09-22 01:31:22 +00:00
parent 27bbb2e71f
commit 8343821b87
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=162539
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/net/if_loop.c
View File

@ -259,16 +259,32 @@ if_simloop(ifp, m, af, hlen)
m_tag_delete_nonpersistent(m);
m->m_pkthdr.rcvif = ifp;
/* Let BPF see incoming packet */
if (bpf_peers_present(ifp->if_bpf)) {
if (ifp->if_bpf->bif_dlt == DLT_NULL) {
u_int32_t af1 = af; /* XXX beware sizeof(af) != 4 */
/*
* We need to prepend the address family.
*/
bpf_mtap2(ifp->if_bpf, &af1, sizeof(af1), m);
} else
/*
* Let BPF see incoming packet in the following manner:
* - Emulated packet loopback for a simplex interface
* (net/if_ethersubr.c)
* -> passes it to ifp's BPF
* - IPv4/v6 multicast packet loopback (netinet(6)/ip(6)_output.c)
* -> not passes it to any BPF
* - Normal packet loopback from myself to myself (net/if_loop.c)
* -> passes to lo0's BPF (even in case of IPv6, where ifp!=lo0)
*/
if (hlen > 0) {
if (bpf_peers_present(ifp->if_bpf)) {
bpf_mtap(ifp->if_bpf, m);
}
} else {
if (bpf_peers_present(loif->if_bpf)) {
if ((m->m_flags & M_MCAST) == 0 || loif == ifp) {
/* XXX beware sizeof(af) != 4 */
u_int32_t af1 = af;
/*
* We need to prepend the address family.
*/
bpf_mtap2(loif->if_bpf, &af1, sizeof(af1), m);
}
}
}
/* Strip away media header */