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

From Daniel Smith via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6264 

Wireshark improperly parsing 802.11 Beacon Country Information tag

From me:
Fix this issue (miss the optionnal Pad field for Country Tag)

svn path=/trunk/; revision=38878
This commit is contained in:
Alexis La Goutte 2011-09-04 19:16:20 +00:00
parent f688ab434c
commit 810cc7696b
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
epan/dissectors/packet-ieee80211.c
View File

@ -1748,6 +1748,7 @@ static int hf_ieee80211_tim_partial_virtual_bitmap = -1;
static int hf_ieee80211_tag_ibss_atim_window = -1;
static int hf_ieee80211_tag_country_info_code = -1;
static int hf_ieee80211_tag_country_info_env = -1;
static int hf_ieee80211_tag_country_info_pad = -1;
static int hf_ieee80211_tag_country_info_fnm = -1;
static int hf_ieee80211_tag_country_info_fnm_fcn = -1;
static int hf_ieee80211_tag_country_info_fnm_nc = -1;
@ -6856,6 +6857,13 @@ add_tagged_field(packet_info * pinfo, proto_tree * tree, tvbuff_t * tvb, int off
while(offset < tag_end)
{
/* Padding ? */
if ((tag_end - offset) < 3)
{
proto_tree_add_item(tree, hf_ieee80211_tag_country_info_pad, tvb, offset, 1, ENC_NA);
offset += 1;
continue;
}
if(tvb_get_guint8(tvb, offset) <= 200) { /* 802.11d */
sub_item = proto_tree_add_item(tree, hf_ieee80211_tag_country_info_fnm, tvb, offset, 3, FALSE);
sub_tree = proto_item_add_subtree(sub_item, ett_tag_country_fnm_tree);
@ -13466,6 +13474,11 @@ proto_register_ieee80211 (void)
FT_UINT8, BASE_HEX, VALS(environment_vals), 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_pad,
{"Padding", "wlan_mgt.country_info.padding",
FT_BYTES, BASE_NONE, NULL, 0x0,
NULL, HFILL }},
{&hf_ieee80211_tag_country_info_fnm,
{"Country Info", "wlan_mgt.country_info.fnm",
FT_NONE, BASE_NONE, NULL, 0x0,