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

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@15429 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.common b/Makefile.common
index bc4db2cf03bb6ab1f0daaefe3a6b5cdfcef44543..cf43eb6d3af3d4b6c3a43832fc911234f6b09ef1 100644 (file)
--- 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 d76615b66dabfac64fe4bfaf572b225107f96d7a..99578cb21290b92e487c4e201937f419ff5e5637 100644 (file)
--- 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 1ab118cec6b1f307f866d720282f3597c47a7d81..19439840cfcb01063fa176010ae26dbad438be99 100644 (file)
--- 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

diff --git a/stat.c b/epan/stat.c
similarity index 99%
rename from stat.c
rename to epan/stat.c
index 369d4207d5bd94204720abd2f47f99878e5689cd..06d5585e6572bdf12f37ffe34257140c305ce57f 100644 (file)
--- a/stat.c
+++ b/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.

diff --git a/stat.h b/epan/stat.h
similarity index 100%
rename from stat.h
rename to epan/stat.h

diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index eafe9f5a802b64e8f02d8328f69c853d873f5fda..e5351fbd20ba01200fdbfbb864a8560a7b2d5be1 100644 (file)
--- 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 ab54d4d957dc87b62fc1ff40613f5231a0e2b261..370cba881386126994826ab20c35a4d59cbb20ac 100644 (file)
--- 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 a63b300016da912ba1470c4ad1f2d0ccf6d688cd..5add45a336d483b3e814e13140d40f294e7426fe 100644 (file)
--- 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 0b1a34bd44cf483d670ee03d2321f92b54d77c40..5488f836b57041ba87081d47c320f3724e94beac 100644 (file)
--- 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 70acf6d683731d9de8eb73ee668a4318a5232e19..6f0e511ac7238c55aa76fd4efb05da10722b0d6e 100644 (file)
--- 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 0551e1c564bc2ae592ceadf95f2fec861e733d82..f507f0000deaf05c887065593c552f7b9a261987 100644 (file)
--- 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 4a8b10c55acf9790d94d19eb102a657b258012f0..0e6cb9e4e93adeb232ed2c284b3e181ee2895bc2 100644 (file)
--- 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 af235ad8c5ac5a91f272ac0dc4409c01f59f12a8..e28ddf8acab15158d9f0dd13f37179a4cf24bd8f 100644 (file)
--- 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 e49f5896e164be18b2510533af69331da0ea914a..e5edb7ec8a39fd815cafb5575aeb24317ac7a733 100644 (file)
--- 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 aa3458924a91304e1788861ed4693fa6440e0316..5f5ee2c87e6ae60180f47dc0b00cc5d8c58b6152 100644 (file)
--- 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 ed77b85218c0e6bfc88e12beb9338413ce4549cc..dce02e3b82b182d33058f7d5176994a32b239f8b 100644 (file)
--- 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 b56684617e66ca2a7a1e4e67fc023f04d819fca4..da6b281e2e2603b5d76994593dd04e6c49f7d54d 100644 (file)
--- 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 4a5cb40b9d2e6f380d1b827cfdf4b328c47b9268..6ffd2d701236252f2bd5da3ee65b8b798c7ed60e 100644 (file)
--- 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 028409a512090c79b613bc842282f32c4bffea0e..a1f6c909807df8e623d3555354283a46cada3ad9 100644 (file)
--- 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 4a3fcdaa9d5dab8da71aed6e71a1c71c657b5b27..abe0069c55bca60837184d259483b500ed3e9985 100644 (file)
--- 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 5e6c5bd15ca7c36a3ab5295642bcf7121877f686..ce5f7f5c6cf6eff82cbaedf4dd09638ac97ee075 100644 (file)
--- 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 8b2e77749d875c496838977c02266284bdf6bafb..1448ca569e794d7efb07cdd1a9564bba67024489 100644 (file)
--- 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 eec62033b9a202b34966653bd5eac8ab9e20352b..ca052c02a0bf304b9cf54cd07be0ebf4dd888f08 100644 (file)
--- 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 7f7b9abead9ba16cbdcbe0ec534b65e3da5d682c..04b4e2aedbf94fd4ae1004f99b76606d06c8d5cc 100644 (file)
--- 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 336dff10198fe2fce83d192de117a9df8082b085..6c172e3c8f36a9d691100fc7bc7b6c6a9031677a 100644 (file)
--- 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 5b8758dd0a1f92a07e52f205d84f31b9e4930b15..e55e353b64f53c514dacc2517639e02d20aa7965 100644 (file)
--- 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 226fbd0f9228d28c57be441fb6a22b851209017f..ad5fda1548d5842c689279aa137894d63bc911ab 100644 (file)
--- 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 dc7c86d0d80d716b85d5c9b6d6399fd18d280133..41dc057b95e263e4b2e558bf4c810912fdc4740f 100644 (file)
--- 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 7fcd91901f9bbb145d4d3e712d53de0f5b27c580..cd26d6682a1766549a813139676a5399c2d8023a 100644 (file)
--- 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 f2c0633b676866841b6c512caa0785b068bb415e..281e8dfe523102b7d357f27808a72bfe125a4c3e 100644 (file)
--- 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 d703135586a52c6f2c02df7d942140a5cb9ae0a8..c850f177aa4ba4c95bc30745b39903e7a935f530 100644 (file)
--- 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 951038c51567532e847b713fbe1d81d987fab3db..14d37340ae3f5742dd2abc7ddcbba8bcee4552bd 100644 (file)
--- 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 7a68a793d0c551452cd4e4eab29fbcfa1c1c3eaf..c87761d5d775c0bc91f9c10ded80f5ebabfa3f02 100644 (file)
--- 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 a82c53b15e36d96d20658294c40e69524915282f..8f5535e9c4c3233d22db727ec4117a91b9393c6d 100644 (file)
--- 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 c0c8dcb9a016347c91ee626a5ca6093f691d665d..ccec1a8161c640980eccebc8ab7b80f4af784161 100644 (file)
--- 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 0726cf72604e941288eb5cbd077559093b76d805..6c114ed6c64d3232cb46cb6f0dbebbf646d49dbb 100644 (file)
--- 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 fe7953295f28d6cba4660c27d3c41f4a8178c9ce..7078a2ebd829d6d2b7d6f6efc85befad66e0f164 100644 (file)
--- 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 aa2df72db7fb1525a97a88d4b24076374d0dee56..3fd02857c9ad81502753ee6b50a609e53fa5fd71 100644 (file)
--- 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 8449b3108883b4d58a2ecb9d719d48c856dadd43..6aa20ab69a754052fe57c592630998d98ee3174a 100644 (file)
--- 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 68ec5c47e1c3c2e0dcd82808b61d4abc19f0233b..fd7eb50cd19e22c63e83627e39da526d2883d89e 100644 (file)
--- 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 503c6b33c69c88d06e32cf6402b342b5e0707d8b..6fe4fe801661338bacfe992e86fad90f589b06b4 100644 (file)
--- 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 bf85645e609da217719c5b8912abcd1347ad0128..03d4f06bc73dcd0b503e824ff3479e08160a2f24 100644 (file)
--- 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 3e97ac2ce927980b567c9ff27b5b9f1b209dd784..f1f9bcb3ccde6e417fb803517e9d062fdfacb72d 100644 (file)
--- 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 230a3f4a4621978d57db7cd04cdd78176e841e8c..fb38cdac1cbf10cdf24a02988dc141c455f09584 100644 (file)
--- 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 91f5d4096202eaabec1c616471c8f46da7de283a..d85cf9a2f1a6dd8df393092d3af5983348747c4a 100644 (file)
--- 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 0aed0e9c0f8d418061de28ab4dcba38defa6812e..972ef49629ae645c4d7ea4091d0ecb6786fbec32 100644 (file)
--- 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 45b2b57fa3bce99f14acf70a6e303662b81dc3d1..1203c7536d5acbb1ac174d23c0d6d8825dbcf808 100644 (file)
--- 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 d35ed5e8904f8b71a9fab408400082473ca0d787..8554cc6528c5abc86111e37a6f8000d16a33ea2a 100644 (file)
--- 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 051f1fbb00ef8599dc662a4718849cebe7793ba6..5581bbf32279623b5957691661ba2c23ff9688fc 100644 (file)
--- 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 dba134b93f744e408d7ce408afceaa171c51ddac..0faf017cfba61d168e761fe6e84025eae007cbe6 100644 (file)
--- 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 7601e42d6d1fc5ff85b4e4e891cf4ca73542ef99..c02766ec8e9393f4dbf34dc49b14891973eb88b3 100644 (file)
--- 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 f41df5337a1b7252d3f1eca519d6aa77865f5abd..463427073be9d0fa36de79138d3f88fdb72a5dff 100644 (file)
--- 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 83d9c320b5b5aea37194acb37c1b77d4b12d55df..83a594601e35b0f2e4f1cb439563998a8d1f290a 100644 (file)
--- 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 3d722bb12514cfed35ac27b48623cfbac969840b..a36ad7aeb70e20cd002f13bd07d7fc1753193a71 100644 (file)
--- 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 18a2402447200012c58b969ca668da6fffdcd3d1..06f8989c1b2e08e9b8c06da3a0ba84604047a36a 100644 (file)
--- 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 d5096d47dc2f41a30469d2c2ef776e9f9cd07e07..4b0214409e158702f46fa28a47291fd65efd079d 100644 (file)
--- 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 a19f0b5c1fa9f009f7966cebb15d2e72bfbf232f..4ccc0c821f1da8a5f2528652394056b9e1ace93c 100644 (file)
--- 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 0bb9148fc758de7615f1ab929f3577d8497a0346..4f6e79425ba6e41982f7f5c7a9766363c96fcfe1 100644 (file)
--- 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 8d48e847561de2883ce443b1ab90fb0725df8b0e..316858607c0dd34d61b00e0947071d80ec42264c 100644 (file)
--- 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 b3a60619884656826b5888de869e67a40655cb60..4efdf45540651ef3aff78b97bed7bdb73916def5 100644 (file)
--- 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 37169311f49b53fd8eed9dce6ed896cc1d821726..75e70f2dfa14d03c5d627d6a9fe5a8e2dea5f57d 100644 (file)
--- 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 9f01a523f71223fb02cfde34c09982e1df118026..07714918134cb4eb61353bf7e5d06742edcb910a 100644 (file)
--- 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 19d4cb0379a015ace2300d95ab3d715be953dcda..ab4259491576f03123640f60965e56477cc2967f 100644 (file)
--- 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 81f1eda94f8c8d92cf0a72d3df5405fbd4f09734..7913819ebe38770dcea343a00a66fde5ee8fdae1 100644 (file)
--- 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 a7dc8d9ddae683cd28879e7ee10334c6e0036fdb..9fec2448f0a32b5395018489e8959bfa9d86cc9e 100644 (file)
--- 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 171dc64f7ec8fa321e84ac9c049cd3cdd983774f..ab9d82a06d842b5363209bbaba6282168f285371 100644 (file)
--- 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 9fb7d114aea8b06325f7063a07b7e6bc57bc34f3..20cc850cb363d12f21704fcac8abb7c9bb442d0d 100644 (file)
--- 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 65f008502fb551b59d8f9a5905d157cd6da22fea..79c9418498f36ad0717b79da1869a11e6ddd8383 100644 (file)
--- 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 8da279bb558942d7d2a1d6fc60585dddf472ac25..5c1bc2c4075194fe655545cd82d7fe5ad17c610c 100644 (file)
--- 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 d63b9fb991e5978e2aeba37e10471e3e0e21744f..a2e2a32e0d1394287f2aac6fd570af3c4f7da6eb 100644 (file)
--- 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 f126a38e8288596c09b0257407b3984faa684b17..2e528e160ffc3beaafd3153c6cbf5f830bac6368 100644 (file)
--- 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 a5d744e9c95999b6e6a06d11183bdee0588b9364..70ab019a081f1821f42f63682d13db0675fc652f 100644 (file)
--- 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 028d85479b4bde1df778f174f7f2d2c8c345dc73..13f7ce082030dcc14b5a383a17c642e65192622c 100644 (file)
--- 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