Wireshark · Wireshark-commits: [Wireshark-commits] master 59ef97d: [WIP] Add a conversation dialog.

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=59ef97dd652131a6df0edd26cc8709461587a224
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

59ef97d by Gerald Combs (gerald@xxxxxxxxxxxxx):

    [WIP] Add a conversation dialog.
    
    Items are sorted by value.
    
    Move common conversation code to ui/conversation_hash.[ch]. Add a
    conversation_type_e enum along with convenience functions for fetching
    titles, tap names, etc.
    
    We have a single main dialog instead of a main dialog + individual
    protocol dialogs. It de-clutters the statistics menu and results in
    simpler code. Conversation type tabs can be added and removed within the
    dialog itself. The tab list is sticky and saved with the current profile
    when the dialog closes. Data can be copied as CSV or YAML.
    
    Add a FilterAction class and a corresponding filterAction slot to
    MainWindow. Use it for the Conversations context menu.
    
    Add an addressResolutionChanged signal and related plumbing.
    
    Get rid of the iterator members in the conversation item struct. Update
    the GTK+ code accordingly.
    
    Excercise for the reader:
    - Update TShark to use the common hash code.
    
    Ping-Bug: 9231
    Ping-Bug: 8703
    Ping-Bug: 6727
    Change-Id: I8728d771fc5b1a85937bed9d898e53c3ecc3a544
    Reviewed-on: https://code.wireshark.org/review/2987
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  d81a34c   Have the interface "tree" directly connect to ifListChanged.
    adds  59ef97d   [WIP] Add a conversation dialog.


Summary of changes:
 epan/prefs-int.h                   |   13 +
 epan/prefs.c                       |   16 +-
 ui/CMakeLists.txt                  |    1 +
 ui/Makefile.common                 |    2 +
 ui/conversation_hash.c             |  739 ++++++++++++++++++++
 ui/conversation_hash.h             |  277 ++++++++
 ui/gtk/Makefile.common             |    1 -
 ui/gtk/conversations_eth.c         |   27 +-
 ui/gtk/conversations_fc.c          |    7 +-
 ui/gtk/conversations_fddi.c        |    7 +-
 ui/gtk/conversations_ip.c          |    7 +-
 ui/gtk/conversations_ipv6.c        |    7 +-
 ui/gtk/conversations_ipx.c         |    7 +-
 ui/gtk/conversations_jxta.c        |   11 +-
 ui/gtk/conversations_ncp.c         |   27 +-
 ui/gtk/conversations_rsvp.c        |    9 +-
 ui/gtk/conversations_sctp.c        |   53 +-
 ui/gtk/conversations_table.c       | 1314 ++++++++++--------------------------
 ui/gtk/conversations_table.h       |   80 +--
 ui/gtk/conversations_tcpip.c       |    7 +-
 ui/gtk/conversations_tr.c          |    7 +-
 ui/gtk/conversations_udpip.c       |    7 +-
 ui/gtk/conversations_usb.c         |    8 +-
 ui/gtk/conversations_wlan.c        |    7 +-
 ui/gtk/filter_utils.c              |    2 +-
 ui/gtk/filter_utils.h              |    2 +-
 ui/gtk/hostlist_eth.c              |    4 +-
 ui/gtk/hostlist_fc.c               |    4 +-
 ui/gtk/hostlist_fddi.c             |    4 +-
 ui/gtk/hostlist_ip.c               |    4 +-
 ui/gtk/hostlist_ipv6.c             |    4 +-
 ui/gtk/hostlist_ipx.c              |    4 +-
 ui/gtk/hostlist_jxta.c             |    4 +-
 ui/gtk/hostlist_ncp.c              |    4 +-
 ui/gtk/hostlist_rsvp.c             |    4 +-
 ui/gtk/hostlist_sctp.c             |    4 +-
 ui/gtk/hostlist_table.c            |   14 +-
 ui/gtk/hostlist_table.h            |    6 +-
 ui/gtk/hostlist_tcpip.c            |    4 +-
 ui/gtk/hostlist_tr.c               |    4 +-
 ui/gtk/hostlist_udpip.c            |    4 +-
 ui/gtk/hostlist_usb.c              |    4 +-
 ui/gtk/hostlist_wlan.c             |    4 +-
 ui/qt/CMakeLists.txt               |   18 +-
 ui/qt/Makefile.am                  |    2 +
 ui/qt/Makefile.common              |    8 +
 ui/qt/QtShark.pro                  |    7 +
 ui/qt/conversation_dialog.cpp      |  516 ++++++++++++++
 ui/qt/conversation_dialog.h        |  102 +++
 ui/qt/conversation_dialog.ui       |  127 ++++
 ui/qt/conversation_tree_widget.cpp |  673 ++++++++++++++++++
 ui/qt/conversation_tree_widget.h   |  112 +++
 ui/qt/filter_action.cpp            |  172 +++++
 ui/qt/filter_action.h              |  106 +++
 ui/qt/main_window.h                |    9 +-
 ui/qt/main_window.ui               |    9 +
 ui/qt/main_window_slots.cpp        |  175 +++--
 ui/qt/packet_list.cpp              |    2 +
 ui/qt/packet_list.h                |    2 +-
 ui/qt/tcp_stream_dialog.h          |    2 +-
 ui/qt/wireshark_application.cpp    |   13 +
 ui/qt/wireshark_application.h      |    3 +
 ui/recent.c                        |   15 +-
 ui/recent.h                        |    1 +
 ui/{gtk => }/sat.h                 |    6 +-
 wsutil/str_util.c                  |    4 +-
 66 files changed, 3531 insertions(+), 1278 deletions(-)
 create mode 100644 ui/conversation_hash.c
 create mode 100644 ui/conversation_hash.h
 create mode 100644 ui/qt/conversation_dialog.cpp
 create mode 100644 ui/qt/conversation_dialog.h
 create mode 100644 ui/qt/conversation_dialog.ui
 create mode 100644 ui/qt/conversation_tree_widget.cpp
 create mode 100644 ui/qt/conversation_tree_widget.h
 create mode 100644 ui/qt/filter_action.cpp
 create mode 100644 ui/qt/filter_action.h
 rename ui/{gtk => }/sat.h (94%)