diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-01-05 19:54:06 +0100 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-06 03:37:39 +0000 |
| commit | 3871df544a7ad16a6e418153e893f0caeb91f142 (patch) | |
| tree | c412a708e3497b85a152c8da748378cfb7c7d4c9 | |
| parent | b4176fdaa55d7ffb5cfd7c6b28927949ea985161 (diff) | |
802.11(ad): align length of Beam Forming
use UINT16
Change-Id: I7f7c4e847ed6ccb6ced446d493aa27f76cc8db61
Reviewed-on: https://code.wireshark.org/review/19559
Reviewed-by: Michael Mann <mmann78@netscape.net>
| -rw-r--r-- | epan/dissectors/packet-ieee80211.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 600e61ebf4..2dbe25480e 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -8549,9 +8549,9 @@ add_ff_beamforming_ctrl(proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo _U_, guint16 bf_field = tvb_get_letohs(tvb, offset); gboolean isInit = (bf_field & 0x2) >> 1; gboolean isResp = (bf_field & 0x4) >> 2; - proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_train, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_is_init, tvb, offset, 1, ENC_LITTLE_ENDIAN); - proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_is_resp, tvb, offset, 1, ENC_LITTLE_ENDIAN); + proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_train, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_is_init, tvb, offset, 2, ENC_LITTLE_ENDIAN); + proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_is_resp, tvb, offset, 2, ENC_LITTLE_ENDIAN); if((isInit==TRUE) && (isResp==TRUE) && isGrant) { proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_num_sectors, tvb, offset, 2, ENC_LITTLE_ENDIAN); proto_tree_add_item(bf_tree, hf_ieee80211_ff_bf_num_rx_dmg_ants, tvb, offset, 2, ENC_LITTLE_ENDIAN); @@ -19773,37 +19773,37 @@ proto_register_ieee80211(void) {&hf_ieee80211_ff_bf_train, {"Beam Forming Training", "wlan.bf.train", - FT_BOOLEAN, 8, NULL, 0x01, + FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }}, {&hf_ieee80211_ff_bf_is_init, {"Beam Forming Is InitiatorTXSS", "wlan.bf.isInit", - FT_BOOLEAN, 8, NULL, 0x02, + FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL }}, {&hf_ieee80211_ff_bf_is_resp, {"Beam Forming Is ResponderTXSS", "wlan.bf.isResp", - FT_BOOLEAN, 8, NULL, 0x4, + FT_BOOLEAN, 16, NULL, 0x0004, NULL, HFILL }}, {&hf_ieee80211_ff_bf_rxss_len, {"Beam Forming RXSS Length", "wlan.bf.rxss_len", - FT_UINT16, BASE_DEC, NULL, 0x1f8, + FT_UINT16, BASE_DEC, NULL, 0x01f8, NULL, HFILL }}, {&hf_ieee80211_ff_bf_rxss_rate, {"Beam Forming RXSS Rate", "wlan.bf.rxss_rate", - FT_BOOLEAN, 16, NULL, 0x200, + FT_BOOLEAN, 16, NULL, 0x0200, NULL, HFILL }}, {&hf_ieee80211_ff_bf_num_sectors, {"Beam Forming Total Number of Sectors", "wlan.bf.num_sectors", - FT_UINT16, BASE_DEC, NULL, 0x3f8, + FT_UINT16, BASE_DEC, NULL, 0x03f8, NULL, HFILL }}, {&hf_ieee80211_ff_bf_num_rx_dmg_ants, {"Beam Forming Number of DMG Antennas", "wlan.bf.num_dmg_ants", - FT_UINT16, BASE_DEC, NULL, 0xc00, + FT_UINT16, BASE_DEC, NULL, 0x0c00, NULL, HFILL }}, {&hf_ieee80211_addr_nav_da, |