Wireshark-commits: [Wireshark-commits] master 6de6f7f: Further refactor SRT stats.
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sun, 21 Jun 2015 03:35:18 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6de6f7f0f8f8b79c4fc7473c7e54dad433c7b61b Submitter: Michael Mann (mmann78@xxxxxxxxxxxx) Changed: branch: master Repository: wireshark Commits: 6de6f7f by Michael Mann (mmann78@xxxxxxxxxxxx): Further refactor SRT stats. Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@xxxxxxxxxxxx> Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx> Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx> Actions performed: from 2895d58 Call the "802.11 radio information" dissector for radio headers. adds 6de6f7f Further refactor SRT stats. Summary of changes: CMakeLists.txt | 10 +- asn1/camel/packet-camel-template.c | 42 ++ asn1/ldap/packet-ldap-template.c | 55 ++ epan/CMakeLists.txt | 1 + epan/Makefile.common | 2 + epan/conversation_table.c | 3 - epan/dissectors/packet-afp.c | 42 ++ epan/dissectors/packet-camel.c | 60 ++- epan/dissectors/packet-dcerpc.c | 160 +++++- epan/dissectors/packet-dcerpc.h | 8 + epan/dissectors/packet-diameter.c | 64 +++ epan/dissectors/packet-fc.c | 43 ++ epan/dissectors/packet-gtp.c | 58 ++ epan/dissectors/packet-ldap.c | 67 ++- epan/dissectors/packet-ncp.c | 250 +++++++++ epan/dissectors/packet-rpc.c | 128 ++++- epan/dissectors/packet-rpc.h | 8 + epan/dissectors/packet-scsi.c | 108 ++++ epan/dissectors/packet-smb.c | 72 +++ epan/dissectors/packet-smb2.c | 49 ++ epan/srt_table.c | 322 +++++++++++ epan/srt_table.h | 240 +++++++++ tshark.c | 2 + ui/cli/Makefile.common | 12 +- ui/cli/cli_service_response_time_table.c | 166 ------ ui/cli/cli_service_response_time_table.h | 99 ---- ui/cli/tap-afpstat.c | 133 ----- ui/cli/tap-dcerpcstat.c | 317 ----------- ui/cli/tap-ldapstat.c | 149 ------ ui/cli/tap-ncpstat.c | 440 --------------- ui/cli/tap-rpcstat.c | 257 --------- ui/cli/tap-scsistat.c | 185 ------- ui/cli/tap-smb2stat.c | 144 ----- ui/cli/tap-smbstat.c | 162 ------ ui/cli/tap-srt.c | 196 +++++++ .../packet-bthci_sco.h => ui/cli/tap-srt.h | 37 +- ui/cli/tshark-tap.h | 1 + ui/gtk/CMakeLists.txt | 10 - ui/gtk/Makefile.common | 10 - ui/gtk/afp_stat.c | 216 -------- ui/gtk/camel_srt.c | 247 --------- ui/gtk/dcerpc_stat.c | 149 ++---- ui/gtk/diameter_stat.c | 242 --------- ui/gtk/fc_stat.c | 220 -------- ui/gtk/gtp_stat.c | 237 --------- ui/gtk/ldap_stat.c | 231 -------- ui/gtk/main.c | 2 + ui/gtk/ncp_stat.c | 558 -------------------- ui/gtk/rpc_stat.c | 146 +++-- ui/gtk/scsi_stat.c | 312 ----------- ui/gtk/service_response_time_table.c | 515 +++++++++++++----- ui/gtk/service_response_time_table.h | 74 ++- ui/gtk/smb2_stat.c | 227 -------- ui/gtk/smb_stat.c | 260 --------- 54 files changed, 2517 insertions(+), 5231 deletions(-) create mode 100644 epan/srt_table.c create mode 100644 epan/srt_table.h delete mode 100644 ui/cli/cli_service_response_time_table.c delete mode 100644 ui/cli/cli_service_response_time_table.h delete mode 100644 ui/cli/tap-afpstat.c delete mode 100644 ui/cli/tap-dcerpcstat.c delete mode 100644 ui/cli/tap-ldapstat.c delete mode 100644 ui/cli/tap-ncpstat.c delete mode 100644 ui/cli/tap-rpcstat.c delete mode 100644 ui/cli/tap-scsistat.c delete mode 100644 ui/cli/tap-smb2stat.c delete mode 100644 ui/cli/tap-smbstat.c create mode 100644 ui/cli/tap-srt.c copy epan/dissectors/packet-bthci_sco.h => ui/cli/tap-srt.h (61%) delete mode 100644 ui/gtk/afp_stat.c delete mode 100644 ui/gtk/camel_srt.c delete mode 100644 ui/gtk/diameter_stat.c delete mode 100644 ui/gtk/fc_stat.c delete mode 100644 ui/gtk/gtp_stat.c delete mode 100644 ui/gtk/ldap_stat.c delete mode 100644 ui/gtk/ncp_stat.c delete mode 100644 ui/gtk/scsi_stat.c delete mode 100644 ui/gtk/smb2_stat.c delete mode 100644 ui/gtk/smb_stat.c
- Prev by Date: [Wireshark-commits] master 2895d58: Call the "802.11 radio information" dissector for radio headers.
- Next by Date: [Wireshark-commits] buildbot failure in Wireshark (development) on OSX 10.6 x64
- Previous by thread: [Wireshark-commits] master 2895d58: Call the "802.11 radio information" dissector for radio headers.
- Next by thread: [Wireshark-commits] master 334087b: srt_table: fix conversion shortens 64-bit value into a 32-bit value
- Index(es):