Wireshark-commits: [Wireshark-commits] master 08e15a8: Don't assume we have a protocol tree.
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: Fri, 18 Nov 2016 02:36:17 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=08e15a8f43200c76ee45bc20000d5b8d6679ae1f
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

08e15a8 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't assume we have a protocol tree.
    
    In the association_sanity_check_t structure:
    
    Have separate flags to indicate whether we *have* an IE specifying an
    FT AKM suite and whether we *have* an IE specifying a non-FT AKM suite.
    Use those to decide whether to add an expert info, so we add it
    regardless of whether we are building a protocol tree or not.
    
    Set the protocol tree item for the first FT AKM suite and the first
    non-FT AKM suite only if we have a protocol tree.
    
    Bug: 13149
    Change-Id: I16a3194017b34d8d2c9128364c2761d1c202969d
    Reviewed-on: https://code.wireshark.org/review/18863
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  50515b9   ieee80211: warn about FT AKM suite mismatches
    adds  08e15a8   Don't assume we have a protocol tree.


Summary of changes:
 epan/dissectors/packet-ieee80211.c |   12 +++++++-----
 epan/dissectors/packet-ieee80211.h |    4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)