osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Rename and move ui/stat_menu.h to epan/stat_groups.h. 

The groups are, technically, independent of the notion of a menu, and,
if we have mechanisms by which taps that are not only GUI
toolkit-independent but independent of the *existence* of a GUI can be
registered, they might want to register themselves in a group just in
case they're running in a program that has a GUI.

Also, this might fix the Debian package build.

Change-Id: I29435681e79748fd4f2e0c5ac872cd11f831d172
Reviewed-on: https://code.wireshark.org/review/2830
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-07-03 13:30:12 -07:00
parent 7dd27dbff8
commit 1c297771c3
94 changed files with 95 additions and 171 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/libwireshark-dev.install vendored
View File

@ -3,7 +3,7 @@ usr/lib/*/pkgconfig/wireshark.pc
color.h usr/include/wireshark
obj-*/config.h usr/include/wireshark
register.h usr/include/wireshark
ui/stat_menu.h usr/include/wireshark
epan/stat_groups.h usr/include/wireshark
epan/*.h usr/include/wireshark/epan
epan/crypt/*.h usr/include/wireshark/epan/crypt
epan/dfilter/*.h usr/include/wireshark/epan/dfilter

1
epan/Makefile.common
View File

@ -238,6 +238,7 @@ LIBWIRESHARK_INCLUDES = \
sminmpec.h \
sna-utils.h \
stat_cmd_args.h \
stat_groups.h \
stats_tree.h \
stats_tree_priv.h \
stream.h \

2
epan/funnel.h
View File

@ -27,7 +27,7 @@
#define _FUNNEL_H
#include <glib.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ws_symbol_export.h"
typedef struct _funnel_progress_window_t funnel_progress_window_t ;

2
epan/stats_tree.h
View File

@ -27,7 +27,7 @@
#include <epan/epan.h>
#include <epan/packet_info.h>
#include <epan/tap.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "../register.h"
#include "ws_symbol_export.h"

2
epan/wslua/CMakeLists.txt
View File

@ -106,7 +106,7 @@ ADD_CUSTOM_COMMAND(
${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h
${CMAKE_SOURCE_DIR}/wiretap/wtap.h
${CMAKE_SOURCE_DIR}/epan/epan.h
${CMAKE_SOURCE_DIR}/ui/stat_menu.h
${CMAKE_SOURCE_DIR}/epan/stat_groups.h
)
add_custom_target(

2
epan/wslua/Makefile.am
View File

@ -122,7 +122,7 @@ declare_wslua.h: make-reg.pl $(wslua_modules) taps_wslua.c
dummy:
touch dummy
init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../../ui/stat_menu.h
init.lua: template-init.lua make-init-lua.pl ../ftypes/ftypes.h ../../wiretap/wtap.h ../proto.h ../stat_groups.h
$(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua
checkapi:

8
epan/wslua/make-init-lua.pl
View File

@ -204,7 +204,7 @@ while(<PROTO_H>) {
close PROTO_H;
#
# Extract values from stat_menu.h:
# Extract values from stat_groups.h:
#
# MENU_X_X values for register_stat_group_t
#
@ -212,9 +212,9 @@ close PROTO_H;
$menu_groups .= "-- menu groups for register_menu\n";
my $menu_i = 0;
open STAT_MENU, "< $WSROOT/ui/stat_menu.h" or die "cannot open '$WSROOT/ui/stat_menu.h': $!";
open STAT_GROUPS, "< $WSROOT/epan/stat_groups.h" or die "cannot open '$WSROOT/epan/stat_groups.h': $!";
my $foundit = 0;
while(<STAT_MENU>) {
while(<STAT_GROUPS>) {
# need to skip matching words in comments, and get to the enum
if (/^typedef enum {/) { $foundit = 1; }
# the problem here is we need to pick carefully, so we don't break existing scripts
@ -224,7 +224,7 @@ while(<STAT_MENU>) {
$menu_i++;
}
}
close STAT_MENU;
close STAT_GROUPS;
$bases_table .= "}\n\n";

1
ui/Makefile.common
View File

@ -102,7 +102,6 @@ noinst_HEADERS = \
simple_dialog.h \
software_update.h \
ssl_key_export.h \
stat_menu.h \
tap_export_pdu.h \
tap-megaco-common.h \
tap-rtp-common.h \

2
ui/gtk/afp_stat.c
View File

@ -34,7 +34,7 @@
#include <epan/dissectors/packet-afp.h>
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/ansi_a_stat.c
View File

@ -43,7 +43,7 @@
#include <epan/dissectors/packet-bssap.h>
#include <epan/dissectors/packet-ansi_a.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/ansi_map_stat.c
View File

@ -42,7 +42,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ansi_map.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/bootp_stat.c
View File

@ -30,7 +30,7 @@
#include <epan/epan.h>
#include <epan/tap.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/camel_counter.c
View File

@ -35,7 +35,7 @@
#include <epan/asn1.h>
#include <epan/dissectors/packet-camel.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/camel_srt.c
View File

@ -35,7 +35,7 @@
#include <epan/dissectors/packet-camel.h>
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/compare_stat.c
View File

@ -53,7 +53,7 @@
#include <epan/dissectors/packet-ip.h>
#include <epan/in_cksum.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "epan/timestats.h"
#include "ui/simple_dialog.h"

2
ui/gtk/conversations_eth.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-eth.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_fc.c
View File

@ -32,7 +32,7 @@
#include <epan/conversation.h>
#include <epan/dissectors/packet-fc.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_fddi.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-fddi.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_ip.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ip.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_ipv6.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ipv6.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_ipx.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ipx.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_jxta.c
View File

@ -32,7 +32,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-jxta.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_ncp.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ncp-int.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_rsvp.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-rsvp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_sctp.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-sctp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_table.c
View File

@ -36,7 +36,7 @@
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#include "ui/utf8_entities.h"

2
ui/gtk/conversations_tcpip.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-tcp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_tr.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-tr.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_udpip.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-udp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_usb.c
View File

@ -30,7 +30,7 @@
#include <epan/stat_cmd_args.h>
#include <epan/tap.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/conversations_wlan.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ieee80211.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/conversations_table.h"

2
ui/gtk/dcerpc_stat.c
View File

@ -41,7 +41,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-dcerpc.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/diameter_stat.c
View File

@ -35,7 +35,7 @@
#include <epan/dissectors/packet-diameter.h>
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/expert_comp_dlg.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/stat_cmd_args.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"

2
ui/gtk/fc_stat.c
View File

@ -35,7 +35,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/flow_graph.c
View File

@ -35,7 +35,7 @@
#include <epan/to_str.h>
#include <epan/strutil.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/graph_analysis.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/funnel_stat.c
View File

@ -45,7 +45,7 @@
#include <epan/funnel.h>
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/progress_dlg.h"
#include "../color_filters.h"

2
ui/gtk/gsm_a_stat.c
View File

@ -43,7 +43,7 @@
#include <epan/dissectors/packet-bssap.h>
#include <epan/dissectors/packet-gsm_a_common.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/gsm_map_stat.c
View File

@ -44,7 +44,7 @@
#include <epan/asn1.h>
#include <epan/dissectors/packet-gsm_map.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/gsm_map_summary.c
View File

@ -39,7 +39,7 @@
#include <epan/asn1.h>
#include <epan/dissectors/packet-gsm_map.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "../globals.h"
#include "../file.h"
#include "../summary.h"

2
ui/gtk/gtp_stat.c
View File

@ -35,7 +35,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/h225_counter.c
View File

@ -36,7 +36,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/h225_ras_srt.c
View File

@ -37,7 +37,7 @@
#include "epan/timestats.h"
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/hostlist_eth.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-eth.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_fc.c
View File

@ -32,7 +32,7 @@
#include <epan/conversation.h>
#include <epan/dissectors/packet-fc.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_fddi.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-fddi.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_ip.c
View File

@ -33,7 +33,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ip.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_ipv6.c
View File

@ -34,7 +34,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ipv6.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_ipx.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ipx.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_jxta.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-jxta.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_ncp.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
/*#include <epan/dissectors/packet-ncp-int.h>*/
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_rsvp.c
View File

