Rename "range.c" and "range.h" to "packet-range.c" and "packet-range.h";

they should ultimately be split into files with routines that handle
ranges, which are just subsets of [0,2^32), and packet ranges, which are
subsets of the packet list, possibly specified by a range.

Move them into epan, so they can be used by, for example, utilities that
handle ranges, such editcap.

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

diff --git a/Makefile.common b/Makefile.common
index f3433a950e1c45ecf9c51e910a32f949d161e936..1d3207cf3405d5e2beb88182a925c42d28fc837d 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -86,7 +86,6 @@ ETHEREAL_COMMON_SRC = \
        pcap-util.c     \
        print.c \
        ps.c    \
-       range.c \
        ringbuffer.c    \
        timestats.c     \
        version_info.c
@@ -105,7 +104,6 @@ ETHEREAL_COMMON_INCLUDES =  \
        pcap-util-int.h \
        print.h \
        ps.h    \
-       range.h \
        register.h      \
        ringbuffer.h    \
        timestats.h     \

diff --git a/epan/Makefile.common b/epan/Makefile.common
index b1da34b1a9480f2a2e9e4873b8c8388ed9d68435..8ebf9a803d1d9a2a2680214ede03d393995be2e8 100644 (file)
--- a/epan/Makefile.common
+++ b/epan/Makefile.common
@@ -38,6 +38,7 @@ LIBETHEREAL_SRC =             \
        ipv4.c                  \
        osi-utils.c             \
        packet.c                \
+       packet-range.c          \
        plugins.c               \
        proto.c                 \
        sna-utils.c             \
@@ -69,6 +70,7 @@ 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 2e3a456b6a735e606f1b23cfda9ac21c7e1ef2c5..d3296d03eeadfcf5b1c825b17719044a55cb9e2e 100644 (file)
--- a/epan/libethereal.def
+++ b/epan/libethereal.def
@@ -308,6 +308,11 @@ 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/range.c b/epan/packet-range.c
similarity index 99%
rename from range.c
rename to epan/packet-range.c
index d5d507b9020bc916467e271137fcfd9edcc51dd1..c786afb3f939301b667669a895b7ea1ea3a959fd 100644 (file)
--- a/range.c
+++ b/epan/packet-range.c
@@ -1,4 +1,4 @@
-/* range.c
+/* packet-range.c
  * Packet range routines (save, print, ...)
  *
  * $Id$
@@ -36,8 +36,7 @@
 
 #include <epan/frame_data.h>
 
-
-#include "range.h"
+#include <epan/packet-range.h>
 
 #include "globals.h"
 

diff --git a/range.h b/epan/packet-range.h
similarity index 97%
rename from range.h
rename to epan/packet-range.h
index fe13aa01f01add18627aac6c084cc13d3f41a919..24789c27435c00ea9a85cb5aa599f2022c29fa71 100644 (file)
--- a/range.h
+++ b/epan/packet-range.h
@@ -1,4 +1,4 @@
-/* range.h
+/* packet-range.h
  * Packet range routines (save, print, ...)
  *
  * $Id$
@@ -25,8 +25,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-#ifndef __PRINT_RANGE_H__
-#define __PRINT_RANGE_H__
+#ifndef __PACKET_RANGE_H__
+#define __PACKET_RANGE_H__
 
 #include <glib.h>
 
@@ -103,4 +103,4 @@ extern range_process_e packet_range_process_packet(packet_range_t *range, frame_
 extern void packet_range_convert_str(packet_range_t *range, const gchar *es);
 
 
-#endif /* __PRINT_RANGE_H__ */
+#endif /* __PACKET_RANGE_H__ */

diff --git a/file.c b/file.c
index 0524cf3a5e4fd90fa6be8528c8205f436b0c0c9e..f817fbd60c2fd6c383d3a08684808a00f4deb9ff 100644 (file)
--- a/file.c
+++ b/file.c
@@ -70,7 +70,7 @@
 #include "color_filters.h"
 #include "column.h"
 #include <epan/packet.h>
-#include "range.h"
+#include <epan/packet-range.h>
 #include "print.h"
 #include "file.h"
 #include "menu.h"

diff --git a/file.h b/file.h
index 10688b9fbbe67c6ef9f1e8fa3e1f5ef0f0075100..7509e1dd10c11a040662a972463b915cf1d00bcd 100644 (file)
--- a/file.h
+++ b/file.h
@@ -25,7 +25,7 @@
 #ifndef __FILE_H__
 #define __FILE_H__
 
-#include "range.h"
+#include <epan/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 9593e86b2f1bb5887706be6810352fd18d5b3d8f..8584acc2fe4c81540eba529571f044be88d82b95 100644 (file)
--- a/gtk/file_dlg.c
+++ b/gtk/file_dlg.c
@@ -30,7 +30,7 @@
 
 #include <gtk/gtk.h>
 
-#include "range.h"
+#include <epan/packet-range.h>
 #include <epan/filesystem.h>
 
 #include "globals.h"

diff --git a/gtk/range_utils.c b/gtk/range_utils.c
index 498d495cb8297acad088483f716e1a71cf7bd6a3..b924c0e7727072baf8dd7e2f77b5208fab76ef40 100644 (file)
--- a/gtk/range_utils.c
+++ b/gtk/range_utils.c
@@ -32,7 +32,7 @@
 
 #include "globals.h"
 
-#include "range.h"
+#include <epan/packet-range.h>
 #include "ui_util.h"
 #include "dlg_utils.h"
 #include "compat_macros.h"

diff --git a/print.c b/print.c
index 64a88fe15d10cf7b8588e29f6c386f552755025b..e36b09e4ba614151252c325999a5d6f928bc4ea4 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 "range.h"
 #include "print.h"
 #include "ps.h"
 #include "util.h"