Move some more modules into epan.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4961d9fb77ec05fbb4737f6ae5e60998678221e8..9acf063bdecc0fcbeb0016d801fae6e59f772e82 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -653,9 +653,7 @@ set(WIRESHARK_COMMON_SRC
        cfutils.c
        clopts_common.c
        disabled_protos.c
-       frame_data_sequence.c
        frame_tvbuff.c
-       packet-range.c
        print.c
        ps.c
        svnversion.h

diff --git a/Makefile.common b/Makefile.common
index ed439c26802935c296bce266fb09b3106b047ecc..6d189d0921febc57674a6bd82689db5f1c1a3aff 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -51,9 +51,7 @@ SHARK_COMMON_SRC =    \
        cfutils.c               \
        clopts_common.c         \
        disabled_protos.c       \
-       frame_data_sequence.c   \
        frame_tvbuff.c          \
-       packet-range.c          \
        print.c                 \
        ps.c                    \
        sync_pipe_write.c       \
@@ -72,10 +70,8 @@ SHARK_COMMON_INCLUDES =      \
        disabled_protos.h       \
        file.h                  \
        fileset.h               \
-       frame_data_sequence.h   \
        frame_tvbuff.h          \
        isprint.h               \
-       packet-range.h          \
        print.h                 \
        ps.h                    \
        register.h              \

diff --git a/cfile.h b/cfile.h
index f600850811c1a21d81d1c96f5bf5a6495356b5fb..f4f0890637f3d06fe47d4d6ea56c0d26d6e8eef4 100644 (file)
--- a/cfile.h
+++ b/cfile.h
@@ -27,7 +27,7 @@
 
 #include <epan/dfilter/dfilter.h>
 #include <epan/frame_data.h>
-#include "frame_data_sequence.h"
+#include <epan/frame_data_sequence.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index f4b73b21382d30dff0958a7f0033ddcb77535ce9..1e3678ba6c8b17cb3a7d1f25681eff1d58f234b7 100644 (file)
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1441,6 +1441,7 @@ set(LIBWIRESHARK_FILES
        filter_expressions.c
        follow.c
        frame_data.c
+       frame_data_sequence.c
        frequency-utils.c
        funnel.c
        gcp.c
@@ -1454,6 +1455,7 @@ set(LIBWIRESHARK_FILES
        next_tvb.c
        oids.c
        osi-utils.c
+       packet-range.c
        packet.c
        plugins.c
        prefs.c

diff --git a/epan/Makefile.common b/epan/Makefile.common
index 446bdead58f89561ce55e01377c4d393056ad257..3b93b38073ecc53d5d01203f92ed8257068c5e8e 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -54,6 +54,7 @@ LIBWIRESHARK_SRC =            \
        filter_expressions.c    \
        follow.c                \
        frame_data.c            \
+       frame_data_sequence.c   \
        frequency-utils.c       \
        funnel.c                \
        gcp.c                   \
@@ -67,6 +68,7 @@ LIBWIRESHARK_SRC =            \
        next_tvb.c              \
        oids.c                  \
        osi-utils.c             \
+       packet-range.c          \
        packet.c                \
        plugins.c               \
        prefs.c                 \
@@ -184,6 +186,7 @@ LIBWIRESHARK_INCLUDES =             \
        filesystem.h            \
        follow.h                \
        frame_data.h            \
+       frame_data_sequence.h   \
        frequency-utils.h       \
        funnel.h                \
        garrayfix.h             \
@@ -207,6 +210,7 @@ LIBWIRESHARK_INCLUDES =             \
        oids.h                  \
        osi-utils.h             \
        oui.h                   \
+       packet-range.h          \
        packet.h                \
        packet_info.h           \
        params.h                \

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

diff --git a/frame_data_sequence.h b/epan/frame_data_sequence.h
similarity index 78%
rename from frame_data_sequence.h
rename to epan/frame_data_sequence.h
index 43017fcc78bbf44ca22062d54fd769ab06dbace7..bf3611a16fd6eb4c23a717db528bd635fdd464b7 100644 (file)
--- a/frame_data_sequence.h
+++ b/epan/frame_data_sequence.h
@@ -31,23 +31,23 @@ extern "C" {
 
 typedef struct _frame_data_sequence frame_data_sequence;
 
-extern frame_data_sequence *new_frame_data_sequence(void);
+WS_DLL_PUBLIC frame_data_sequence *new_frame_data_sequence(void);
 
-extern frame_data *frame_data_sequence_add(frame_data_sequence *fds,
+WS_DLL_PUBLIC frame_data *frame_data_sequence_add(frame_data_sequence *fds,
     frame_data *fdata);
 
 /*
  * Find the frame_data for the specified frame number.
  */
-extern frame_data *frame_data_sequence_find(frame_data_sequence *fds,
+WS_DLL_PUBLIC frame_data *frame_data_sequence_find(frame_data_sequence *fds,
     guint32 num);
 
 /*
  * Free a frame_data_sequence and all the frame_data structures in it.
  */
-extern void free_frame_data_sequence(frame_data_sequence *fds);
+WS_DLL_PUBLIC void free_frame_data_sequence(frame_data_sequence *fds);
 
-extern void find_and_mark_frame_depended_upon(gpointer data, gpointer user_data);
+WS_DLL_PUBLIC void find_and_mark_frame_depended_upon(gpointer data, gpointer user_data);
 
 
 #ifdef __cplusplus

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

diff --git a/packet-range.h b/epan/packet-range.h
similarity index 89%
rename from packet-range.h
rename to epan/packet-range.h
index ac9cada687c9ace4c5c7c8bd47628d0cc63c3d03..a1e5d9337c35805ff2b31cd7943b5f2ba8277e04 100644 (file)
--- a/packet-range.h
+++ b/epan/packet-range.h
@@ -96,22 +96,22 @@ typedef enum {
 } range_process_e;
 
 /* init the range structure */
-extern void packet_range_init(packet_range_t *range, capture_file *cf);
+WS_DLL_PUBLIC void packet_range_init(packet_range_t *range, capture_file *cf);
 
 /* check whether the packet range is OK */
-extern convert_ret_t packet_range_check(packet_range_t *range);
+WS_DLL_PUBLIC convert_ret_t packet_range_check(packet_range_t *range);
 
 /* init the processing run */
-extern void packet_range_process_init(packet_range_t *range);
+WS_DLL_PUBLIC void packet_range_process_init(packet_range_t *range);
 
 /* do we have to process all packets? */
-extern gboolean packet_range_process_all(packet_range_t *range);
+WS_DLL_PUBLIC gboolean packet_range_process_all(packet_range_t *range);
 
 /* do we have to process this packet? */
-extern range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata);
+WS_DLL_PUBLIC range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata);
 
 /* convert user given string to the internal user specified range representation */
-extern void packet_range_convert_str(packet_range_t *range, const gchar *es);
+WS_DLL_PUBLIC void packet_range_convert_str(packet_range_t *range, const gchar *es);
 
 #ifdef __cplusplus
 }

diff --git a/file.c b/file.c
index bb09a9de929849163514f4b51bcae215eda5c1d5..40308b307de455a9f9d5979c1c400dad46207de9 100644 (file)
--- a/file.c
+++ b/file.c
@@ -51,7 +51,6 @@
 #include <epan/column.h>
 #include <epan/packet.h>
 #include <epan/column-utils.h>
-#include "packet-range.h"
 #include "print.h"
 #include "file.h"
 #include "fileset.h"

diff --git a/file.h b/file.h
index b1f20530f73d64f461f39730f2c1fafb177f6319..2bd4c051d7881fbf0e288edf19c6ad83a50a9a86 100644 (file)
--- a/file.h
+++ b/file.h
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <epan/epan.h>
 
-#include "packet-range.h"
+#include <epan/packet-range.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/print.c b/print.c
index fd6dde96830eeae1f2b96d2ef2d2e3989c9d369e..e1e134cb7c6ed3004d5202d582cb28edfbfbb67f 100644 (file)
--- a/print.c
+++ b/print.c
@@ -38,7 +38,7 @@
 #include <epan/emem.h>
 #include <epan/expert.h>
 
-#include "packet-range.h"
+#include <epan/packet-range.h>
 #include "print.h"
 #include "isprint.h"
 #include "ps.h"

diff --git a/print.h b/print.h
index 5011b00159c466ed5f91ae05c00f015c2dd51cd0..1667bdee931da43279c49fd7db06b9eabce27b56 100644 (file)
--- a/print.h
+++ b/print.h
@@ -31,7 +31,7 @@
 
 #include <epan/packet.h>
 
-#include "packet-range.h"
+#include <epan/packet-range.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/ui/gtk/capture_file_dlg.c b/ui/gtk/capture_file_dlg.c
index c85e4c302768fcb8c0063b2e7efe00c23951f11b..6d24dff82c7ce55458719422a04a748c133c6b91 100644 (file)
--- a/ui/gtk/capture_file_dlg.c
+++ b/ui/gtk/capture_file_dlg.c
@@ -36,7 +36,6 @@
 #include <epan/addr_resolv.h>
 #include <epan/prefs.h>
 
-#include "packet-range.h"
 #include "globals.h"
 #include "color.h"
 #include "color_filters.h"

diff --git a/ui/gtk/range_utils.c b/ui/gtk/range_utils.c
index 8a51a5bdc86298193b681745f595f59083f54e80..1a984e9be3fb8383a9e7a99c73b51ed5c1d78ba8 100644 (file)
--- a/ui/gtk/range_utils.c
+++ b/ui/gtk/range_utils.c
@@ -30,7 +30,7 @@
 
 #include "../globals.h"
 #include "ui/simple_dialog.h"
-#include "../packet-range.h"
+#include "epan/packet-range.h"
 
 #include "ui/gtk/gui_utils.h"
 #include "ui/gtk/dlg_utils.h"

diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp
index 963c2002faf8d27d6068fa8b9412fa372bbfd7f4..8c7ffcca509a158c693b58c2f605fd2dd244f1eb 100644 (file)
--- a/ui/qt/column_preferences_frame.cpp
+++ b/ui/qt/column_preferences_frame.cpp
@@ -26,7 +26,6 @@
 #include <glib.h>
 
 #include "color.h"
-#include "packet-range.h"
 
 #include <epan/column_info.h>
 #include <epan/column.h>

diff --git a/ui/qt/module_preferences_scroll_area.h b/ui/qt/module_preferences_scroll_area.h
index f5be4c7c1b8d820e0f68777a3a41ee8f14661cd3..897e558276a915cee160e4ac7e1870275e84abc5 100644 (file)
--- a/ui/qt/module_preferences_scroll_area.h
+++ b/ui/qt/module_preferences_scroll_area.h
@@ -29,7 +29,6 @@
 #include <glib.h>
 
 #include "color.h"
-#include "packet-range.h"
 
 #include <epan/prefs.h>
 

diff --git a/ui/qt/packet_range_group_box.h b/ui/qt/packet_range_group_box.h
index 9d874dea33c24fd8ee1080366697b79b42fcf323..371d63dca21287a7d610268704c3535e96d43e77 100644 (file)
--- a/ui/qt/packet_range_group_box.h
+++ b/ui/qt/packet_range_group_box.h
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 
-#include "packet-range.h"
+#include "epan/packet-range.h"
 
 #include "syntax_line_edit.h"
 #include <QGroupBox>

diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h
index 6c9702bea88ede92da4361691d15433f5c3c3b02..445081b1968e6d136c8042b9f8639ba6bf2f0a04 100644 (file)
--- a/ui/qt/preferences_dialog.h
+++ b/ui/qt/preferences_dialog.h
@@ -29,7 +29,6 @@
 #include <glib.h>
 
 #include "color.h"
-#include "packet-range.h"
 
 #include <epan/prefs.h>