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

Use the correct EtherType for logging IPv6 packets.

Browse Source 
Reviewed by:	melifaro
Approved by:	re (kib, glebius)
MFC after:	3 days
This commit is contained in:
Philip Paeps 2013-09-28 15:49:36 +00:00
parent 391dff8624
commit b49bf73f75
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/netpfil/ipfw/ip_fw_log.c
View File

@ -255,11 +255,18 @@ ipfw_log(struct ip_fw *f, u_int hlen, struct ip_fw_args *args,
if (args->eh) /* layer2, use orig hdr */
BPF_MTAP2(log_if, args->eh, ETHER_HDR_LEN, m);
else
else {
/* Add fake header. Later we will store
* more info in the header.
*/
BPF_MTAP2(log_if, "DDDDDDSSSSSS\x08\x00", ETHER_HDR_LEN, m);
if (ip->ip_v == 4)
BPF_MTAP2(log_if, "DDDDDDSSSSSS\x08\x00", ETHER_HDR_LEN, m);
else if (ip->ip_v == 6)
BPF_MTAP2(log_if, "DDDDDDSSSSSS\x86\xdd", ETHER_HDR_LEN, m);
else
/* Obviously bogus EtherType. */
BPF_MTAP2(log_if, "DDDDDDSSSSSS\xff\xff", ETHER_HDR_LEN, m);
}
LOGIF_RUNLOCK();
#endif /* !WITHOUT_BPF */
return;