@ -32,7 +32,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-rsvp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_sctp.c
View File

@ -30,7 +30,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-sctp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_tcpip.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-tcp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_tr.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-tr.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_udpip.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-udp.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_usb.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-usb.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/hostlist_wlan.c
View File

@ -31,7 +31,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-ieee80211.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/hostlist_table.h"

2
ui/gtk/iax2_analysis.c
View File

@ -64,7 +64,7 @@
#include <epan/stat_cmd_args.h>
#include <epan/strutil.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/util.h"
#include "ui/alert_box.h"

2
ui/gtk/io_stat.c
View File

@ -35,7 +35,7 @@
#include <epan/tap.h>
#include <epan/strutil.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/alert_box.h"
#include "ui/io_graph_item.h"
#include "ui/simple_dialog.h"

2
ui/gtk/lbm_stream_dlg.c
View File

@ -30,7 +30,7 @@
#include <epan/tap.h>
#include <epan/wmem/wmem.h>
#include <gtk/gtk.h>
#include <ui/stat_menu.h>
#include <epan/stat_groups.h>
#include <ui/gtk/gui_utils.h>
#include <ui/gtk/dlg_utils.h>
#include <cfile.h>

2
ui/gtk/lbm_uimflow_dlg.c
View File

@ -28,8 +28,8 @@
#include <epan/funnel.h>
#include <epan/packet.h>
#include <epan/tap.h>
#include <epan/stat_groups.h>
#include <gtk/gtk.h>
#include <ui/stat_menu.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"
#include <cfile.h>

