Wireshark-commits: [Wireshark-commits] master-2.4 485234a: Don't register the link-layer 802.11 dis

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:53:18 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=485234ad7dfef9a5080f4163293b171dfaa887a2
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.4
Repository: wireshark

Commits:

485234a 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 no data to subdissectors registered in the gre.proto
    table, which the 802.11 dissector will treat as an "FCS presence
    unknown" indication, even though it's known to be absent.
    
    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>
    (cherry picked from commit 6401440932006465004650d3ac3722670174d0ac)
    Reviewed-on: https://code.wireshark.org/review/26561
    

Actions performed:

    from  913707b   6lowpan: Add option to toggle IID U/L bit
    adds  485234a   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(-)