URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b711b300cc9da138ff4d1a5aeeae538710c9daa5
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
b711b30 by Guy Harris (gharris@xxxxxxxxx):
netmon: handle non-monitor-mode 802.11 packets differently.
Microsoft Network Monitor lets you capture on an 802.11 adapter either
in monitor mode or in non-monitor mode; frames captured in non-monitor
mode may have the Protected bit set in the 802.11 header, but are
decrypted and don't incclude encryption information, and may have the
A-MSDU Present flag set in the QoS Control field, but have just a
regular frame payload, not a sequence of A-MSDUs, in the payload field.
Dissect those frames correctly.
Bug: 16758
Change-Id: I42b7e9ce52faa80222692403fa7276c039644343
Reviewed-on: https://code.wireshark.org/review/38082
Petri-Dish: Guy Harris <gharris@xxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
Actions performed:
from 0670230 editcap: use constant for maximum nanosecs in 1sec
add b711b30 netmon: handle non-monitor-mode 802.11 packets differently.
Summary of changes:
epan/dissectors/packet-ieee80211-netmon.c | 23 +++++++++++++++++++++--
epan/dissectors/packet-ieee80211.c | 5 +++--
wiretap/netmon.c | 6 ++++++
wiretap/wtap.h | 5 +++--
4 files changed, 33 insertions(+), 6 deletions(-)