diff options
| author | Richard Sharpe <realrichardsharpe@gmail.com> | 2017-11-09 05:10:11 -0800 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-11-10 00:08:18 +0000 |
| commit | e935e902d6ca1ce3265edd944bfe045b05706ee1 (patch) | |
| tree | 6f10c2a3c0ca571dc6e9e01600c01c6ea8ffddf4 /epan | |
| parent | 19a46ba774b127ca0b6a96772310f149f2ff198a (diff) | |
ieee802.11: Fix the display of the Cisco Aironet DTPC value.
The DTPC value is in dBm, so make it so.
There is a second byte that we are looking for a spec on.
Bug: 14193
Change-Id: I69f0af295954958fde38b74e965f6fb66063513b
Reviewed-on: https://code.wireshark.org/review/24322
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 1ac7162008..95c349e353 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -4361,6 +4361,7 @@ static int hf_ieee80211_wfa_ie_wme_tspec_medium = -1; static int hf_ieee80211_aironet_ie_type = -1; static int hf_ieee80211_aironet_ie_dtpc = -1; +static int hf_ieee80211_aironet_ie_dtpc_unknown = -1; static int hf_ieee80211_aironet_ie_version = -1; static int hf_ieee80211_aironet_ie_data = -1; static int hf_ieee80211_aironet_ie_qos_reserved = -1; @@ -10860,8 +10861,11 @@ dissect_vendor_ie_aironet(proto_item *aironet_item, proto_tree *ietree, switch (type) { case AIRONET_IE_DTPC: - proto_tree_add_item(ietree, hf_ieee80211_aironet_ie_dtpc, tvb, offset, 2, ENC_NA); - proto_item_append_text(aironet_item, ": Aironet DTPC Powerlevel 0x%02X", tvb_get_guint8(tvb, offset)); + proto_tree_add_item(ietree, hf_ieee80211_aironet_ie_dtpc, tvb, offset, 1, ENC_NA); + proto_item_append_text(aironet_item, ": Aironet DTPC Powerlevel %ddBm", tvb_get_guint8(tvb, offset)); + offset += 1; + proto_tree_add_item(ietree, hf_ieee80211_aironet_ie_dtpc_unknown, tvb, offset, 1, ENC_NA); + offset += 1; dont_change = TRUE; break; case AIRONET_IE_VERSION: @@ -26788,6 +26792,11 @@ proto_register_ieee80211(void) {&hf_ieee80211_aironet_ie_dtpc, {"Aironet IE CCX DTCP", "wlan.aironet.dtpc", + FT_INT8, BASE_DEC|BASE_UNIT_STRING, &units_dbm, 0, + NULL, HFILL }}, + + {&hf_ieee80211_aironet_ie_dtpc_unknown, + {"Aironet IE CCX DTCP Unknown", "wlan.aironet.dtpc_unknown", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, |