From: guy <guy>
Date: Wed, 31 Aug 2005 06:50:01 +0000 (+0000)
Subject: When checking for VLAN packets, check the type field in the Ethernet
X-Git-Tag: libpcap-0.9.4~5
X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/ef309163d8827bfd3fbc65d3c98de33531050090

When checking for VLAN packets, check the type field in the Ethernet
header, not the VLAN header.
---

diff --git a/CHANGES b/CHANGES
index da52d87f..963fe196 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,12 @@
-@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.5 2005-08-23 03:48:16 guy Exp $ (LBL)
+@(#) $Header: /tcpdump/master/libpcap/CHANGES,v 1.59.2.6 2005-08-31 06:50:01 guy Exp $ (LBL)
 
-Mon. 	August 21, 2005.  ken@xelerance.com. Summary for 0.9.4 libpcap release
+Mon. 	August 30, 2005.  ken@xelerance.com. Summary for 0.9.4 libpcap release
 
 	Support for radiotap on Linux (Mike Kershaw)
 	Fixes for HP-UX
 	Support for additional Juniper link-layer types
 	Fixes for filters on MPLS-encapsulated packets
+	"vlan" filter fixed
 
 Tue. 	July 5, 2005.  ken@xelerance.com. Summary for 0.9.3 libpcap release
 
diff --git a/gencode.c b/gencode.c
index 4f240ba0..f7a8aa44 100644
--- a/gencode.c
+++ b/gencode.c
@@ -21,7 +21,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.32 2005-08-13 22:29:44 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.221.2.33 2005-08-31 06:50:02 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -6307,7 +6307,7 @@ gen_vlan(vlan_num)
 	}
 
 	/* check for VLAN */
-	b0 = gen_cmp(OR_LINK, off_linktype, BPF_H, (bpf_int32)ETHERTYPE_8021Q);
+	b0 = gen_cmp(OR_LINK, orig_linktype, BPF_H, (bpf_int32)ETHERTYPE_8021Q);
 
 	/* If a specific VLAN is requested, check VLAN id */
 	if (vlan_num >= 0) {