As pointed out by Guy: timestats uses packet_info so it belongs in epan

not wsutil.

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

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index b11ceaf3619491f72293cd09bdccfc912f6b1a3b..f9ddbcd54797b58d67b89560147af4192af5d3b0 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1472,6 +1472,7 @@ set(LIBWIRESHARK_FILES
        tap.c
        tcap-persistentdata.c
        timestamp.c
+       timestats.c
        tfs.c
        to_str.c
        tvbparse.c

diff --git a/epan/Makefile.common b/epan/Makefile.common
index 473b870e493103c9e0b9673cdda83f21e3ee5f4e..b9e84e8b2e2876091d4ea3026e67cc509415e9e1 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -89,6 +89,7 @@ LIBWIRESHARK_SRC =            \
        tap.c                   \
        tcap-persistentdata.c   \
        timestamp.c             \
+       timestats.c             \
        tfs.c                   \
        to_str.c                \
        tvbparse.c              \
@@ -237,6 +238,7 @@ LIBWIRESHARK_INCLUDES =             \
        tap-voip.h              \
        tcap-persistentdata.h   \
        timestamp.h             \
+       timestats.h             \
        tfs.h                   \
        time_fmt.h              \
        to_str.h                \

diff --git a/wsutil/timestats.c b/epan/timestats.c
similarity index 100%
rename from wsutil/timestats.c
rename to epan/timestats.c

diff --git a/wsutil/timestats.h b/epan/timestats.h
similarity index 98%
rename from wsutil/timestats.h
rename to epan/timestats.h
index 81e6d970426704629e7db3a627556a2ccd8e173e..43abdf1dbf2864a1224c7b058c4a2d75d41eb902 100644 (file)
--- a/wsutil/timestats.h
+++ b/epan/timestats.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include "epan/packet_info.h"
-#include "nstime.h"
+#include "wsutil/nstime.h"
 
  /* Summary of time statistics*/
 typedef struct _timestat_t {

diff --git a/tap-megaco-common.c b/tap-megaco-common.c
index d4a033a0d4eabda11080fd37a4ac9ea880979bc7..159aa2333f52b94598c5095a6fb8c1cf7fb464b0 100644 (file)
--- a/tap-megaco-common.c
+++ b/tap-megaco-common.c
@@ -35,7 +35,7 @@
 #include <epan/tap.h>
 #include "epan/gcp.h"
 
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"

diff --git a/ui/cli/tap-afpstat.c b/ui/cli/tap-afpstat.c
index 8c5929d5c07f0cdfa8bf27164a147b70671028cb..43db7d616f7fbb2a0d9a97829be6ec459d83792f 100644 (file)
--- a/ui/cli/tap-afpstat.c
+++ b/ui/cli/tap-afpstat.c
@@ -33,7 +33,7 @@
 #include <epan/stat_cmd_args.h>
 #include <epan/value_string.h>
 #include <epan/dissectors/packet-afp.h>
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 /* used to keep track of the statistics for an entire program interface */
 typedef struct _afpstat_t {

diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c
index df27e857e0db7caf52c6568b7c0da21bbcbe4860..2eb78990a7b8e629032cfd1ca0bedfcb59405550 100644 (file)
--- a/ui/cli/tap-camelsrt.c
+++ b/ui/cli/tap-camelsrt.c
@@ -35,7 +35,7 @@
 #include "epan/asn1.h"
 #include "epan/dissectors/packet-camel.h"
 #include "epan/camel-persistentdata.h"
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include "epan/stat_cmd_args.h"
 
 

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index de5e2ecbe01bbaa6e2a7d20b999e8973bf214ff9..a31931f3a5f70989c362529d1d54c134a3d23fa9 100644 (file)
--- a/ui/cli/tap-comparestat.c
+++ b/ui/cli/tap-comparestat.c
@@ -45,7 +45,7 @@
 #include <epan/timestamp.h>
 #include <epan/stat_cmd_args.h>
 #include <epan/dissectors/packet-ip.h>
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 
 /* For checksum */

diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c
index 155b368deaf559f52379dc565f34ba891d53e245..8cf596bdc4507160e4f3052df0345a3b2d84faab 100644 (file)
--- a/ui/cli/tap-h225rassrt.c
+++ b/ui/cli/tap-h225rassrt.c
@@ -34,7 +34,7 @@
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-h225.h>
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 /* following values represent the size of their valuestring arrays */
 #define NUM_RAS_STATS 7

diff --git a/ui/cli/tap-megacostat.c b/ui/cli/tap-megacostat.c
index 9570b1b7b7ad0e6219acbc4e829e235cd94ba2f1..a56756e9ebe21e1c745a89aebe1bc950890bde4f 100644 (file)
--- a/ui/cli/tap-megacostat.c
+++ b/ui/cli/tap-megacostat.c
@@ -34,7 +34,7 @@
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
 #include "epan/gcp.h"
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include <epan/prefs-int.h>
 
 #include "tap-megaco-common.h"

diff --git a/ui/cli/tap-mgcpstat.c b/ui/cli/tap-mgcpstat.c
index 9ea2129fa9e3cd6d6f101c9250a139be5dcbb8e4..2c764e2b15023b33305dffe8cbf459c055613000 100644 (file)
--- a/ui/cli/tap-mgcpstat.c
+++ b/ui/cli/tap-mgcpstat.c
@@ -32,7 +32,7 @@
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
 #include "epan/dissectors/packet-mgcp.h"
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 #define NUM_TIMESTATS 11
 

diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c
index 67522b8b46434ec18987e164f7bab1adb88f0ec2..42f6e7f8fea03a4887f2196ca7d48d85399b3bed 100644 (file)
--- a/ui/cli/tap-radiusstat.c
+++ b/ui/cli/tap-radiusstat.c
@@ -32,7 +32,7 @@
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-radius.h>
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 typedef enum _radius_category {
        RADIUS_CAT_OVERALL = 0,

diff --git a/ui/cli/tap-smbstat.c b/ui/cli/tap-smbstat.c
index 153a086208f5a49dc8ad114e4cea3ec46cdd62c1..a1c6a9b761bb824b86c6c0f74d7bc75645eff22a 100644 (file)
--- a/ui/cli/tap-smbstat.c
+++ b/ui/cli/tap-smbstat.c
@@ -32,7 +32,7 @@
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
 #include <epan/dissectors/packet-smb.h>
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 #define MICROSECS_PER_SEC   1000000
 #define NANOSECS_PER_SEC    1000000000

diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index c6f483e5c61679398c58223520abc5ecda9ea2ed..839fc2e9973ea52e57d0dad0df655f8d6fbe97b6 100644 (file)
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -54,7 +54,7 @@
 #include <epan/in_cksum.h>
 
 #include "../stat_menu.h"
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 #include "ui/simple_dialog.h"
 

diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c
index 9b4b8b551ce1542a2d519cd186c615de9abd08cb..20ab61edc678797a10a6bab5ed30d6af3fb25f29 100644 (file)
--- a/ui/gtk/h225_ras_srt.c
+++ b/ui/gtk/h225_ras_srt.c
@@ -36,7 +36,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-h225.h>
 
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/megaco_stat.c b/ui/gtk/megaco_stat.c
index 55cc7ead6f9766b2bb09bd1ee21f1932808abe31..4f4ea353409b7cb4f5f02c5f4aed9980d84585c7 100644 (file)
--- a/ui/gtk/megaco_stat.c
+++ b/ui/gtk/megaco_stat.c
@@ -38,7 +38,7 @@
 #include "epan/gcp.h"
 #include <epan/prefs-int.h>
 
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/mgcp_stat.c b/ui/gtk/mgcp_stat.c
index 80d20ec958510ad9875f19607bd9d6f491f2cdbb..08c51c3c6561980f60874567c0039e5cb710cac6 100644 (file)
--- a/ui/gtk/mgcp_stat.c
+++ b/ui/gtk/mgcp_stat.c
@@ -35,7 +35,7 @@
 #include <epan/tap.h>
 #include "epan/dissectors/packet-mgcp.h"
 
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c
index 595a027f72073a0623bdf0a2ee50caf29bb6430a..8eea17ec193b7954b9b7a81ff40ab0a0f1b67f53 100644 (file)
--- a/ui/gtk/radius_stat.c
+++ b/ui/gtk/radius_stat.c
@@ -35,7 +35,7 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-radius.h>
 
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/service_response_time_table.h b/ui/gtk/service_response_time_table.h
index 761ebd813a7ba4903224e43b622d17ba33b608e4..f6505a6522ac76dcd4ba307c757c959f87f2efd2 100644 (file)
--- a/ui/gtk/service_response_time_table.h
+++ b/ui/gtk/service_response_time_table.h
@@ -29,7 +29,7 @@
 
 #include <gtk/gtk.h>
 #include "wsutil/nstime.h"
-#include "wsutil/timestats.h"
+#include "epan/timestats.h"
 
 /** @file
  *  Helper routines common to all service response time statistics tap.

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 97da38cbc575b02608eae809cd6752e358801abb..569f3b86a9d84fe71dfb4161056ac5d5e02f70d8 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -50,7 +50,6 @@ set(WSUTIL_FILES
   nstime.c
   privileges.c
   str_util.c
-  timestats.c
   type_util.c
   ${WSUTIL_PLATFORM_FILES}
 )

diff --git a/wsutil/Makefile.common b/wsutil/Makefile.common
index 712c6c84489d57e0396afb7a4ec28cfcc8bab834..5fc9a426badc051c4eff58a5ff259212af403f11 100644 (file)
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -44,7 +44,6 @@ LIBWSUTIL_SRC =       \
        nstime.c        \
        privileges.c    \
        str_util.c      \
-       timestats.c     \
        type_util.c
 
 # Header files that are not generated from other files
@@ -63,5 +62,4 @@ LIBWSUTIL_INCLUDES =  \
        nstime.h        \
        privileges.h    \
        str_util.h      \
-       timestats.h     \
        type_util.h