URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5618a8128728490133cfbff7d7cd6721a336efa6
Submitter: "Peter Wu <peter@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark
Commits:
5618a81 by Peter Wu (peter@xxxxxxxxxxxxx):
ieee80211: fix addresses for ToDS=1|FromDS=1 case
For Data frames with ToDs=1|FromDS=1 and a Frame body containing A-MSDU,
the Addr3 and Addr4 fields are not Destination/Source addresses (DA/SA),
but BSSID/BSSID. Use the RA/TA fields for the Hw Dest/Src columns and
add another BSSID field for Addr4 (should match Addr3, but in theory the
wire format could have different values).
While at it, fix the A-MSDU case for other cases to match 802.11-2016
Table 9-26 Address field contents. The "Short A-MSDU" case as used by
DNG STAs are not handled here though.
Tested against a capture with MSDU frames (all but ToDS=1|FromDS=1) and
the test case from the linked bug.
Bug: 15144
Change-Id: Ic832d7cd7b8e05a1408353cb79c07efed0fb19cc
Reviewed-on: https://code.wireshark.org/review/29935
Petri-Dish: Peter Wu <peter@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
(cherry picked from commit b3cbb4faf12691af2cc9127b36889b7593306409)
Reviewed-on: https://code.wireshark.org/review/29957
Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
Actions performed:
from 703ead5 Qt: Set enabled properties in Filter Dialog
add 5618a81 ieee80211: fix addresses for ToDS=1|FromDS=1 case
Summary of changes:
epan/dissectors/packet-ieee80211.c | 101 +++++++++++++++++++++++++------------
1 file changed, 70 insertions(+), 31 deletions(-)