osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Radiotap: add 'data retries' field (bit number 17)

This commit is contained in:
Tomas Kukosa 2021-07-01 07:29:32 +02:00 committed by Wireshark GitLab Utility
parent 983306087c
commit 5ba8139852
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,6 +103,7 @@ static int hf_radiotap_db_antnoise = -1;
static int hf_radiotap_tx_attenuation = -1;
static int hf_radiotap_db_tx_attenuation = -1;
static int hf_radiotap_txpower = -1;
static int hf_radiotap_data_retries = -1;
static int hf_radiotap_vendor_ns = -1;
static int hf_radiotap_ven_oui = -1;
static int hf_radiotap_ven_subns = -1;
@ -190,6 +191,7 @@ static int hf_radiotap_present_db_antnoise = -1;
static int hf_radiotap_present_hdrfcs = -1;
static int hf_radiotap_present_rxflags = -1;
static int hf_radiotap_present_txflags = -1;
static int hf_radiotap_present_data_retries = -1;
static int hf_radiotap_present_xchannel = -1;
static int hf_radiotap_present_mcs = -1;
static int hf_radiotap_present_ampdu = -1;
@ -2982,6 +2984,9 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u
proto_tree_add_item(present_word_tree,
hf_radiotap_present_txflags, tvb,
offset + 4, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(present_word_tree,
hf_radiotap_present_data_retries, tvb,
offset + 4, 4, ENC_LITTLE_ENDIAN);
proto_tree_add_item(present_word_tree,
hf_radiotap_present_xchannel, tvb,
offset + 4, 4, ENC_LITTLE_ENDIAN);
@ -3179,6 +3184,12 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* u
offset);
break;
case IEEE80211_RADIOTAP_DATA_RETRIES:
proto_tree_add_item(item_tree,
hf_radiotap_data_retries, tvb,
offset, 1, ENC_LITTLE_ENDIAN);
break;
case IEEE80211_RADIOTAP_XCHANNEL:
dissect_radiotap_xchannel(tvb, pinfo, item_tree,
offset, &phdr);
@ -3983,6 +3994,11 @@ void proto_register_radiotap(void)
FT_BOOLEAN, 32, TFS(&tfs_present_absent), RADIOTAP_MASK(RX_FLAGS),
"Specifies if the FCS field is present", HFILL}},
{ &hf_radiotap_present_data_retries,
{"data retries", "radiotap.present.data_retries",
FT_BOOLEAN, 32, TFS(&tfs_present_absent), RADIOTAP_MASK(DATA_RETRIES),
"Specifies if the data retries field is present", HFILL}},
{&hf_radiotap_present_xchannel,
{"Channel+", "radiotap.present.xchannel",
FT_BOOLEAN, 32, TFS(&tfs_present_absent), RADIOTAP_MASK(XCHANNEL),
@ -4401,6 +4417,11 @@ void proto_register_radiotap(void)
"Transmit power at the antenna port expressed as decibels"
" from one milliwatt", HFILL}},
{ &hf_radiotap_data_retries,
{"data retries", "radiotap.data_retries",
FT_UINT8, BASE_DEC, NULL, 0x0,
"Number of data retries a transmitted frame used", HFILL} },
{&hf_radiotap_mcs,
{"MCS information", "radiotap.mcs",
FT_NONE, BASE_NONE, NULL, 0x0,