diff options
| author | guy <guy> | 2007-05-30 18:06:38 +0000 |
|---|---|---|
| committer | guy <guy> | 2007-05-30 18:06:38 +0000 |
| commit | 7e4cec85cad51f46a209f091aec3e991517561cf (patch) | |
| tree | c1f70ead2478c935cbc53d909400a2aa7934875f | |
| parent | e82ab208e3659c5dbd2c2c52e85b7cb911b03c77 (diff) | |
| download | libpcap-7e4cec85cad51f46a209f091aec3e991517561cf.tar.gz | |
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.
| -rw-r--r-- | gencode.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -21,7 +21,7 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.46 2007-02-08 07:17:25 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.47 2007-05-30 18:06:38 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -2046,7 +2046,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? @@ -2054,10 +2054,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 */ @@ -4575,7 +4578,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); |