Move the stats.[ch] stuff into epan, so plugins can use it.

svn path=/trunk/; revision=15429

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

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		\

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

epan/stat.c

@@ -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.

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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>

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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>

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 
 

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"
 
 

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 */

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"
 
 

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>
 

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"

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>
 

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"
 
 

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>

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"

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 {

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 {

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 */

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 */

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>
 

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>
 

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"
 

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"

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 {

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>

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