diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-28 12:43:33 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-28 19:44:07 +0000 |
| commit | b9145bc836daafd6cad960b95e9d2144781e7317 (patch) | |
| tree | da80f67670fce4a90aca67ddc28272a4d620f0d8 /epan/dissectors/packet-ieee80211-radio.c | |
| parent | 8aaf42d2b11b993d54283a5944841813a06881d5 (diff) | |
| download | wireshark-b9145bc836daafd6cad960b95e9d2144781e7317.tar.gz | |
"Short preamble" is 802.11[bg]-only, so put it in the PHY-specifc info.
We're already only setting it for 11b and 11g; this makes it a bit
cleaner, e.g. we don't need to say "oh, wait, we *don't* have short
preamble" for 11n and 11ac.
Change-Id: Idcf3e8c93d6a417f0319e4bd33247b98f07b6052
Reviewed-on: https://code.wireshark.org/review/9209
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-ieee80211-radio.c')
| -rw-r--r-- | epan/dissectors/packet-ieee80211-radio.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ieee80211-radio.c b/epan/dissectors/packet-ieee80211-radio.c index 94ba5d69f7..0b9f404abf 100644 --- a/epan/dissectors/packet-ieee80211-radio.c +++ b/epan/dissectors/packet-ieee80211-radio.c @@ -704,6 +704,13 @@ dissect_wlan_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void } break; + case PHDR_802_11_PHY_11B: + if (phdr->phy_info.info_11b.presence_flags & PHDR_802_11B_HAS_SHORT_PREAMBLE) { + proto_tree_add_boolean(radio_tree, hf_wlan_radio_short_preamble, tvb, 0, 0, + phdr->phy_info.info_11b.short_preamble); + } + break; + case PHDR_802_11_PHY_11A: if (phdr->phy_info.info_11a.presence_flags & PHDR_802_11A_HAS_CHANNEL_TYPE) { proto_tree_add_uint(radio_tree, hf_wlan_radio_11a_channel_type, tvb, 0, 0, @@ -716,6 +723,10 @@ dissect_wlan_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void break; case PHDR_802_11_PHY_11G: + if (phdr->phy_info.info_11g.presence_flags & PHDR_802_11G_HAS_SHORT_PREAMBLE) { + proto_tree_add_boolean(radio_tree, hf_wlan_radio_short_preamble, tvb, 0, 0, + phdr->phy_info.info_11g.short_preamble); + } if (phdr->phy_info.info_11g.presence_flags & PHDR_802_11G_HAS_MODE) { proto_tree_add_uint(radio_tree, hf_wlan_radio_11g_mode, tvb, 0, 0, phdr->phy_info.info_11g.mode); @@ -922,11 +933,6 @@ dissect_wlan_radio (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void phdr->frequency); } - if (phdr->presence_flags & PHDR_802_11_HAS_SHORT_PREAMBLE) { - proto_tree_add_boolean(radio_tree, hf_wlan_radio_short_preamble, tvb, 0, 0, - phdr->short_preamble); - } - if (phdr->presence_flags & PHDR_802_11_HAS_SIGNAL_PERCENT) { col_add_fstr(pinfo->cinfo, COL_RSSI, "%u%%", phdr->signal_percent); proto_tree_add_uint_format_value(radio_tree, hf_wlan_radio_signal_percent, tvb, 0, 0, |