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

Don't use the value of the Flags field if we didn't have it. 

Change-Id: Idd7771bd39ee823981b31b827645abd2ae516f66
Reviewed-on: https://code.wireshark.org/review/9039
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-06-22 16:16:23 -07:00
parent eaf62bbf86
commit 79c384d1d1
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1209,11 +1209,13 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
* but used" for that purpose, according to
* the radiotap.org page for that field.
*/
phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
if (rflags & 0x80)
phdr.short_gi = 1;
else
phdr.short_gi = 0;
if (have_rflags) {
phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
if (rflags & 0x80)
phdr.short_gi = 1;
else
phdr.short_gi = 0;
}
break;
case IEEE80211_CHAN_G|IEEE80211_CHAN_HT20:
@ -1229,11 +1231,13 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
* but used" for that purpose, according to
* the radiotap.org page for that field.
*/
phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
if (rflags & 0x80)
phdr.short_gi = 1;
else
phdr.short_gi = 0;
if (have_rflags) {
phdr.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
if (rflags & 0x80)
phdr.short_gi = 1;
else
phdr.short_gi = 0;
}
break;
}
freq = tvb_get_letohs(tvb, offset + 4);