Ethereal-dev: [Ethereal-dev] Fix for bug 476 [PATCH]

Note: This archive is from the project's previous web site, ethereal.com. This list is no longer active.

From: Jaap Keuter <jaap.keuter@xxxxxxxxx>
Date: Fri, 16 Dec 2005 15:40:49 +0100 (CET)
Hi list,

Radek Vokal of RedHat filed a bug found by Vladimir Kondratiev of Intel in
the 802.11 dissector. Radek provided a sample capture and Vladimir a
oneliner patch. I've ported the patch to svn 16820 and tested it against
the provided capture. Works well.

Thanx,
Jaap
Index: packet-ieee80211.c
===================================================================
--- packet-ieee80211.c	(revision 16820)
+++ packet-ieee80211.c	(working copy)
@@ -636,7 +636,7 @@
   case DATA_FRAME:
     len = (COOK_ADDR_SELECTOR(fcf) == DATA_ADDR_T4) ? DATA_LONG_HDR_LEN :
 						      DATA_SHORT_HDR_LEN;
-    if( IS_DATA_QOS(fcf))
+    if( IS_DATA_QOS(COMPOSE_FRAME_TYPE(fcf)))
       return len + 2;
     else
       return len;