2
ui/gtk/ldap_stat.c
View File

@ -34,7 +34,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/mac_lte_stat_dlg.c
View File

@ -35,7 +35,7 @@
#include <epan/dissectors/packet-mac-lte.h>
#include "ui/simple_dialog.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/main_menubar.c
View File

@ -48,7 +48,7 @@
#include "globals.h"
#include "color_filters.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/iface_lists.h"
#include "ui/main_statusbar.h"
#include "ui/preference_utils.h"

2
ui/gtk/mcast_stream_dlg.c
View File

@ -41,7 +41,7 @@
#include <epan/strutil.h>
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#include "ui/gtk/mcast_stream_dlg.h"

2
ui/gtk/megaco_stat.c
View File

@ -39,7 +39,7 @@
#include "epan/timestats.h"
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/mgcp_stat.c
View File

@ -36,7 +36,7 @@
#include "epan/timestats.h"
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/mtp3_stat.c
View File

@ -43,7 +43,7 @@
#include <epan/emem.h>
#include <epan/dissectors/packet-mtp3.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/mtp3_summary.c
View File

@ -37,7 +37,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-mtp3.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "../globals.h"
#include "../file.h"
#include "../summary.h"

2
ui/gtk/ncp_stat.c
View File

@ -34,7 +34,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/radius_stat.c
View File

@ -36,7 +36,7 @@
#include "epan/timestats.h"
#include "ui/simple_dialog.h"
#include "../file.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/rlc_lte_graph.c
View File

@ -40,7 +40,7 @@
#include "../globals.h"
#include "../frame_tvbuff.h"
#include "ui/simple_dialog.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/rlc_lte_stat_dlg.c
View File

@ -40,7 +40,7 @@
#include <epan/dissectors/packet-rlc-lte.h>
#include "ui/simple_dialog.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/dlg_utils.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/rpc_progs.c
View File

@ -39,7 +39,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-rpc.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "../globals.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/rpc_stat.c
View File

@ -39,7 +39,7 @@
#include <epan/tap.h>
#include <epan/dissectors/packet-rpc.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/simple_dialog.h"
#include "ui/gtk/gui_stat_menu.h"

2
ui/gtk/rtp_analysis.c
View File

@ -63,7 +63,7 @@
#include <epan/stat_cmd_args.h>
#include <epan/strutil.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/util.h"
#include "ui/alert_box.h"

2
ui/gtk/rtp_stream_dlg.c
View File

@ -36,7 +36,7 @@
#include "wsutil/filesystem.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/last_open_dir.h"
#include "ui/simple_dialog.h"

2
ui/gtk/scsi_stat.c
View File

@ -45,7 +45,7 @@
#include "ui/simple_dialog.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/gui_utils.h"

2
ui/gtk/sctp_assoc_analyse.c
View File

@ -31,7 +31,7 @@
#include "../globals.h"
#include "ui/simple_dialog.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/sctp_chunk_stat.c
View File

@ -39,7 +39,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_util.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/sctp_stat_dlg.c
View File

@ -29,7 +29,7 @@
#include "epan/to_str.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_stat_menu.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/sip_stat.c
View File

@ -34,7 +34,7 @@
#include "ui/simple_dialog.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/smb2_stat.c
View File

@ -35,7 +35,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/smb_stat.c
View File

