osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

radiotap: Add support for the EOF bit in the A-MPDU Status flags. 

Change-Id: I80577a0082227d892426f478ffcfff23d6ba0daa
Reviewed-on: https://code.wireshark.org/review/25472
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
Richard Sharpe 2018-01-25 09:27:44 -08:00 committed by Alexis La Goutte
parent 02a3056af3
commit 6176441f61
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-ieee80211-radiotap-defs.h
View File

@ -322,7 +322,8 @@ enum ieee80211_radiotap_type {
#define IEEE80211_RADIOTAP_AMPDU_IS_LAST 0x0008
#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR 0x0010
#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN 0x0020
#define IEEE80211_RADIOTAP_AMPDU_EOF 0x0040
#define IEEE80211_RADIOTAP_AMPDU_EOF_KNOWN 0x0080
/* For IEEE80211_RADIOTAP_VHT */
#define IEEE80211_RADIOTAP_VHT_HAVE_STBC 0x0001

16
epan/dissectors/packet-ieee80211-radiotap.c
View File

@ -130,6 +130,8 @@ static int hf_radiotap_ampdu_flags_last_known = -1;
static int hf_radiotap_ampdu_flags_is_last = -1;
static int hf_radiotap_ampdu_flags_delim_crc_error = -1;
static int hf_radiotap_ampdu_delim_crc = -1;
static int hf_radiotap_ampdu_flags_eof_known = -1;
static int hf_radiotap_ampdu_flags_eof = -1;
static int hf_radiotap_vht = -1;
static int hf_radiotap_vht_known = -1;
static int hf_radiotap_vht_have_stbc = -1;
@ -2161,6 +2163,10 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u
tvb, offset + 4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ampdu_flags_tree, hf_radiotap_ampdu_flags_delim_crc_error,
tvb, offset + 4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ampdu_flags_tree, hf_radiotap_ampdu_flags_eof,
tvb, offset + 4, 2, ENC_LITTLE_ENDIAN);
proto_tree_add_item(ampdu_flags_tree, hf_radiotap_ampdu_flags_eof_known,
tvb, offset + 4, 2, ENC_LITTLE_ENDIAN);
}
if (ampdu_flags & IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN) {
if (ampdu_tree)
@ -3050,6 +3056,16 @@ void proto_register_radiotap(void)
FT_BOOLEAN, 16, NULL, IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR,
NULL, HFILL}},
{&hf_radiotap_ampdu_flags_eof,
{"EOF on this subframe", "radiotap.ampdu.flags.eof",
FT_BOOLEAN, 16, NULL, IEEE80211_RADIOTAP_AMPDU_EOF,
NULL, HFILL}},
{&hf_radiotap_ampdu_flags_eof_known,
{"EOF of this A-MPDU is known", "radiotap.ampdu.flags.eof_known",
FT_BOOLEAN, 16, NULL, IEEE80211_RADIOTAP_AMPDU_EOF_KNOWN,
NULL, HFILL}},
{&hf_radiotap_ampdu_delim_crc,
{"A-MPDU subframe delimiter CRC", "radiotap.ampdu.delim_crc",
FT_UINT8, BASE_HEX, NULL, 0x0,