diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-02-21 23:34:33 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-02-21 23:34:33 +0000 |
| commit | 96bfaddff205e5d4aa420644110a9a2372e2a3de (patch) | |
| tree | 541ecfba08bb60cf0ff536f8e6f41d87c53fcd74 /packet-ieee80211.c | |
| parent | 15c2a5a65139a8826defd4e0aaa0d67be5e7c40a (diff) | |
The number of bytes of tagged parameters should be computed by seeing
how many bytes remain in the packet starting at the initial offset of
the tagged parameters, not by seeing how many bytes remain in the packet
starting 4 bytes later. (If you're trying to avoid counting a CRC that
appears at the end of the packet data, then you need to be sure there
*is* a CRC first; this may require using a different DLT_ type, in
libpcap, for those captures.)
svn path=/trunk/; revision=4769
Diffstat (limited to 'packet-ieee80211.c')
| -rw-r--r-- | packet-ieee80211.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index 4abaedd2fd..99f0bb185f 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.49 2002/01/28 01:13:48 guy Exp $ + * $Id: packet-ieee80211.c,v 1.50 2002/02/21 23:34:33 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -851,7 +851,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 4; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -873,7 +873,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 6; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -894,7 +894,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 10; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -914,7 +914,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 6; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -930,7 +930,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, case MGT_PROBE_REQ: next_idx = 0; tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -951,7 +951,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 12; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -973,7 +973,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 12; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); tagged_tree = get_tagged_parameter_tree (mgt_tree, tvb, next_idx, tagged_parameter_tree_len); @@ -1005,7 +1005,7 @@ dissect_ieee80211_mgt (guint16 fcf, tvbuff_t * tvb, packet_info * pinfo, next_idx = 6; /* Size of fixed fields */ tagged_parameter_tree_len = - tvb_reported_length_remaining(tvb, next_idx + 4); + tvb_reported_length_remaining(tvb, next_idx); if (tagged_parameter_tree_len != 0) { tagged_tree = get_tagged_parameter_tree (mgt_tree, |