dect
/
libpcap
Archived
13
0
Fork 0
Code Releases Activity

Tests for the transport-layer protocol differ based on whether the 

network-layer protocol is IPv4 or IPv6, regardless of the link-layer
protocol.  Therefore, we have to check for IPv4 and IPv6, even for
DLT_RAW - do so by checking the version field in the header.
This commit is contained in:
guy 2007-05-30 18:05:21 +00:00
parent 666dd96733
commit a8f23f719a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gencode.c
View File

@ -21,7 +21,7 @@
*/
#ifndef lint
static const char rcsid[] _U_ =
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.278 2007-05-24 23:57:36 hannes Exp $ (LBL)";
"@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.279 2007-05-30 18:05:21 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@ -2061,7 +2061,7 @@ gen_linktype(proto)
case DLT_RAW:
/*
* These types don't provide any type field; packets
* are always IP.
* are always IPv4 or IPv6.
*
* XXX - for IPv4, check for a version number of 4, and,
* for IPv6, check for a version number of 6?
@ -2069,10 +2069,13 @@ gen_linktype(proto)
switch (proto) {
case ETHERTYPE_IP:
/* Check for a version number of 4. */
return gen_mcmp(OR_LINK, 0, BPF_B, 0x40, 0xF0);
#ifdef INET6
case ETHERTYPE_IPV6:
/* Check for a version number of 6. */
return gen_mcmp(OR_LINK, 0, BPF_B, 0x60, 0xF0);
#endif
return gen_true(); /* always true */
default:
return gen_false(); /* always false */
@ -4591,7 +4594,6 @@ gen_proto(v, proto, dir)
*
* So we always check for ETHERTYPE_IP.
*/
b0 = gen_linktype(ETHERTYPE_IP);
#ifndef CHASE_CHAIN
b1 = gen_cmp(OR_NET, 9, BPF_B, (bpf_int32)v);