Wireshark-commits: [Wireshark-commits] master-2.2 e11b994: Don't discard unknown coloring rules.
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: Sat, 30 Jul 2016 16:30:43 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e11b994ce4db650a8a81c56c4b7bd31b89ba4a93
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

e11b994 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Don't discard unknown coloring rules.
    
    When processing the colorfilters file, keep and disable unknown coloring
    rules instead of skipping over and discarding them. This should
    hopefully keep people from losing the standard "Checksum Errors" rule
    (and it's less rude in general).
    
    Change-Id: I21796c25045d9dbf7612238ce3d27b613f1ec75f
    Reviewed-on: https://code.wireshark.org/review/16673
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit e727ecf5e302c9f765d0038b234e6775fb4ca45b)
    Reviewed-on: https://code.wireshark.org/review/16758
    Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  0f21919   README.dissector: Add proto_tree_add_bitmask_with_flags()
    adds  e11b994   Don't discard unknown coloring rules.


Summary of changes:
 epan/color_filters.c            |    4 ++--
 ui/qt/coloring_rules_dialog.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)