Wireshark · Wireshark-commits: [Wireshark-commits] master-2.6 eab2b25: Handle -k better on platforms that don't support it.

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=eab2b25448b89b191ff05a4bb340b94588f1aec8
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

eab2b25 by Guy Harris (guy@xxxxxxxxxxxx):

    Handle -k better on platforms that don't support it.
    
    Have ws80211_init() return an indication that channel setting isn't
    supported on those platforms.
    
    In dumpcap, try to set up ws80211 before checking the channel argument
    and, if it fails, report the failure, rather than failing because the
    "convert channel name to channel code" routine fails.
    
    See
    
        https://ask.wireshark.org/question/15535/dumpcap-k-is-not-accepting-channel-type-values/
    
    for an example of confusion caused by the previous behavior.
    
    Change-Id: I303f560704700bbcd4f0ecea041f8632744212f3
    Reviewed-on: https://code.wireshark.org/review/36659
    Petri-Dish: Guy Harris <gharris@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <gharris@xxxxxxxxx>
    (cherry picked from commit 0975bf792a5609157349053385badca1f9c29cd7)
    Reviewed-on: https://code.wireshark.org/review/36662
    

Actions performed:

    from  9429ba3   Make the message type values hex.
     add  eab2b25   Handle -k better on platforms that don't support it.


Summary of changes:
 caputils/ws80211_utils.c |  8 ++++----
 caputils/ws80211_utils.h |  7 ++++++-
 dumpcap.c                | 19 ++++++++++++-------
 ui/qt/wireless_frame.cpp |  2 +-
 4 files changed, 23 insertions(+), 13 deletions(-)