Move a couple of time-related modules into wsutil.

A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1b0316005d6e1e2f0ea8c6b6797ea5ca6f29f88..42b22fc74609d716740025eaa8d08caa72dbbe35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -659,7 +659,6 @@ set(WIRESHARK_COMMON_SRC
        ps.c
        svnversion.h
        sync_pipe_write.c
-       timestats.c
        tap-megaco-common.c
        tap-rtp-common.c
        version_info.c

diff --git a/Makefile.common b/Makefile.common
index 635e8c4ff05e638458835820661e384f00fe1e4c..6e3b3572c60dd602f9fd1945ef44b2518cc65c12 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -56,7 +56,6 @@ SHARK_COMMON_SRC =    \
        print.c                 \
        ps.c                    \
        sync_pipe_write.c       \
-       timestats.c             \
        tap-megaco-common.c     \
        tap-rtp-common.c        \
        version_info.c
@@ -81,7 +80,6 @@ SHARK_COMMON_INCLUDES =       \
        ps.h                    \
        register.h              \
        tempfile.h              \
-       timestats.h             \
        tap-megaco-common.h     \
        tap-rtp-common.h        \
        version_info.h          \
@@ -176,7 +174,6 @@ mergecap_SOURCES = \
 editcap_SOURCES = \
        editcap.c       \
        epan/crypt/md5.c \
-       epan/nstime.c \
        $(WTAP_PLUGIN_SOURCES)
 
 # reordercap specifics

diff --git a/asn1/cmp/packet-cmp-template.c b/asn1/cmp/packet-cmp-template.c
index 857290b7d8bbbd885fa2880e4db3358cd91d78d7..2281da22986a04be5352db3cbf493e72df810bf8 100644 (file)
--- a/asn1/cmp/packet-cmp-template.c
+++ b/asn1/cmp/packet-cmp-template.c
@@ -41,7 +41,6 @@
 #include "packet-tcp.h"
 #include "packet-http.h"
 #include <epan/prefs.h>
-#include <epan/nstime.h>
 
 #define PNAME  "Certificate Management Protocol"
 #define PSNAME "CMP"

diff --git a/asn1/goose/packet-goose-template.c b/asn1/goose/packet-goose-template.c
index 0577d5f6ab21e8216b988116730b7411240bd2ae..c65a9b1d9f85bc9dd947a8ce152d805cb6c9e3db 100644 (file)
--- a/asn1/goose/packet-goose-template.c
+++ b/asn1/goose/packet-goose-template.c
@@ -30,7 +30,6 @@
 #include <epan/asn1.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
-#include <epan/nstime.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"

diff --git a/asn1/mms/packet-mms-template.c b/asn1/mms/packet-mms-template.c
index 64753b27181efba3612eea31affe62ed477251d9..421cf8dcbba56b3af485f7b272b22e8c2dc6e297 100644 (file)
--- a/asn1/mms/packet-mms-template.c
+++ b/asn1/mms/packet-mms-template.c
@@ -30,7 +30,6 @@
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/nstime.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"

diff --git a/asn1/sv/packet-sv-template.c b/asn1/sv/packet-sv-template.c
index 5ad3a71e9fe6a342ae3f2104a8d939021d3f5231..e225eadfbed57eb3a3ef00cedf07b2127dd6e222 100644 (file)
--- a/asn1/sv/packet-sv-template.c
+++ b/asn1/sv/packet-sv-template.c
@@ -30,7 +30,6 @@
 #include <epan/asn1.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
-#include <epan/nstime.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/editcap.c b/editcap.c
index 3332d5df6aaff02dafc741d3806e58c2c220f2ae..a0a4dfc227f627baab083027a8b81f84a93aa861 100644 (file)
--- a/editcap.c
+++ b/editcap.c
@@ -89,7 +89,7 @@
 #include "epan/plugins.h"
 #include "epan/report_err.h"
 #include "epan/filesystem.h"
-#include "epan/nstime.h"
+#include "wsutil/nstime.h"
 #undef WS_BUILD_DLL
 #define RESET_SYMBOL_EXPORT
 

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 7eacdf14f08eb4ba7a9808724a68cd41de802b6d..b11ceaf3619491f72293cd09bdccfc912f6b1a3b 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1448,7 +1448,6 @@ set(LIBWIRESHARK_FILES
        ipproto.c
        ipv4.c
        next_tvb.c
-       nstime.c
        oids.c
        osi-utils.c
        packet.c

diff --git a/epan/Makefile.common b/epan/Makefile.common
index c2f797f5613ab73cbeb2da5dccf2c7aa4386cba8..473b870e493103c9e0b9673cdda83f21e3ee5f4e 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -65,7 +65,6 @@ LIBWIRESHARK_SRC =            \
        ipproto.c               \
        ipv4.c                  \
        next_tvb.c              \
-       nstime.c                \
        oids.c                  \
        osi-utils.c             \
        packet.c                \
@@ -203,7 +202,6 @@ LIBWIRESHARK_INCLUDES =             \
        llcsaps.h               \
        next_tvb.h              \
        nlpid.h                 \
-       nstime.h                \
        oids.h                  \
        osi-utils.h             \
        oui.h                   \

diff --git a/epan/column.c b/epan/column.c
index 231f1c545973e6cb94eeebe5be7109259860dffc..e25252b54c8c87e3f63c142ea1cbb2d4f626842c 100644 (file)
--- a/epan/column.c
+++ b/epan/column.c
@@ -35,7 +35,6 @@
 
 #include <epan/timestamp.h>
 #include <epan/prefs.h>
-#include <epan/nstime.h>
 #include <epan/dfilter/dfilter.h>
 #include <epan/column.h>
 #include <epan/packet.h>

diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 99770656bab6409ccad815cd2956c4cc83a8fdea..b5823b443a259dc48e5a24a9b6882179d752c2e8 100644 (file)
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -49,7 +49,6 @@
 #include "packet-tcp.h"
 #include "packet-http.h"
 #include <epan/prefs.h>
-#include <epan/nstime.h>
 
 #define PNAME  "Certificate Management Protocol"
 #define PSNAME "CMP"
@@ -237,7 +236,7 @@ static int hf_cmp_PKIFailureInfo_systemFailure = -1;
 static int hf_cmp_PKIFailureInfo_duplicateCertReq = -1;
 
 /*--- End of included file: packet-cmp-hf.c ---*/
-#line 70 "../../asn1/cmp/packet-cmp-template.c"
+#line 69 "../../asn1/cmp/packet-cmp-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmp = -1;
@@ -293,7 +292,7 @@ static gint ett_cmp_PollRepContent = -1;
 static gint ett_cmp_PollRepContent_item = -1;
 
 /*--- End of included file: packet-cmp-ett.c ---*/
-#line 74 "../../asn1/cmp/packet-cmp-template.c"
+#line 73 "../../asn1/cmp/packet-cmp-template.c"
 
 /*--- Included file: packet-cmp-fn.c ---*/
 #line 1 "../../asn1/cmp/packet-cmp-fn.c"
@@ -1453,7 +1452,7 @@ static void dissect_SuppLangTagsValue_PDU(tvbuff_t *tvb _U_, packet_info *pinfo
 
 
 /*--- End of included file: packet-cmp-fn.c ---*/
-#line 75 "../../asn1/cmp/packet-cmp-template.c"
+#line 74 "../../asn1/cmp/packet-cmp-template.c"
 
 static int
 dissect_cmp_pdu(tvbuff_t *tvb, proto_tree *tree, asn1_ctx_t *actx)
@@ -2343,7 +2342,7 @@ void proto_register_cmp(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-cmp-hfarr.c ---*/
-#line 332 "../../asn1/cmp/packet-cmp-template.c"
+#line 331 "../../asn1/cmp/packet-cmp-template.c"
        };
 
        /* List of subtrees */
@@ -2401,7 +2400,7 @@ void proto_register_cmp(void) {
     &ett_cmp_PollRepContent_item,
 
 /*--- End of included file: packet-cmp-ettarr.c ---*/
-#line 338 "../../asn1/cmp/packet-cmp-template.c"
+#line 337 "../../asn1/cmp/packet-cmp-template.c"
        };
        module_t *cmp_module;
 
@@ -2495,7 +2494,7 @@ void proto_reg_handoff_cmp(void) {
 
 
 /*--- End of included file: packet-cmp-dis-tab.c ---*/
-#line 410 "../../asn1/cmp/packet-cmp-template.c"
+#line 409 "../../asn1/cmp/packet-cmp-template.c"
                inited = TRUE;
        }
 

diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index a17e644ce349b03cc57379998436f222da03632e..7cd1c67eda43b00e7eddd483075c626bf5abe255 100644 (file)
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -38,7 +38,6 @@
 #include <epan/asn1.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
-#include <epan/nstime.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"
@@ -120,7 +119,7 @@ static int hf_goose_mMSString = -1;               /* MMSString */
 static int hf_goose_utc_time = -1;                /* UtcTime */
 
 /*--- End of included file: packet-goose-hf.c ---*/
-#line 52 "../../asn1/goose/packet-goose-template.c"
+#line 51 "../../asn1/goose/packet-goose-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_goose = -1;
@@ -147,7 +146,7 @@ static gint ett_goose_SEQUENCE_OF_Data = -1;
 static gint ett_goose_Data = -1;
 
 /*--- End of included file: packet-goose-ett.c ---*/
-#line 57 "../../asn1/goose/packet-goose-template.c"
+#line 56 "../../asn1/goose/packet-goose-template.c"
 
 
 /*--- Included file: packet-goose-fn.c ---*/
@@ -715,7 +714,7 @@ dissect_goose_GOOSEpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset
 
 
 /*--- End of included file: packet-goose-fn.c ---*/
-#line 59 "../../asn1/goose/packet-goose-template.c"
+#line 58 "../../asn1/goose/packet-goose-template.c"
 
 /*
 * Dissect GOOSE PDUs inside a PPDU.
@@ -1024,7 +1023,7 @@ void proto_register_goose(void) {
         "UtcTime", HFILL }},
 
 /*--- End of included file: packet-goose-hfarr.c ---*/
-#line 127 "../../asn1/goose/packet-goose-template.c"
+#line 126 "../../asn1/goose/packet-goose-template.c"
   };
 
   /* List of subtrees */
@@ -1052,7 +1051,7 @@ void proto_register_goose(void) {
     &ett_goose_Data,
 
 /*--- End of included file: packet-goose-ettarr.c ---*/
-#line 133 "../../asn1/goose/packet-goose-template.c"
+#line 132 "../../asn1/goose/packet-goose-template.c"
   };
 
   static ei_register_info ei[] = {

diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 5c01507896942e5657679aa164ee5ce546e080b6..c38b9432e0b9357bd43802fa816a7bbda1b0ab36 100644 (file)
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -44,7 +44,6 @@
 #include <epan/prefs.h>
 #include <epan/conversation.h>
 #include "packet-scsi.h"
-#include <epan/nstime.h>
 #include <epan/emem.h>
 #include <epan/range.h>
 #include <wsutil/crc32.h>

diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index 97e12b6332347bb35e3428084ea0e3ed1daf3e49..df18a337befd8a933a3b3fd5601fefd1aae0811e 100644 (file)
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -38,7 +38,6 @@
 #include <epan/packet.h>
 #include <epan/asn1.h>
 #include <epan/expert.h>
-#include <epan/nstime.h>
 
 #include "packet-ber.h"
 #include "packet-acse.h"
@@ -723,7 +722,7 @@ static int hf_mms_Transitions_idle_to_active = -1;
 static int hf_mms_Transitions_any_to_deleted = -1;
 
 /*--- End of included file: packet-mms-hf.c ---*/
-#line 47 "../../asn1/mms/packet-mms-template.c"
+#line 46 "../../asn1/mms/packet-mms-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_mms = -1;
@@ -940,7 +939,7 @@ static gint ett_mms_DirectoryEntry = -1;
 static gint ett_mms_FileAttributes = -1;
 
 /*--- End of included file: packet-mms-ett.c ---*/
-#line 51 "../../asn1/mms/packet-mms-template.c"
+#line 50 "../../asn1/mms/packet-mms-template.c"
 
 static expert_field ei_mms_mal_timeofday_encoding = EI_INIT;
 static expert_field ei_mms_mal_utctime_encoding = EI_INIT;
@@ -7053,7 +7052,7 @@ dissect_mms_MMSpdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_,
 
 
 /*--- End of included file: packet-mms-fn.c ---*/
-#line 56 "../../asn1/mms/packet-mms-template.c"
+#line 55 "../../asn1/mms/packet-mms-template.c"
 
 /*
 * Dissect MMS PDUs inside a PPDU.
@@ -9761,7 +9760,7 @@ void proto_register_mms(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-mms-hfarr.c ---*/
-#line 95 "../../asn1/mms/packet-mms-template.c"
+#line 94 "../../asn1/mms/packet-mms-template.c"
   };
 
   /* List of subtrees */
@@ -9980,7 +9979,7 @@ void proto_register_mms(void) {
     &ett_mms_FileAttributes,
 
 /*--- End of included file: packet-mms-ettarr.c ---*/
-#line 101 "../../asn1/mms/packet-mms-template.c"
+#line 100 "../../asn1/mms/packet-mms-template.c"
   };
 
   static ei_register_info ei[] = {

diff --git a/epan/dissectors/packet-sv.c b/epan/dissectors/packet-sv.c
index d25e4d00b9c246999bc07a0a9654c4700d09e5d3..41428bbcee81ca8db0fbc3fdc5e3214d7ff29e17 100644 (file)
--- a/epan/dissectors/packet-sv.c
+++ b/epan/dissectors/packet-sv.c
@@ -38,7 +38,6 @@
 #include <epan/asn1.h>
 #include <epan/etypes.h>
 #include <epan/expert.h>
-#include <epan/nstime.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -127,7 +126,7 @@ static int hf_sv_seqData = -1;                    /* Data */
 static int hf_sv_smpMod = -1;                     /* T_smpMod */
 
 /*--- End of included file: packet-sv-hf.c ---*/
-#line 105 "../../asn1/sv/packet-sv-template.c"
+#line 104 "../../asn1/sv/packet-sv-template.c"
 
 /* Initialize the subtree pointers */
 static int ett_sv = -1;
@@ -143,7 +142,7 @@ static gint ett_sv_SEQUENCE_OF_ASDU = -1;
 static gint ett_sv_ASDU = -1;
 
 /*--- End of included file: packet-sv-ett.c ---*/
-#line 112 "../../asn1/sv/packet-sv-template.c"
+#line 111 "../../asn1/sv/packet-sv-template.c"
 
 static expert_field ei_sv_mal_utctime = EI_INIT;
 
@@ -450,7 +449,7 @@ dissect_sv_SampledValues(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 
 /*--- End of included file: packet-sv-fn.c ---*/
-#line 195 "../../asn1/sv/packet-sv-template.c"
+#line 194 "../../asn1/sv/packet-sv-template.c"
 
 /*
 * Dissect SV PDUs inside a PPDU.
@@ -624,7 +623,7 @@ void proto_register_sv(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-sv-hfarr.c ---*/
-#line 312 "../../asn1/sv/packet-sv-template.c"
+#line 311 "../../asn1/sv/packet-sv-template.c"
        };
 
        /* List of subtrees */
@@ -641,7 +640,7 @@ void proto_register_sv(void) {
     &ett_sv_ASDU,
 
 /*--- End of included file: packet-sv-ettarr.c ---*/
-#line 320 "../../asn1/sv/packet-sv-template.c"
+#line 319 "../../asn1/sv/packet-sv-template.c"
        };
 
        static ei_register_info ei[] = {

diff --git a/epan/frame_data.h b/epan/frame_data.h
index 050fa28c37da7168a13aceb183ca4cb5aa00da15..2efdb39ab422b6147f313a874ee6556f4bf646ac 100644 (file)
--- a/epan/frame_data.h
+++ b/epan/frame_data.h
@@ -27,7 +27,7 @@
 
 #include <epan/column_info.h>
 #include <epan/tvbuff.h>
-#include <epan/nstime.h>
+#include <wsutil/nstime.h>
 #include "ws_symbol_export.h"
 
 #define PINFO_FD_NUM(pinfo)       ((pinfo)->fd->num)

diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h
index bdf969ba84a16ef3c88800d03cc5fed37f750dec..82bbe25097192a8642f671f8a8f3aed61663deca 100644 (file)
--- a/epan/ftypes/ftypes.h
+++ b/epan/ftypes/ftypes.h
@@ -165,7 +165,7 @@ ftype_can_matches(enum ftenum ftype);
 #include <epan/guid-utils.h>
 
 #include <epan/tvbuff.h>
-#include <epan/nstime.h>
+#include <wsutil/nstime.h>
 #include <epan/dfilter/drange.h>
 
 typedef struct _fvalue_t {

diff --git a/epan/proto.h b/epan/proto.h
index a05d43fe9dae5e587ba6b21e73b3771743e895da..e82747f9c8a794fe72eca2dcd3be06e9826fe44e 100644 (file)
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -46,7 +46,7 @@
 #include <glib.h>
 
 #include "ipv4.h"
-#include "nstime.h"
+#include "wsutil/nstime.h"
 #include "time_fmt.h"
 #include "tvbuff.h"
 #include "ftypes/ftypes.h"

diff --git a/epan/to_str.h b/epan/to_str.h
index a353304a3dfa98a61516730816ab6c9473f81367..3e2f137ab997da041a36ffef32e90455760139ff 100644 (file)
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 
-#include "nstime.h"
+#include "wsutil/nstime.h"
 #include "time_fmt.h"
 #include <epan/packet_info.h>
 #include "ws_symbol_export.h"

diff --git a/epan/wslua/init_wslua.c b/epan/wslua/init_wslua.c
index ad23c1ecb0eb194825a87541d779ca2d92428ca5..577dab9fe58822fd85a5c4606d76b2d2decb2c37 100644 (file)
--- a/epan/wslua/init_wslua.c
+++ b/epan/wslua/init_wslua.c
@@ -30,7 +30,6 @@
 
 #include "wslua.h"
 #include <epan/dissectors/packet-frame.h>
-#include <epan/nstime.h>
 #include <math.h>
 #include <epan/expert.h>
 #include <epan/ex-opt.h>

diff --git a/epan/wslua/wslua.h b/epan/wslua/wslua.h
index eaf93b9adbff7139d02468dfcc9003e2ee12c9fa..d761c4830a69e10101f92f1afbd6e4eba47b0937 100644 (file)
--- a/epan/wslua/wslua.h
+++ b/epan/wslua/wslua.h
@@ -51,7 +51,7 @@
 #include <epan/funnel.h>
 #include <epan/tvbparse.h>
 #include <epan/epan.h>
-#include <epan/nstime.h>
+#include <wsutil/nstime.h>
 
 #include "declare_wslua.h"
 

diff --git a/tap-megaco-common.c b/tap-megaco-common.c
index f2688bbc5e6b3f67bbfe1b0c26505fbee42e8ea3..d4a033a0d4eabda11080fd37a4ac9ea880979bc7 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 "../timestats.h"
+#include "wsutil/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 088030574e599657b28c1526e29bb77cb9330af3..8c5929d5c07f0cdfa8bf27164a147b70671028cb 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 "timestats.h"
+#include "wsutil/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 f241a729600b038b4fdd1965764ce2b86e7b54d6..df27e857e0db7caf52c6568b7c0da21bbcbe4860 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 "timestats.h"
+#include "wsutil/timestats.h"
 #include "epan/stat_cmd_args.h"
 
 

diff --git a/ui/cli/tap-comparestat.c b/ui/cli/tap-comparestat.c
index 6f55926e6ca7fbac35df20e56ca00c8c67cc390a..de5e2ecbe01bbaa6e2a7d20b999e8973bf214ff9 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 "timestats.h"
+#include "wsutil/timestats.h"
 
 
 /* For checksum */

diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c
index f3b5777bdc07f4e501f7468abf2ed3e3d68d3209..ce773bfccb8b1672095562dbe57e7b39bd197f05 100644 (file)
--- a/ui/cli/tap-diameter-avp.c
+++ b/ui/cli/tap-diameter-avp.c
@@ -46,7 +46,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/stat_cmd_args.h>
 #include "epan/value_string.h"
-#include "epan/nstime.h"
 #include "epan/ftypes/ftypes.h"
 #include "epan/to_str.h"
 #include "epan/dissectors/packet-diameter.h"

diff --git a/ui/cli/tap-funnel.c b/ui/cli/tap-funnel.c
index 38d26a5f16847da8b6e6cf6257402f42c3934aac..acbc89cbd4b08cffbc28586ea720956e5bde2c9a 100644 (file)
--- a/ui/cli/tap-funnel.c
+++ b/ui/cli/tap-funnel.c
@@ -30,7 +30,6 @@
 
 #include <glib.h>
 #include <wiretap/wtap.h>
-#include <epan/nstime.h>
 #include <epan/proto.h>
 
 #include <epan/funnel.h>

diff --git a/ui/cli/tap-h225rassrt.c b/ui/cli/tap-h225rassrt.c
index 5bb62e97f4d92b2bc5c0db92a4bb0d5eb0396461..155b368deaf559f52379dc565f34ba891d53e245 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 "timestats.h"
+#include "wsutil/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 b15f5673e2f7289a3ac9bd675b7c8f79945f8bab..9570b1b7b7ad0e6219acbc4e829e235cd94ba2f1 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 "timestats.h"
+#include "wsutil/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 4858142721968b05bfcd35a40b499edddc865fdb..9ea2129fa9e3cd6d6f101c9250a139be5dcbb8e4 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 "timestats.h"
+#include "wsutil/timestats.h"
 
 #define NUM_TIMESTATS 11
 

diff --git a/ui/cli/tap-radiusstat.c b/ui/cli/tap-radiusstat.c
index 852c89d0c8ed3e2f4c7e5a2995187ee514f774a1..67522b8b46434ec18987e164f7bab1adb88f0ec2 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 "timestats.h"
+#include "wsutil/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 99d65ddc23f45509ec208b25d0802fed4b1adf95..153a086208f5a49dc8ad114e4cea3ec46cdd62c1 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 "timestats.h"
+#include "wsutil/timestats.h"
 
 #define MICROSECS_PER_SEC   1000000
 #define NANOSECS_PER_SEC    1000000000

diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c
index 8ef6acb0ff3711bd30c9763dd81266fd6c34d978..ccd705a4457d07c66f5e0863242254680f392422 100644 (file)
--- a/ui/cli/tap-sv.c
+++ b/ui/cli/tap-sv.c
@@ -32,7 +32,6 @@
 #include <epan/packet_info.h>
 #include <epan/tap.h>
 #include <epan/stat_cmd_args.h>
-#include <epan/nstime.h>
 #include <epan/dissectors/packet-sv.h>
 
 static int

diff --git a/ui/gtk/afp_stat.c b/ui/gtk/afp_stat.c
index 56af2e4b11c6a950ed17a871b906c730185d4e40..61258ea2d40fd3e5aa53fdde7796783a8a5122a6 100644 (file)
--- a/ui/gtk/afp_stat.c
+++ b/ui/gtk/afp_stat.c
@@ -35,7 +35,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-afp.h>
 
-#include "../timestats.h"
 #include "../file.h"
 #include "../stat_menu.h"
 

diff --git a/ui/gtk/camel_counter.c b/ui/gtk/camel_counter.c
index f2f2621283a8a4a8ef411f4da7bce32e32ff778f..53e334abfddb20028966278fdf9032852401fea8 100644 (file)
--- a/ui/gtk/camel_counter.c
+++ b/ui/gtk/camel_counter.c
@@ -38,7 +38,6 @@
 #include <epan/camel-persistentdata.h>
 
 #include "../stat_menu.h"
-#include "../timestats.h"
 
 #include "ui/simple_dialog.h"
 

diff --git a/ui/gtk/camel_srt.c b/ui/gtk/camel_srt.c
index b52cc2c904090c6f3a75c2a15f3607684d1ba78a..d9d396d8de57249dc9940427cba001ea600b9ef2 100644 (file)
--- a/ui/gtk/camel_srt.c
+++ b/ui/gtk/camel_srt.c
@@ -36,7 +36,6 @@
 #include <epan/asn1.h>
 #include <epan/camel-persistentdata.h>
 
-#include "../timestats.h"
 #include "../file.h"
 #include "../stat_menu.h"
 

diff --git a/ui/gtk/compare_stat.c b/ui/gtk/compare_stat.c
index e07ee96eaa1f036f5b69f06a8d297bb911af6d83..c6f483e5c61679398c58223520abc5ecda9ea2ed 100644 (file)
--- a/ui/gtk/compare_stat.c
+++ b/ui/gtk/compare_stat.c
@@ -51,11 +51,10 @@
 #include <epan/packet.h>
 #include <epan/report_err.h>
 #include <epan/dissectors/packet-ip.h>
-#include <epan/nstime.h>
 #include <epan/in_cksum.h>
 
 #include "../stat_menu.h"
-#include "../timestats.h"
+#include "wsutil/timestats.h"
 
 #include "ui/simple_dialog.h"
 

diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c
index e17d62e7f83b32e05f61e51478ac4a832db9f75f..4cb5ef57f607d962dbc77833b8b497b0f2692f9c 100644 (file)
--- a/ui/gtk/conversations_table.c
+++ b/ui/gtk/conversations_table.c
@@ -35,7 +35,6 @@
 #include <epan/address.h>
 #include <epan/addr_resolv.h>
 #include <epan/tap.h>
-#include <epan/nstime.h>
 
 #include "../globals.h"
 

diff --git a/ui/gtk/diameter_stat.c b/ui/gtk/diameter_stat.c
index a5887c3577d568fe101b87071b492c144b5679db..c0cd20f452cf1fcafa88445d4a406ad1eb73bc5b 100644 (file)
--- a/ui/gtk/diameter_stat.c
+++ b/ui/gtk/diameter_stat.c
@@ -36,7 +36,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-diameter.h>
 
-#include "../timestats.h"
 #include "../file.h"
 #include "../stat_menu.h"
 

diff --git a/ui/gtk/fc_stat.c b/ui/gtk/fc_stat.c
index 85d64227db118810da7761000ad7c002c95a2cb8..45d54438869fb99628c76d431514129c1a9d3883 100644 (file)
--- a/ui/gtk/fc_stat.c
+++ b/ui/gtk/fc_stat.c
@@ -36,7 +36,6 @@
 #include <epan/dissectors/packet-scsi.h>
 #include <epan/dissectors/packet-fc.h>
 
-#include "../timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/filter_expression_save_dlg.c b/ui/gtk/filter_expression_save_dlg.c
index adc4aed15deb9b50ed11b4300b908cab6cf3d31e..f9525835f935e8ccf293d936722b49fe0b5efe79 100644 (file)
--- a/ui/gtk/filter_expression_save_dlg.c
+++ b/ui/gtk/filter_expression_save_dlg.c
@@ -33,7 +33,6 @@
 
 #include <epan/proto.h>
 #include <epan/dfilter/dfilter.h>
-#include <epan/nstime.h>
 #include <epan/strutil.h>
 #include <epan/prefs.h>
 #include <epan/filter_expressions.h>

diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c
index 4af421486be52c2283512403fd693f470bcf978a..11583fa0a26279317085a243d1c0cc17e176d220 100644 (file)
--- a/ui/gtk/funnel_stat.c
+++ b/ui/gtk/funnel_stat.c
@@ -46,7 +46,6 @@
 #include <epan/prefs.h>
 #include <epan/funnel.h>
 
-#include "../timestats.h"
 #include "../file.h"
 #include "../stat_menu.h"
 #include "ui/progress_dlg.h"

diff --git a/ui/gtk/gtp_stat.c b/ui/gtk/gtp_stat.c
index 908a8a95f81b3f3fd6a7f714a8d4749641de4ed5..17e6a15cc950e9863e9601fecf7f774d6d07e638 100644 (file)
--- a/ui/gtk/gtp_stat.c
+++ b/ui/gtk/gtp_stat.c
@@ -35,7 +35,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-gtp.h>
 
-#include "../timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/h225_ras_srt.c b/ui/gtk/h225_ras_srt.c
index bd12ac71d22c499f1ebc2f05e3c2e0dc8e668242..9b4b8b551ce1542a2d519cd186c615de9abd08cb 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 "../timestats.h"
+#include "wsutil/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/ldap_stat.c b/ui/gtk/ldap_stat.c
index e34255211eded5905189f0146da40fbdcfbcecb2..c2f9a6f0ce149c852f6c86501cfb115050e0fdf2 100644 (file)
--- a/ui/gtk/ldap_stat.c
+++ b/ui/gtk/ldap_stat.c
@@ -34,7 +34,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ldap.h>
 
-#include "../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 5f0b0bab7dcb3b3205b56c0f686ca87826f3f8bc..55cc7ead6f9766b2bb09bd1ee21f1932808abe31 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 "../timestats.h"
+#include "wsutil/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 aea8739278e1d298b9c9250b23cadaba3dea04fa..80d20ec958510ad9875f19607bd9d6f491f2cdbb 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 "../timestats.h"
+#include "wsutil/timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/ncp_stat.c b/ui/gtk/ncp_stat.c
index 6ab3b912426fa7ab6408a269bd0643e94a8bd291..3a8a9f2b5316038cf695eaa2e43938932b90ca36 100644 (file)
--- a/ui/gtk/ncp_stat.c
+++ b/ui/gtk/ncp_stat.c
@@ -34,7 +34,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-ncp-int.h>
 
-#include "../timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../stat_menu.h"

diff --git a/ui/gtk/packet_list_store.c b/ui/gtk/packet_list_store.c
index d91fdd603307eb2814a31e31592061eb180df99c..c1e9a4c29cdfbdbc2b430bf66bb3b052138ae14b 100644 (file)
--- a/ui/gtk/packet_list_store.c
+++ b/ui/gtk/packet_list_store.c
@@ -45,7 +45,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/column_info.h>
 #include <epan/column.h>
-#include <epan/nstime.h>
 
 #include "color.h"
 #include "color_filters.h"

diff --git a/ui/gtk/radius_stat.c b/ui/gtk/radius_stat.c
index cd73e76795204a98fa2206500acbd848ad5e64e9..595a027f72073a0623bdf0a2ee50caf29bb6430a 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 "../timestats.h"
+#include "wsutil/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 3907ac5de1c93f180ed2fd3fa883a96613d47636..761ebd813a7ba4903224e43b622d17ba33b608e4 100644 (file)
--- a/ui/gtk/service_response_time_table.h
+++ b/ui/gtk/service_response_time_table.h
@@ -28,8 +28,8 @@
 #define __SERVICE_RESPONSE_TIME_TABLE_H__
 
 #include <gtk/gtk.h>
-#include "epan/nstime.h"
-#include "../timestats.h"
+#include "wsutil/nstime.h"
+#include "wsutil/timestats.h"
 
 /** @file
  *  Helper routines common to all service response time statistics tap.

diff --git a/ui/gtk/smb2_stat.c b/ui/gtk/smb2_stat.c
index b875bd57d7cfd13eaf2ebc183e30da394183372e..c3b0a5108e0bd9721aabddc728a350be5e8ab484 100644 (file)
--- a/ui/gtk/smb2_stat.c
+++ b/ui/gtk/smb2_stat.c
@@ -34,7 +34,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-smb2.h>
 
-#include "../timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"

diff --git a/ui/gtk/smb_stat.c b/ui/gtk/smb_stat.c
index 8d81688727ea8c3a1b01eacac7268505129e5c79..33c730bc68bff10d37dd3d8df317a97b54a24125 100644 (file)
--- a/ui/gtk/smb_stat.c
+++ b/ui/gtk/smb_stat.c
@@ -34,7 +34,6 @@
 #include <epan/tap.h>
 #include <epan/dissectors/packet-smb.h>
 
-#include "../timestats.h"
 #include "ui/simple_dialog.h"
 #include "../file.h"
 #include "../globals.h"

diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index 63f986e2a874c70f006a189d2a09fe1be10d6ed8..1136b629911232a20459f5f621311efe9609fc91 100644 (file)
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -37,7 +37,7 @@
 #include "../../epan/addr_resolv.h"
 #include "../../epan/prefs.h"
 #include "../../epan/filesystem.h"
-#include "../../epan/nstime.h"
+#include "../../wsutil/nstime.h"
 
 #include <wireshark_application.h>
 

diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index 96953f2938072da06751336543daeb185e479dd0..d34a35bb37beea61a4cb9feef00f9129d1e25395 100644 (file)
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -26,7 +26,7 @@
 #include <epan/epan_dissect.h>
 #include <epan/column_info.h>
 #include <epan/column.h>
-#include <epan/nstime.h>
+#include <wsutil/nstime.h>
 #include <epan/prefs.h>
 
 #include "color.h"

diff --git a/ui/time_shift.h b/ui/time_shift.h
index bedc353bf43edda2e65ba753498eb4e5986ee418..d1bbebde92a937be29db47a86902b43cf44fdd18 100644 (file)
--- a/ui/time_shift.h
+++ b/ui/time_shift.h
@@ -26,7 +26,7 @@
 #define __TIME_SHIFT_H__
 
 #include "cfile.h"
-#include <epan/nstime.h>
+#include <wsutil/nstime.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 94a21830829be9ba6a31d167dca04bd4d4600955..97da38cbc575b02608eae809cd6752e358801abb 100644 (file)
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -47,8 +47,10 @@ set(WSUTIL_FILES
   crc11.c
   crcdrm.c
   mpeg-audio.c
+  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 570dbe60daa0eea125a0b6e1682fd38852de1da3..712c6c84489d57e0396afb7a4ec28cfcc8bab834 100644 (file)
--- a/wsutil/Makefile.common
+++ b/wsutil/Makefile.common
@@ -41,8 +41,10 @@ LIBWSUTIL_SRC =      \
        crc32.c         \
        crcdrm.c        \
        mpeg-audio.c    \
+       nstime.c        \
        privileges.c    \
        str_util.c      \
+       timestats.c     \
        type_util.c
 
 # Header files that are not generated from other files
@@ -58,6 +60,8 @@ LIBWSUTIL_INCLUDES =  \
        crc32.h         \
        crcdrm.h        \
        mpeg-audio.h    \
+       nstime.h        \
        privileges.h    \
        str_util.h      \
+       timestats.h     \
        type_util.h

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

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

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

diff --git a/timestats.h b/wsutil/timestats.h
similarity index 85%
rename from timestats.h
rename to wsutil/timestats.h
index b67ea3f8be64931d11dedca8b02f20bfda7c6e22..81e6d970426704629e7db3a627556a2ccd8e173e 100644 (file)
--- a/timestats.h
+++ b/wsutil/timestats.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include "epan/packet_info.h"
-#include "epan/nstime.h"
+#include "nstime.h"
 
  /* Summary of time statistics*/
 typedef struct _timestat_t {
@@ -44,11 +44,11 @@ typedef struct _timestat_t {
 /* functions */
 
 /* Initialize a timestat_t struct */
-extern void time_stat_init(timestat_t *stats);
+WS_DLL_PUBLIC void time_stat_init(timestat_t *stats);
 
 /* Update a timestat_t struct with a new sample */
-extern void time_stat_update(timestat_t *stats, const nstime_t *delta, packet_info *pinfo);
+WS_DLL_PUBLIC void time_stat_update(timestat_t *stats, const nstime_t *delta, packet_info *pinfo);
 
-extern gdouble get_average(const nstime_t *sum, guint32 num);
+WS_DLL_PUBLIC gdouble get_average(const nstime_t *sum, guint32 num);
 
 #endif