@ -35,7 +35,7 @@
#include "ui/simple_dialog.h"
#include "../file.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/stats_tree_stat.c
View File

@ -41,7 +41,7 @@
#include "ui/simple_dialog.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/tap_param_dlg.c
View File

@ -32,7 +32,7 @@
#include "../file.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/stock_icons.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/tcp_graph.c
View File

@ -46,7 +46,7 @@
#include "../../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/tap-tcp-stream.h"
#include "ui/utf8_entities.h"

2
ui/gtk/uat_gui.c
View File

@ -56,7 +56,7 @@
#include <epan/value_string.h>
#include <wsutil/filesystem.h>
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/help_url.h"
#include "ui/gtk/gtkglobals.h"

2
ui/gtk/voip_calls_dlg.c
View File

@ -50,7 +50,7 @@
#include <epan/dissectors/packet-h248.h>
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/graph_analysis.h"
#include "ui/gtk/voip_calls_dlg.h"

2
ui/gtk/wlan_stat_dlg.c
View File

@ -37,7 +37,7 @@
#include "ui/simple_dialog.h"
#include "ui/utf8_entities.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gtkglobals.h"
#include "ui/gtk/dlg_utils.h"

2
ui/gtk/wsp_stat.c
View File

@ -32,7 +32,7 @@
#include "ui/simple_dialog.h"
#include "../globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "ui/gtk/gui_utils.h"
#include "ui/gtk/dlg_utils.h"

76
ui/stat_menu.h
View File

@ -1,76 +0,0 @@
/* stat_menu.h
* Menu definitions for use by stats
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
* Copyright 1998 Gerald Combs
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef __STATMENU_H__
#define __STATMENU_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/** @file
* Add a new menu item for a stat.
*/
/*
* XXX - defines stuff usable regardless of the GUI toolkit. Right now,
* that's only the menu group, which is used by tap_param_dlg.h.
*
* XXX - stats should be able to register additional menu groups, although
* the question then would be "in what order should they appear in the menu?"
*
* NOTE: the enum below is parsed by epan/wslua/make-init-lua.pl in order
* to generate usable values for Lua scripts to use, so they can add to
* the menus in the GUI. The perl script's regex is such that the following
* prefixes must only appear once in this list:
* REGISTER_ANALYZE_GROUP_CONVERSATION
* REGISTER_STAT_GROUP_CONVERSATION
* REGISTER_STAT_GROUP_RESPONSE
* REGISTER_STAT_GROUP_ENDPOINT
* In other words, because there is a REGISTER_STAT_GROUP_RESPONSE_TIME, you cannot
* add a REGISTER_STAT_GROUP_RESPONSE nor a REGISTER_STAT_GROUP_RESPONSE_FOOBAR
* because they use the same "REGISTER_STAT_GROUP_RESPONSE" prefix.
* Also, do NOT change the names in the enum - you can add, but not remove.
* If you do, legacy scripts will break. (which is why the perl script regex isn't better)
*/
/** The menu group this stat should be registered in. */
typedef enum {
REGISTER_ANALYZE_GROUP_UNSORTED, /* unsorted analyze stuff */
REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER, /* conversation filters */
REGISTER_STAT_GROUP_UNSORTED, /* unsorted statistic function */
REGISTER_STAT_GROUP_GENERIC, /* generic statistic function, not specific to a protocol */
REGISTER_STAT_GROUP_CONVERSATION_LIST, /* member of the conversation list */
REGISTER_STAT_GROUP_ENDPOINT_LIST, /* member of the endpoint list */
REGISTER_STAT_GROUP_RESPONSE_TIME, /* member of the service response time list */
REGISTER_STAT_GROUP_TELEPHONY, /* telephony specific */
REGISTER_STAT_GROUP_TELEPHONY_GSM, /* GSM (and UMTS?) */
REGISTER_STAT_GROUP_TELEPHONY_LTE, /* name says it all */
REGISTER_STAT_GROUP_TELEPHONY_SCTP, /* name says it all */
REGISTER_TOOLS_GROUP_UNSORTED /* unsorted tools */
} register_stat_group_t;
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __STATMENU_H__ */

2
ui/tap-megaco-common.c
View File

@ -36,7 +36,7 @@
#include "epan/timestats.h"
#include "file.h"
#include "globals.h"
#include "ui/stat_menu.h"
#include <epan/stat_groups.h>
#include "tap-megaco-common.h"