diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-11-17 19:10:14 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2014-11-17 21:25:22 +0000 |
| commit | 5c7c7018a08587cd0460d2a70b82364eea4779a5 (patch) | |
| tree | e07a4172f394880f601846da70fe4c0a062840c9 /epan/dissectors | |
| parent | 4b63d9fbed06e7a7ef91f7ed61ad8152ed269689 (diff) | |
802.11: Enhance Supported Operating Classes
* Use expert_info to display warning about length (Remove proto_tree_add_text)
Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50
Reviewed-on: https://code.wireshark.org/review/5369
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 57a34e076a..e56b77e5ec 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -15202,23 +15202,19 @@ add_tagged_field(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb, int offset } case TAG_SUPPORTED_OPERATING_CLASSES: { - guint8 current_field; guint i; if (tag_len < 2) { - proto_tree_add_text (tree, tvb, offset + 2, tag_len, - "Supported Operating Classes: Error: Tag length must be at least 2 bytes long"); + expert_add_info_format(pinfo, ti_len, &ei_ieee80211_tag_length, "Tag Length %u wrong, must be >= 3", tag_len); break; } else if (tag_len > 32) { - proto_tree_add_text (tree, tvb, offset + 2, tag_len, - "Supported Operating Classes: Error: Tag length must be no more than 32 bytes long"); + expert_add_info_format(pinfo, ti_len, &ei_ieee80211_tag_length, "Tag Length %u wrong, must be < 32", tag_len); break; } offset += 2; - current_field = tvb_get_guint8 (tvb, offset); - proto_tree_add_uint(tree, hf_ieee80211_tag_supported_ope_classes_current, tvb, offset, 1, current_field); + proto_tree_add_item(tree, hf_ieee80211_tag_supported_ope_classes_current, tvb, offset, 1, ENC_NA); offset += 1; /* Partially taken from the ssid section */ |