Wireshark-commits: [Wireshark-commits] master-3.2 18d9ddc: Handle -k better on platforms that don't
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: Wed, 01 Apr 2020 20:31:33 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=18d9ddc8081d6c1b5f4d687ca325c077a86d2f01
Submitter: "Guy Harris <gharris@xxxxxxxxx>"
Changed: branch: master-3.2
Repository: wireshark

Commits:

18d9ddc 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 57dea0db27e2b8c2134ec9baa8da59b064a14ebc)
    Reviewed-on: https://code.wireshark.org/review/36660
    

Actions performed:

    from  316cdbc   QT/UI: Fix shortcut
     add  18d9ddc   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(-)