URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=31ecdf5b06bff3bb2e706e840c28c519698e6f67
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
31ecdf5 by Michael Mann (mmann78@xxxxxxxxxxxx):
Refactor "common" Conversation table functionality.
Refactor (non-GUI) conversation table functionality from gtk/Qt to epan. Also refactor "common GUI" conversation table functionality.
The idea is to not have to modify the GUI when a dissector adds a new "conversation type"
Change-Id: I11f08d0d7edd631218663ba4b902c4a4c849acda
Reviewed-on: https://code.wireshark.org/review/3113
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Actions performed:
from 507d07e Allow severity levels of expert info items to be configured by the user.
adds 31ecdf5 Refactor "common" Conversation table functionality.
Summary of changes:
epan/CMakeLists.txt | 1 +
epan/Makefile.common | 2 +
.../conversation_table.c | 736 ++++++++------------
.../conversation_table.h | 275 ++++----
epan/dissectors/packet-eth.c | 31 +
epan/dissectors/packet-fc.c | 29 +
epan/dissectors/packet-fddi.c | 28 +
epan/dissectors/packet-ieee80211.c | 29 +
epan/dissectors/packet-ip.c | 28 +
epan/dissectors/packet-ipv6.c | 38 +
epan/dissectors/packet-ipx.c | 30 +
epan/dissectors/packet-jxta.c | 31 +
epan/dissectors/packet-ncp.c | 30 +-
epan/dissectors/packet-rsvp.c | 23 +
epan/dissectors/packet-sctp.c | 31 +
epan/dissectors/packet-tcp.c | 31 +
epan/dissectors/packet-tr.c | 30 +
epan/dissectors/packet-udp.c | 29 +
epan/dissectors/packet-usb.c | 37 +-
epan/proto.c | 22 +-
epan/proto.h | 5 +
epan/stat_cmd_args.h | 7 +
tfshark.c | 1 +
tshark.c | 2 +
ui/CMakeLists.txt | 2 +-
ui/Makefile.common | 4 +-
ui/{qt/color_utils.h => conversation_ui.c} | 49 +-
ui/{text_import_scanner.h => conversation_ui.h} | 55 +-
ui/gtk/CMakeLists.txt | 15 -
ui/gtk/Makefile.common | 15 -
ui/gtk/conversations_eth.c | 81 ---
ui/gtk/conversations_fc.c | 81 ---
ui/gtk/conversations_fddi.c | 80 ---
ui/gtk/conversations_ip.c | 78 ---
ui/gtk/conversations_ipv6.c | 87 ---
ui/gtk/conversations_ipx.c | 80 ---
ui/gtk/conversations_jxta.c | 89 ---
ui/gtk/conversations_ncp.c | 81 ---
ui/gtk/conversations_rsvp.c | 82 ---
ui/gtk/conversations_sctp.c | 88 ---
ui/gtk/conversations_table.c | 140 ++--
ui/gtk/conversations_table.h | 18 +-
ui/gtk/conversations_tcpip.c | 80 ---
ui/gtk/conversations_tr.c | 80 ---
ui/gtk/conversations_udpip.c | 80 ---
ui/gtk/conversations_usb.c | 78 ---
ui/gtk/conversations_wlan.c | 80 ---
ui/gtk/hostlist_ncp.c | 4 +-
ui/gtk/hostlist_table.h | 24 +-
ui/gtk/main.c | 3 +
ui/gtk/main_menubar.c | 103 ++-
ui/qt/conversation_dialog.cpp | 167 ++---
ui/qt/conversation_dialog.h | 18 +-
ui/qt/conversation_tree_widget.cpp | 240 +------
ui/qt/conversation_tree_widget.h | 10 +-
ui/qt/main.cpp | 3 +
ui/qt/main_window_slots.cpp | 3 +-
ui/sat.h | 41 --
58 files changed, 1255 insertions(+), 2390 deletions(-)
rename ui/conversation_hash.c => epan/conversation_table.c (64%)
rename ui/conversation_hash.h => epan/conversation_table.h (54%)
copy ui/{qt/color_utils.h => conversation_ui.c} (60%)
copy ui/{text_import_scanner.h => conversation_ui.h} (58%)
delete mode 100644 ui/gtk/conversations_eth.c
delete mode 100644 ui/gtk/conversations_fc.c
delete mode 100644 ui/gtk/conversations_fddi.c
delete mode 100644 ui/gtk/conversations_ip.c
delete mode 100644 ui/gtk/conversations_ipv6.c
delete mode 100644 ui/gtk/conversations_ipx.c
delete mode 100644 ui/gtk/conversations_jxta.c
delete mode 100644 ui/gtk/conversations_ncp.c
delete mode 100644 ui/gtk/conversations_rsvp.c
delete mode 100644 ui/gtk/conversations_sctp.c
delete mode 100644 ui/gtk/conversations_tcpip.c
delete mode 100644 ui/gtk/conversations_tr.c
delete mode 100644 ui/gtk/conversations_udpip.c
delete mode 100644 ui/gtk/conversations_usb.c
delete mode 100644 ui/gtk/conversations_wlan.c
delete mode 100644 ui/sat.h
