osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Enhance radiotap dissector 

* Display unused/not defined present flags
* Add expert info if unused/not defined present flags has not "zero"

svn path=/trunk/; revision=44333
This commit is contained in:
Alexis La Goutte 2012-08-08 12:32:04 +00:00
parent 37c7f3a7b0
commit 88c219908e
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-ieee80211-radiotap-defs.h
View File

@ -215,6 +215,10 @@ enum ieee80211_radiotap_type {
IEEE80211_RADIOTAP_EXT = 31
};
/* not (yet) defined Radiotap present flag */
/* Bit 21 to 28 are not defined (in binary : 0001 1111 1110 0000 0000 0000 0000 0000 */
#define IEEE80211_RADIOTAP_NOTDEFINED 0x1FE00000
/* Channel flags. */
#define IEEE80211_CHAN_TURBO 0x0010 /* Turbo channel */
#define IEEE80211_CHAN_CCK 0x0020 /* CCK channel */

18
epan/dissectors/packet-ieee80211-radiotap.c
View File

@ -38,6 +38,7 @@
#include <epan/tap.h>
#include <epan/prefs.h>
#include <epan/addr_resolv.h>
#include <epan/expert.h>
#include "packet-ieee80211.h"
#include "packet-ieee80211-radiotap.h"
#include "packet-ieee80211-radiotap-iter.h"
@ -583,6 +584,7 @@ static int hf_radiotap_present_rxflags = -1;
static int hf_radiotap_present_xchannel = -1;
static int hf_radiotap_present_mcs = -1;
static int hf_radiotap_present_ampdu = -1;
static int hf_radiotap_present_reserved = -1;
static int hf_radiotap_present_rtap_ns = -1;
static int hf_radiotap_present_vendor_ns = -1;
static int hf_radiotap_present_ext = -1;
@ -922,6 +924,11 @@ void proto_register_radiotap(void)
FT_BOOLEAN, 32, NULL, RADIOTAP_MASK(AMPDU_STATUS),
"Specifies if the A-MPDU status field is present", HFILL}},
{&hf_radiotap_present_reserved,
{"Reserved", "radiotap.present.reserved",
FT_UINT32, BASE_HEX, NULL, IEEE80211_RADIOTAP_NOTDEFINED,
"Not (yet) defined present flag (Must be zero)", HFILL}},
{&hf_radiotap_present_rtap_ns,
{"Radiotap NS next", "radiotap.present.rtap_ns",
FT_BOOLEAN, 32, NULL, RADIOTAP_MASK(RADIOTAP_NAMESPACE),
@ -1564,6 +1571,17 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
proto_tree_add_item(present_tree,
hf_radiotap_present_ampdu, tvb,
offset + 4, 4, ENC_LITTLE_ENDIAN);
ti = proto_tree_add_item(present_tree,
hf_radiotap_present_reserved, tvb,
offset + 4, 4, ENC_LITTLE_ENDIAN);
/* Check if Reserved/Not Defined is not "zero" */
if(bmap & IEEE80211_RADIOTAP_NOTDEFINED)
{
expert_add_info_format(pinfo,ti, PI_UNDECODED, PI_NOTE,
"Unknown Radiotap fields, code not implemented, "
"Please check radiotap documentation, "
"Contact Wireshark developers if you want this supported" );
}
always_bits:
proto_tree_add_item(present_tree,
hf_radiotap_present_rtap_ns, tvb,