Wireshark-commits: [Wireshark-commits] master 6401440: Don't register the link-layer 802.11 dissect

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 20 Mar 2018 06:49:06 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6401440932006465004650d3ac3722670174d0ac
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

6401440 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't register the link-layer 802.11 dissector in the gre.proto table.
    
    That dissector expects to be handed an 802.11 pseudoheader; the GRE
    dissector passes the flags and version from the GRE header to
    subdissectors registered in the gre.proto table, so they'd better either
    expect the flags-and-version structure or ignore the pseudoheader.  (For
    802.11, the pseudoheader has radio information, but that's not available
    from GRE.)
    
    Use the no-FCS 802.11 frame dissector instead.
    
    Bug: 14544
    Change-Id: I6515901dc3674eb36ec768fa4f9a7a4040a78365
    Reviewed-on: https://code.wireshark.org/review/26560
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  ff4a7a6   QUIC: ensure Initial Packet decryption at first pass
    adds  6401440   Don't register the link-layer 802.11 dissector in the gre.proto table.


Summary of changes:
 epan/dissectors/packet-ieee80211.c | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)