The packet range stuff knows about capture_file structures, so it's
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 4 Sep 2004 20:02:11 +0000 (20:02 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 4 Sep 2004 20:02:11 +0000 (20:02 +0000)
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.)

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

Makefile.common
epan/Makefile.common
epan/libethereal.def
file.c
file.h
gtk/file_dlg.c
gtk/range_utils.c
packet-range.c [moved from epan/packet-range.c with 99% similarity]
packet-range.h [moved from epan/packet-range.h with 100% similarity]
print.c
print.h

index 1d3207cf3405d5e2beb88182a925c42d28fc837d..711620859107373337805e080a5ce9d49e3ab852 100644 (file)
@@ -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 \
index fe3467f00ef7635289919a9c6e10f3bf89841726..a399dd1d40a37f066b5af492b8797f70aa7ebb66 100644 (file)
@@ -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               \
index 0f9865596da4aef5098b78ce19a717ed195574bf..d360cbebceeee71ca42daed63e07d44b092dab00 100644 (file)
@@ -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 f817fbd60c2fd6c383d3a08684808a00f4deb9ff..f4f2decf3fe7f9511e0e5585198dd81461b6c885 100644 (file)
--- 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 7509e1dd10c11a040662a972463b915cf1d00bcd..1078b2dd515c6eefa44c50a4135563ab8e6859b5 100644 (file)
--- 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"
index 8584acc2fe4c81540eba529571f044be88d82b95..da570fe763e9d6c792515dfc3acfd9cf1239160c 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include <epan/packet-range.h>
+#include "packet-range.h"
 #include <epan/filesystem.h>
 
 #include "globals.h"
index b924c0e7727072baf8dd7e2f77b5208fab76ef40..824635d000e74a87f7c3f6f692e99cf7093f632c 100644 (file)
@@ -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"
similarity index 99%
rename from epan/packet-range.c
rename to packet-range.c
index c88717e9666216a77a4ab689796ba0429de736d3..10a2529d726e1580aa78d8539f9e84263a27172b 100644 (file)
 
 #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;
similarity index 100%
rename from epan/packet-range.h
rename to packet-range.h
diff --git a/print.c b/print.c
index e36b09e4ba614151252c325999a5d6f928bc4ea4..660791e2bb988c8757a420efb8904225bddcb01b 100644 (file)
--- 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 4d32a7a42f092b8aff2fd1c1fc73e560a294dd1f..a0871fb47b2060be9ba3fc3e4dbb831c7335c897 100644 (file)
--- 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.