The packet range stuff knows about capture_file structures, so it's

really more of an Ethereal/Tethereal component than a libethereal
component (nothing else in libethereal knows about capture files); move
it back out of libethereal.  (The range stuff doesn't; we leave it in
libethereal.)

svn path=/trunk/; revision=11898

11 files changed, 11 insertions, 14 deletions

diff --git a/Makefile.common b/Makefile.common
index 1d3207cf34..7116208591 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -83,6 +83,7 @@ ETHEREAL_COMMON_SRC =	\
 	cfile.c	\
 	conditions.c	\
 	disabled_protos.c	\
+	packet-range.c	\
 	pcap-util.c	\
 	print.c	\
 	ps.c	\
@@ -100,6 +101,7 @@ ETHEREAL_COMMON_INCLUDES =	\
 	conditions.h	\
 	disabled_protos.h	\
 	file.h	\
+	packet-range.h	\
 	pcap-util.h	\
 	pcap-util-int.h	\
 	print.h	\
diff --git a/epan/Makefile.common b/epan/Makefile.common
index fe3467f00e..a399dd1d40 100644
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -38,7 +38,6 @@ LIBETHEREAL_SRC = 		\
 	ipv4.c			\
 	osi-utils.c		\
 	packet.c		\
-	packet-range.c		\
 	plugins.c		\
 	proto.c			\
 	range.c			\
@@ -71,7 +70,6 @@ LIBETHEREAL_INCLUDES = 		\
 	nstime.h		\
 	osi-utils.h		\
 	packet.h		\
-	packet-range.h		\
 	packet_info.h		\
 	pint.h			\
 	plugins.h		\
diff --git a/epan/libethereal.def b/epan/libethereal.def
index 0f9865596d..d360cbebce 100644
--- a/epan/libethereal.def
+++ b/epan/libethereal.def
@@ -308,11 +308,6 @@ new_register_dissector
 nt_cmd_vals                     DATA
 num_tap_filters                 DATA
 num_tree_types                  DATA
-packet_range_convert_str
-packet_range_init
-packet_range_process_all
-packet_range_process_init
-packet_range_process_packet
 plugin_list                     DATA
 postseq_cleanup_all_protocols
 prefs                           DATA
diff --git a/file.c b/file.c
index f817fbd60c..f4f2decf3f 100644
--- a/file.c
+++ b/file.c
@@ -70,7 +70,7 @@
 #include "color_filters.h"
 #include "column.h"
 #include <epan/packet.h>
-#include <epan/packet-range.h>
+#include "packet-range.h"
 #include "print.h"
 #include "file.h"
 #include "menu.h"
diff --git a/file.h b/file.h
index 7509e1dd10..1078b2dd51 100644
--- a/file.h
+++ b/file.h
@@ -25,7 +25,7 @@
 #ifndef __FILE_H__
 #define __FILE_H__
 
-#include <epan/packet-range.h>
+#include "packet-range.h"
 #include "wiretap/wtap.h"
 #include <epan/dfilter/dfilter.h>
 #include "print.h"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index 8584acc2fe..da570fe763 100644
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/packet-range.h>
+#include "packet-range.h"
 #include <epan/filesystem.h>
 
 #include "globals.h"
diff --git a/gtk/range_utils.c b/gtk/range_utils.c
index b924c0e772..824635d000 100644
--- a/gtk/range_utils.c
+++ b/gtk/range_utils.c
@@ -32,7 +32,7 @@
 
 #include "globals.h"
 
-#include <epan/packet-range.h>
+#include "packet-range.h"
 #include "ui_util.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"
diff --git a/epan/packet-range.c b/packet-range.c
index c88717e966..10a2529d72 100644
--- a/epan/packet-range.c
+++ b/packet-range.c
@@ -36,10 +36,10 @@
 
 #include <epan/frame_data.h>
 
-#include <epan/packet-range.h>
-
 #include "globals.h"
 
+#include "packet-range.h"
+
 /* (re-)calculate the packet counts (except the user specified range) */
 void packet_range_calc(packet_range_t *range) {
   guint32       current_count;
diff --git a/epan/packet-range.h b/packet-range.h
index 3007d215c8..3007d215c8 100644
--- a/epan/packet-range.h
+++ b/packet-range.h
diff --git a/print.c b/print.c
index e36b09e4ba..660791e2bb 100644
--- a/print.c
+++ b/print.c
@@ -39,8 +39,8 @@
 #include <epan/epan_dissect.h>
 #include <epan/tvbuff.h>
 #include <epan/packet.h>
-#include <epan/packet-range.h>
 
+#include "packet-range.h"
 #include "print.h"
 #include "ps.h"
 #include "util.h"
diff --git a/print.h b/print.h
index 4d32a7a42f..a0871fb47b 100644
--- a/print.h
+++ b/print.h
@@ -29,6 +29,8 @@
 
 #include <epan/packet.h>
 
+#include "packet-range.h"
+
 /*
  * Print stream code; this provides a "print stream" class with subclasses
  * of various sorts.  Additional subclasses might be implemented elsewhere.