Fix an error where we expect the tagged parameters field to be present even
though the spec (802.11ad-2012) says they are optional. Communicated to me by the WiFi Alliance. I have captures. Not sure if I can share them. Change-Id: Id5998594214ac4b6a1d3baf3cb2f0d4fe6227b40 Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/9785 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
parent
92fa272e09
commit
47c175376b
|
@ -9020,8 +9020,15 @@ dissect_ieee80211_extension(guint16 fcf, tvbuff_t *tvb, packet_info *pinfo, prot
|
|||
offset += add_ff_cc_field(fixed_tree,tvb, offset, dis);
|
||||
}
|
||||
tagged_parameter_tree_len = tvb_reported_length_remaining(tvb, offset);
|
||||
tagged_tree = get_tagged_parameter_tree (ext_tree, tvb, offset, tagged_parameter_tree_len);
|
||||
ieee_80211_add_tagged_parameters(tvb, offset, pinfo, tagged_tree, tagged_parameter_tree_len, EXTENSION_DMG_BEACON);
|
||||
|
||||
/*
|
||||
* The tagged params are optional here. See Table 8.33a of the 2012
|
||||
* version of the standard.
|
||||
*/
|
||||
if (tagged_parameter_tree_len) {
|
||||
tagged_tree = get_tagged_parameter_tree (ext_tree, tvb, offset, tagged_parameter_tree_len);
|
||||
ieee_80211_add_tagged_parameters(tvb, offset, pinfo, tagged_tree, tagged_parameter_tree_len, EXTENSION_DMG_BEACON);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue