Fix the handling of IPX in VLAN encapsulation so that the SNAP header is

tested after all the VLAN headers, rather than after the initial MAC
header.

diff --git a/gencode.c b/gencode.c
index 7a8989f2ee02d686d54bcf15fe6db0daa5e4224f..fd1db5aa8c2cabdc75851e2df091d1b7ea3cbb31 100644 (file)
--- 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.290.2.3 2007-11-04 22:16:18 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/gencode.c,v 1.290.2.4 2007-11-04 22:29:35 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -1709,7 +1709,7 @@ gen_ether_linktype(proto)
                 * Now we add code to check for SNAP frames with
                 * ETHERTYPE_IPX, i.e. Ethernet_SNAP.
                 */
-               b0 = gen_snap(0x000000, ETHERTYPE_IPX, 14);
+               b0 = gen_snap(0x000000, ETHERTYPE_IPX, off_linktype + 2);
                gen_or(b0, b1);
 
                /*