diff options
| author | Adrian Granados <adrian@intuitibits.com> | 2022-09-28 16:44:47 -0400 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2022-09-29 06:39:22 +0000 |
| commit | da978b809353e742ce0a4e25b3662782e1658598 (patch) | |
| tree | 7b922bf76bdf945c6e76aa91ebe494a90af1cd50 /epan/dissectors/packet-ieee80211.c | |
| parent | 1889b1f455e9e4a829241c094d8b1fd9a3ba0006 (diff) | |
ieee80211: Fix Ruckus, Mist, and Aerohite vendor-specific dissectors
Makes sure "Unknown" is added to tree for unknown vendor-specific types.
Diffstat (limited to 'epan/dissectors/packet-ieee80211.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index aee71b0a79..c00a99b41f 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -18027,14 +18027,13 @@ dissect_vendor_ie_aerohive(proto_item *item _U_, proto_tree *ietree, tag_len -= 1; proto_tree_add_item(ietree, hf_ieee80211_vs_aerohive_version, tvb, offset, 1, ENC_NA); + proto_item_append_text(item, ": %s", val_to_str_const(type, ieee80211_vs_aerohive_type_vals, "Unknown")); offset += 1; tag_len -= 1; switch(type){ case AEROHIVE_HOSTNAME: /* Subtype (1 byte) + Host Name Length (1 byte) + Host Name */ - proto_item_append_text(item, ": %s", val_to_str_const(type, ieee80211_vs_aerohive_type_vals, "Unknown")); - proto_tree_add_item(ietree, hf_ieee80211_vs_aerohive_subtype, tvb, offset, 1, ENC_NA); offset += 1; tag_len -= 1; @@ -18073,18 +18072,15 @@ dissect_vendor_ie_mist(proto_item *item _U_, proto_tree *ietree, /* VS OUI Type */ type = tvb_get_guint8(tvb, offset); + proto_item_append_text(item, ": %s", val_to_str_const(type, ieee80211_vs_mist_type_vals, "Unknown")); offset += 1; tag_len -= 1; switch(type){ case MIST_APNAME: - - proto_item_append_text(item, ": %s", val_to_str_const(type, ieee80211_vs_mist_type_vals, "Unknown")); - length = tag_len; proto_tree_add_item_ret_string(ietree, hf_ieee80211_vs_mist_ap_name, tvb, offset, length, ENC_ASCII|ENC_NA, wmem_packet_scope(), &apname); proto_item_append_text(item, " (%s)", apname); - break; default: @@ -18107,18 +18103,15 @@ dissect_vendor_ie_ruckus(proto_item *item _U_, proto_tree *ietree, /* VS OUI Type */ type = tvb_get_guint8(tvb, offset); + proto_item_append_text(item, ": %s", val_to_str_const(type, ieee80211_vs_ruckus_type_vals, "Unknown")); offset += 1; tag_len -= 1; switch(type){ case RUCKUS_APNAME: - - proto_item_append_text(item, ": %s", val_to_str_const(type, ieee80211_vs_ruckus_type_vals, "Unknown")); - - length = tag_len; + length = tag_len; proto_tree_add_item_ret_string(ietree, hf_ieee80211_vs_ruckus_ap_name, tvb, offset, length, ENC_ASCII|ENC_NA, wmem_packet_scope(), &apname); proto_item_append_text(item, " (%s)", apname); - break; default: |