diff options
73 files changed, 75 insertions, 70 deletions
diff --git a/Makefile.common b/Makefile.common index bc4db2cf03..cf43eb6d3a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -82,7 +82,6 @@ ETHEREAL_COMMON_SRC = \ print.c \ ps.c \ ringbuffer.c \ - stat.c \ timestats.c \ util.c \ version_info.c @@ -107,7 +106,6 @@ ETHEREAL_COMMON_INCLUDES = \ ps.h \ register.h \ ringbuffer.h \ - stat.h \ timestats.h \ util.h \ version_info.h diff --git a/epan/Makefile.common b/epan/Makefile.common index d76615b66d..99578cb212 100644 --- a/epan/Makefile.common +++ b/epan/Makefile.common @@ -69,6 +69,7 @@ LIBETHEREAL_SRC = \ sigcomp-udvm.c \ sminmpec.c \ sna-utils.c \ + stat.c \ stats_tree.c \ strutil.c \ t35.c \ @@ -136,6 +137,7 @@ LIBETHEREAL_INCLUDES = \ slab.h \ sminmpec.h \ sna-utils.h \ + stat.h \ stats_tree.h \ stats_tree_priv.h \ strutil.h \ diff --git a/epan/libethereal.def b/epan/libethereal.def index 1ab118cec6..19439840cf 100644 --- a/epan/libethereal.def +++ b/epan/libethereal.def @@ -339,6 +339,7 @@ isup_message_type_value DATA isup_message_type_value_acro DATA is_big_endian is_tpkt +list_stat_cmd_args LocationRejectReason_vals DATA match_strval match_strval_idx @@ -369,6 +370,7 @@ prefs_register_string_preference prefs_register_uint_preference prefs_set_pref process_reassembled_data +process_stat_cmd_arg protocols_module DATA proto_can_match_selected proto_can_toggle_protocol @@ -488,6 +490,7 @@ register_giop_user_module register_heur_dissector_list register_init_routine register_postseq_cleanup_routine +register_stat_cmd_arg register_tap register_tap_listener RegistrationRejectReason_vals DATA @@ -519,6 +522,7 @@ sid_name_snooping DATA sid_name_table DATA smb_cmd_vals DATA sminmpec_values DATA +start_requested_stats stats_tree_branch_max_namelen stats_tree_branch_to_str stats_tree_create_node @@ -33,7 +33,7 @@ #include <glib.h> -#include "stat.h" +#include <epan/stat.h> /* structure to keep track of what stats have registered command-line arguments. diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index eafe9f5a80..e5351fbd20 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index ab54d4d957..370cba8813 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index a63b300016..5add45a336 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -33,7 +33,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "simple_dialog.h" #include "ui_util.h" diff --git a/gtk/conversations_eth.c b/gtk/conversations_eth.c index 0b1a34bd44..5488f836b5 100644 --- a/gtk/conversations_eth.c +++ b/gtk/conversations_eth.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c index 70acf6d683..6f0e511ac7 100644 --- a/gtk/conversations_fc.c +++ b/gtk/conversations_fc.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_fddi.c b/gtk/conversations_fddi.c index 0551e1c564..f507f0000d 100644 --- a/gtk/conversations_fddi.c +++ b/gtk/conversations_fddi.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_ip.c b/gtk/conversations_ip.c index 4a8b10c55a..0e6cb9e4e9 100644 --- a/gtk/conversations_ip.c +++ b/gtk/conversations_ip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_ipx.c b/gtk/conversations_ipx.c index af235ad8c5..e28ddf8aca 100644 --- a/gtk/conversations_ipx.c +++ b/gtk/conversations_ipx.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c index e49f5896e1..e5edb7ec8a 100644 --- a/gtk/conversations_jxta.c +++ b/gtk/conversations_jxta.c @@ -34,7 +34,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c index aa3458924a..5f5ee2c87e 100644 --- a/gtk/conversations_sctp.c +++ b/gtk/conversations_sctp.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c index ed77b85218..dce02e3b82 100644 --- a/gtk/conversations_tcpip.c +++ b/gtk/conversations_tcpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c index b56684617e..da6b281e2e 100644 --- a/gtk/conversations_tr.c +++ b/gtk/conversations_tr.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_udpip.c b/gtk/conversations_udpip.c index 4a5cb40b9d..6ffd2d7012 100644 --- a/gtk/conversations_udpip.c +++ b/gtk/conversations_udpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/conversations_wlan.c b/gtk/conversations_wlan.c index 028409a512..a1f6c90980 100644 --- a/gtk/conversations_wlan.c +++ b/gtk/conversations_wlan.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index 4a3fcdaa9d..abe0069c55 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -40,7 +40,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index 5e6c5bd15c..ce5f7f5c6c 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -38,7 +38,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include <epan/dissectors/packet-fc.h> diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index 8b2e77749d..1448ca569e 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -33,7 +33,7 @@ #include "epan/filesystem.h" #include "graph_analysis.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "dlg_utils.h" #include "ui_util.h" diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index eec62033b9..ca052c02a0 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c index 7f7b9abead..04b4e2aedb 100644 --- a/gtk/gsm_map_stat.c +++ b/gtk/gsm_map_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index 336dff1019..6c172e3c8f 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 5b8758dd0a..e55e353b64 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c index 226fbd0f92..ad5fda1548 100644 --- a/gtk/hostlist_eth.c +++ b/gtk/hostlist_eth.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c index dc7c86d0d8..41dc057b95 100644 --- a/gtk/hostlist_fc.c +++ b/gtk/hostlist_fc.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c index 7fcd91901f..cd26d6682a 100644 --- a/gtk/hostlist_fddi.c +++ b/gtk/hostlist_fddi.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c index f2c0633b67..281e8dfe52 100644 --- a/gtk/hostlist_ip.c +++ b/gtk/hostlist_ip.c @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c index d703135586..c850f177aa 100644 --- a/gtk/hostlist_ipx.c +++ b/gtk/hostlist_ipx.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c index 951038c515..14d37340ae 100644 --- a/gtk/hostlist_jxta.c +++ b/gtk/hostlist_jxta.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c index 7a68a793d0..c87761d5d7 100644 --- a/gtk/hostlist_tcpip.c +++ b/gtk/hostlist_tcpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c index a82c53b15e..8f5535e9c4 100644 --- a/gtk/hostlist_tr.c +++ b/gtk/hostlist_tr.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c index c0c8dcb9a0..ccec1a8161 100644 --- a/gtk/hostlist_udpip.c +++ b/gtk/hostlist_udpip.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/hostlist_wlan.c b/gtk/hostlist_wlan.c index 0726cf7260..6c114ed6c6 100644 --- a/gtk/hostlist_wlan.c +++ b/gtk/hostlist_wlan.c @@ -33,7 +33,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/io_stat.c b/gtk/io_stat.c index fe7953295f..7078a2ebd8 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -42,7 +42,7 @@ #include "gtkglobals.h" #include "ui_util.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index aa2df72db7..3fd02857c9 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -38,7 +38,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include <epan/dissectors/packet-ldap.h> diff --git a/gtk/main.c b/gtk/main.c index 8449b31088..6aa20ab69a 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -83,7 +83,7 @@ #include "ringbuffer.h" #include "../ui_util.h" /* beware: ui_util.h exists twice! */ #include <epan/tap.h> -#include "../stat.h" +#include <epan/stat.h> #include "util.h" #include "clopts_common.h" #include "version_info.h" diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 68ec5c47e1..fd7eb50cd1 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -39,7 +39,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 503c6b33c6..6fe4fe8016 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -40,7 +40,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index bf85645e60..03d4f06bc7 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -37,7 +37,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 3e97ac2ce9..f1f9bcb3cc 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -37,7 +37,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "simple_dialog.h" #include "ui_util.h" diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 230a3f4a46..fb38cdac1c 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -63,7 +63,7 @@ #include <gtk/gtk.h> #include "gtkglobals.h" -#include "../stat.h" +#include <epan/stat.h> #include "dlg_utils.h" #include "ui_util.h" #include "alert_box.h" diff --git a/gtk/rtp_stream.c b/gtk/rtp_stream.c index 91f5d40962..d85cf9a2f1 100644 --- a/gtk/rtp_stream.c +++ b/gtk/rtp_stream.c @@ -33,7 +33,7 @@ #include "rtp_stream_dlg.h" #include "globals.h" -#include "../stat.h" +#include <epan/stat.h> #include <epan/tap.h> #include "register.h" diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c index 0aed0e9c0f..972ef49629 100644 --- a/gtk/sctp_chunk_stat.c +++ b/gtk/sctp_chunk_stat.c @@ -40,7 +40,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../register.h" diff --git a/gtk/sctp_stat.c b/gtk/sctp_stat.c index 45b2b57fa3..1203c7536d 100644 --- a/gtk/sctp_stat.c +++ b/gtk/sctp_stat.c @@ -32,7 +32,7 @@ #include "globals.h" #include "epan/packet_info.h" /* Needed for packet_info */ #include <epan/tap.h> /* Needed for register_tap_listener */ -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "dlg_utils.h" #include "compat_macros.h" diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index d35ed5e890..8554cc6528 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -34,7 +34,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "simple_dialog.h" #include "ui_util.h" diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 051f1fbb00..5581bbf322 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -38,7 +38,7 @@ #include <epan/epan.h> #include <epan/value_string.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include <epan/tap.h> #include "../smb.h" diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c index dba134b93f..0faf017cfb 100644 --- a/gtk/stats_tree_stat.c +++ b/gtk/stats_tree_stat.c @@ -34,7 +34,7 @@ #include "simple_dialog.h" #include "globals.h" -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "ui_util.h" #include "dlg_utils.h" diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 7601e42d6d..c02766ec8e 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -50,7 +50,7 @@ #include "epan/filesystem.h" #include <epan/tap.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "dlg_utils.h" #include "ui_util.h" diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index f41df5337a..463427073b 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -34,7 +34,7 @@ #include <epan/packet_info.h> #include <epan/epan.h> -#include "../stat.h" +#include <epan/stat.h> #include "stat_menu.h" #include "simple_dialog.h" #include "ui_util.h" diff --git a/tap-ansi_astat.c b/tap-ansi_astat.c index 83d9c320b5..83a594601e 100644 --- a/tap-ansi_astat.c +++ b/tap-ansi_astat.c @@ -42,9 +42,9 @@ #include "epan/packet_info.h" #include "epan/value_string.h" #include <epan/tap.h> +#include <epan/stat.h> #include <epan/dissectors/packet-bssap.h> #include <epan/dissectors/packet-ansi_a.h> -#include "stat.h" #include "register.h" diff --git a/tap-bootpstat.c b/tap-bootpstat.c index 3d722bb125..a36ad7aeb7 100644 --- a/tap-bootpstat.c +++ b/tap-bootpstat.c @@ -31,7 +31,7 @@ #include "epan/packet_info.h" #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" diff --git a/tap-dcerpcstat.c b/tap-dcerpcstat.c index 18a2402447..06f8989c1b 100644 --- a/tap-dcerpcstat.c +++ b/tap-dcerpcstat.c @@ -35,8 +35,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include <epan/dissectors/packet-dcerpc.h> -#include "stat.h" #include "register.h" /* used to keep track of statistics for a specific procedure */ diff --git a/tap-gsm_astat.c b/tap-gsm_astat.c index d5096d47dc..4b0214409e 100644 --- a/tap-gsm_astat.c +++ b/tap-gsm_astat.c @@ -42,9 +42,9 @@ #include "epan/packet_info.h" #include "epan/value_string.h" #include <epan/tap.h> +#include <epan/stat.h> #include <epan/dissectors/packet-bssap.h> #include <epan/dissectors/packet-gsm_a.h> -#include "stat.h" #include "register.h" diff --git a/tap-h225counter.c b/tap-h225counter.c index a19f0b5c1f..4ccc0c821f 100644 --- a/tap-h225counter.c +++ b/tap-h225counter.c @@ -36,8 +36,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" -#include "stat.h" #include "register.h" #include <epan/dissectors/packet-h225.h> diff --git a/tap-h225rassrt.c b/tap-h225rassrt.c index 0bb9148fc7..4f6e79425b 100644 --- a/tap-h225rassrt.c +++ b/tap-h225rassrt.c @@ -36,8 +36,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" -#include "stat.h" #include "register.h" #include <epan/dissectors/packet-h225.h> #include "timestats.h" diff --git a/tap-httpstat.c b/tap-httpstat.c index 8d48e84756..316858607c 100644 --- a/tap-httpstat.c +++ b/tap-httpstat.c @@ -32,7 +32,7 @@ #include "epan/packet_info.h" #include "epan/value_string.h" #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" #include <epan/dissectors/packet-http.h> diff --git a/tap-iostat.c b/tap-iostat.c index b3a6061988..4efdf45540 100644 --- a/tap-iostat.c +++ b/tap-iostat.c @@ -36,7 +36,7 @@ #include "epan/epan_dissect.h" #include "epan/packet_info.h" #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" diff --git a/tap-iousers.c b/tap-iousers.c index 37169311f4..75e70f2dfa 100644 --- a/tap-iousers.c +++ b/tap-iousers.c @@ -37,7 +37,7 @@ #include <epan/packet.h> #include <epan/addr_resolv.h> #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" #include <epan/dissectors/packet-ip.h> #include <epan/dissectors/packet-ipx.h> diff --git a/tap-mgcpstat.c b/tap-mgcpstat.c index 9f01a523f7..0771491813 100644 --- a/tap-mgcpstat.c +++ b/tap-mgcpstat.c @@ -35,8 +35,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" -#include "stat.h" #include "register.h" #include "plugins/mgcp/packet-mgcp.h" #include "timestats.h" diff --git a/tap-protocolinfo.c b/tap-protocolinfo.c index 19d4cb0379..ab42594915 100644 --- a/tap-protocolinfo.c +++ b/tap-protocolinfo.c @@ -39,7 +39,7 @@ #include "epan/column-utils.h" #include "epan/proto.h" #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" typedef struct _pci_t { diff --git a/tap-protohierstat.c b/tap-protohierstat.c index 81f1eda94f..7913819ebe 100644 --- a/tap-protohierstat.c +++ b/tap-protohierstat.c @@ -39,7 +39,7 @@ #include "epan/epan_dissect.h" #include "epan/proto.h" #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" typedef struct _phs_t { diff --git a/tap-rpcprogs.c b/tap-rpcprogs.c index a7dc8d9dda..9fec2448f0 100644 --- a/tap-rpcprogs.c +++ b/tap-rpcprogs.c @@ -39,8 +39,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include <epan/dissectors/packet-rpc.h> -#include "stat.h" #include "register.h" /* used to keep track of statistics for a specific program/version */ diff --git a/tap-rpcstat.c b/tap-rpcstat.c index 171dc64f7e..ab9d82a06d 100644 --- a/tap-rpcstat.c +++ b/tap-rpcstat.c @@ -41,8 +41,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include <epan/dissectors/packet-rpc.h> -#include "stat.h" #include "register.h" /* used to keep track of statistics for a specific procedure */ diff --git a/tap-sctpchunkstat.c b/tap-sctpchunkstat.c index 9fb7d114ae..20cc850cb3 100644 --- a/tap-sctpchunkstat.c +++ b/tap-sctpchunkstat.c @@ -37,8 +37,8 @@ #include "epan/packet_info.h" #include "epan/addr_resolv.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" -#include "stat.h" #include "register.h" #include <epan/dissectors/packet-sctp.h> diff --git a/tap-sipstat.c b/tap-sipstat.c index 65f008502f..79c9418498 100644 --- a/tap-sipstat.c +++ b/tap-sipstat.c @@ -36,8 +36,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" -#include "stat.h" #include "register.h" #include <epan/dissectors/packet-sip.h> diff --git a/tap-smbsids.c b/tap-smbsids.c index 8da279bb55..5c1bc2c407 100644 --- a/tap-smbsids.c +++ b/tap-smbsids.c @@ -35,9 +35,9 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/dissectors/packet-smb-sidsnooping.h> -#include "stat.h" #include "register.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" #include "smb.h" diff --git a/tap-smbstat.c b/tap-smbstat.c index d63b9fb991..a2e2a32e0d 100644 --- a/tap-smbstat.c +++ b/tap-smbstat.c @@ -35,8 +35,8 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> +#include <epan/stat.h> #include "epan/value_string.h" -#include "stat.h" #include "smb.h" #include "register.h" #include "timestats.h" diff --git a/tap-stats_tree.c b/tap-stats_tree.c index f126a38e82..2e528e160f 100644 --- a/tap-stats_tree.c +++ b/tap-stats_tree.c @@ -31,7 +31,7 @@ #include <stdio.h> #include <glib.h> #include <epan/stats_tree_priv.h> -#include "stat.h" +#include <epan/stat.h> /* actually unused */ struct _st_node_pres { diff --git a/tap-wspstat.c b/tap-wspstat.c index a5d744e9c9..70ab019a08 100644 --- a/tap-wspstat.c +++ b/tap-wspstat.c @@ -40,7 +40,7 @@ #include <string.h> #include "epan/packet_info.h" #include <epan/tap.h> -#include "stat.h" +#include <epan/stat.h> #include "register.h" #include "epan/value_string.h" #include <epan/dissectors/packet-wsp.h> diff --git a/tethereal.c b/tethereal.c index 028d85479b..13f7ce0820 100644 --- a/tethereal.c +++ b/tethereal.c @@ -84,6 +84,7 @@ #include "capture_ui_utils.h" #include <epan/epan_dissect.h> #include <epan/tap.h> +#include <epan/stat.h> #include <epan/timestamp.h> #ifdef HAVE_LIBPCAP |