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

ieee80211-radio: Fix calculation of frame start time 

With captures where TSF indicates the end of the frame the
preamble was being counted twice in the calculation of the start.

Change-Id: I3d042d8ea3bc46a833438cb3d2f75e3499a7711d
Reviewed-on: https://code.wireshark.org/review/22020
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
This commit is contained in:
Simon Barber 2017-06-07 12:06:26 -07:00 committed by Stig Bjørlykke
parent 6a16f158c8
commit 33456f48ac
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-ieee80211-radio.c
View File

@ -1095,7 +1095,7 @@ dissect_wlan_radio_phdr (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
agg_tracker_list = NULL;
};
} else if (wlan_radio_tsf_at_end) {
wlan_radio_info->start_tsf = phdr->tsf_timestamp - duration - preamble;
wlan_radio_info->start_tsf = phdr->tsf_timestamp - duration;
wlan_radio_info->end_tsf = phdr->tsf_timestamp;
} else {
wlan_radio_info->start_tsf = phdr->tsf_timestamp + prior_duration - preamble;