Wireshark-commits: [Wireshark-commits] master-2.0 4e30151: Fix dissection of control frames.

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: Wed, 16 Mar 2016 19:37:31 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4e30151acf33cd0df375ff41374732d10776414d
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

4e30151 by Guy Harris (guy@xxxxxxxxxxxx):

    Fix dissection of control frames.
    
    Don't conditiionalize stuff that should always be done with a test of
    whether the protocol tree is being constructed or not.
    
    Don't add an extra bogus address field to CF-End frames.
    
    Bug: 12266
    Change-Id: I0840d63480f9d7d8ffa434d984082a4a46a00d12
    Reviewed-on: https://code.wireshark.org/review/14493
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 53e8bb89cd1b2558006a1b7ed44695282d6d06d3)
    Reviewed-on: https://code.wireshark.org/review/14494
    

Actions performed:

    from  4b59d47   Indicate where ACAP is specified.
    adds  4e30151   Fix dissection of control frames.


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