Wireshark-commits: [Wireshark-commits] master-2.6 ecca992: Fix dissection of 802.11+radiotap frames
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 13 Nov 2018 03:39:14 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ecca992cfde84db9947144b610f7c61077fa5e7a
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

ecca992 by Guy Harris (guy@xxxxxxxxxxxx):

    Fix dissection of 802.11+radiotap frames in Linux "cooked" captures.
    
    Those frames *don't* have their link-layer headers stripped, even on
    PF_PACKET/SOCK_DGRAM captures (hopefully, nobody will consider that a
    bug and "fix" it).
    
    The "hatype" field is the ARPHRD_ value for the adapter, as returned by
    SIOCGIFHWADDR; in monitor mode, those frames will have an hatype of
    ARPHRD_IEEE80211_RADIOTAP.  Add an "sll.hatype" dissector table, which
    we check before checking the "sll.ltype" dissector table, and have the
    radiotap dissector register in that table.
    
    We still use the special hack for an hatype of ARPHRD_NETLINK, because,
    for *those* frames, the "protocol" field of the nominal SLL header is
    the netlink family, not an Ethertype or anything else that the SLL
    dissector would handle.
    
    Change-Id: If503a7daa9133adf1b8c330ec28c4c824d4f551d
    Reviewed-on: https://code.wireshark.org/review/30592
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit ab498b69f192989ed013d6426bc8fdd2cc44866a)
    Reviewed-on: https://code.wireshark.org/review/30593
    

Actions performed:

    from  10b0a76   IPv6: Fix payload root tree for IPv6 Routing Hdr
     add  ecca992   Fix dissection of 802.11+radiotap frames in Linux "cooked" captures.


Summary of changes:
 epan/dissectors/packet-ieee80211-radiotap.c |  9 +++++
 epan/dissectors/packet-sll.c                | 61 ++++++++++++++++++++++-------
 epan/dissectors/packet-sll.h                | 13 +++++-
 3 files changed, 67 insertions(+), 16 deletions(-)