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

not wsutil.

svn path=/trunk/; revision=50159

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

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		\

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 {

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"

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 {

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"
 
 

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

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

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"

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
 

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,

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

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"
 

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"

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"

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"

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"

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.

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}
 )

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