Wireshark-commits: [Wireshark-commits] master 5539dba: Do not apply color rule filter every dissect
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=5539dba1df313816491bb28718433d4d81162aa3
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
5539dba by Peter Wu (peter@xxxxxxxxxxxxx):
Do not apply color rule filter every dissection
Introduce a frame_data flag "need_colorize" to indicate that coloring
rules need to be evaluated and set it for the GUI (not tshark). This
restores the original performance characteristics.
It additionally fixes a regression where the color filter name and
filter is not shown anymore in the tree (I guess it is related to the
edt->tree being NULL when re-selected, resulting in empty color_filter).
Remaining problems:
- Display filter cannot contain frame.coloring_rule.* fields. Code is
present to enable this, but then a method is needed to avoid an
expensive second calculation (which is why it is disabled).
- The columns are still not updated after coloring rule change.
- The two frame.coloring_rule fields in the tree are not updated when
the coloring rule is changed (e.g. Ctrl-1).
The last two issues were supposed to be fixed by the previous patch, but
there is probably some missing code... Tested with GTK and Qt.
Bug: 11980
Change-Id: I3ef7713b28db242e178d20f6a5f333374718b52e
Reviewed-on: https://code.wireshark.org/review/13170
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from c8a1f9d Fix issue with dumping to logcat_text from UPPER_PDU
adds 5539dba Do not apply color rule filter every dissection
Summary of changes:
epan/dissectors/file-file.c | 11 ++++++++---
epan/dissectors/packet-frame.c | 12 ++++++++----
epan/frame_data.h | 1 +
file.c | 9 +++++++++
ui/gtk/packet_list_store.c | 4 +++-
ui/qt/packet_list_record.cpp | 5 ++++-
6 files changed, 33 insertions(+), 9 deletions(-)