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. svn path=/trunk/; revision=11890
This commit is contained in:
parent
dfad2b94f5
commit
478ba9a691
|
@ -86,7 +86,6 @@ ETHEREAL_COMMON_SRC = \
|
||||||
pcap-util.c \
|
pcap-util.c \
|
||||||
print.c \
|
print.c \
|
||||||
ps.c \
|
ps.c \
|
||||||
range.c \
|
|
||||||
ringbuffer.c \
|
ringbuffer.c \
|
||||||
timestats.c \
|
timestats.c \
|
||||||
version_info.c
|
version_info.c
|
||||||
|
@ -105,7 +104,6 @@ ETHEREAL_COMMON_INCLUDES = \
|
||||||
pcap-util-int.h \
|
pcap-util-int.h \
|
||||||
print.h \
|
print.h \
|
||||||
ps.h \
|
ps.h \
|
||||||
range.h \
|
|
||||||
register.h \
|
register.h \
|
||||||
ringbuffer.h \
|
ringbuffer.h \
|
||||||
timestats.h \
|
timestats.h \
|
||||||
|
|
|
@ -38,6 +38,7 @@ LIBETHEREAL_SRC = \
|
||||||
ipv4.c \
|
ipv4.c \
|
||||||
osi-utils.c \
|
osi-utils.c \
|
||||||
packet.c \
|
packet.c \
|
||||||
|
packet-range.c \
|
||||||
plugins.c \
|
plugins.c \
|
||||||
proto.c \
|
proto.c \
|
||||||
sna-utils.c \
|
sna-utils.c \
|
||||||
|
@ -69,6 +70,7 @@ LIBETHEREAL_INCLUDES = \
|
||||||
nstime.h \
|
nstime.h \
|
||||||
osi-utils.h \
|
osi-utils.h \
|
||||||
packet.h \
|
packet.h \
|
||||||
|
packet-range.h \
|
||||||
packet_info.h \
|
packet_info.h \
|
||||||
pint.h \
|
pint.h \
|
||||||
plugins.h \
|
plugins.h \
|
||||||
|
|
|
@ -308,6 +308,11 @@ new_register_dissector
|
||||||
nt_cmd_vals DATA
|
nt_cmd_vals DATA
|
||||||
num_tap_filters DATA
|
num_tap_filters DATA
|
||||||
num_tree_types 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
|
plugin_list DATA
|
||||||
postseq_cleanup_all_protocols
|
postseq_cleanup_all_protocols
|
||||||
prefs DATA
|
prefs DATA
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* range.c
|
/* packet-range.c
|
||||||
* Packet range routines (save, print, ...)
|
* Packet range routines (save, print, ...)
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
|
@ -36,8 +36,7 @@
|
||||||
|
|
||||||
#include <epan/frame_data.h>
|
#include <epan/frame_data.h>
|
||||||
|
|
||||||
|
#include <epan/packet-range.h>
|
||||||
#include "range.h"
|
|
||||||
|
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* range.h
|
/* packet-range.h
|
||||||
* Packet range routines (save, print, ...)
|
* Packet range routines (save, print, ...)
|
||||||
*
|
*
|
||||||
* $Id$
|
* $Id$
|
||||||
|
@ -25,8 +25,8 @@
|
||||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __PRINT_RANGE_H__
|
#ifndef __PACKET_RANGE_H__
|
||||||
#define __PRINT_RANGE_H__
|
#define __PACKET_RANGE_H__
|
||||||
|
|
||||||
#include <glib.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);
|
extern void packet_range_convert_str(packet_range_t *range, const gchar *es);
|
||||||
|
|
||||||
|
|
||||||
#endif /* __PRINT_RANGE_H__ */
|
#endif /* __PACKET_RANGE_H__ */
|
2
file.c
2
file.c
|
@ -70,7 +70,7 @@
|
||||||
#include "color_filters.h"
|
#include "color_filters.h"
|
||||||
#include "column.h"
|
#include "column.h"
|
||||||
#include <epan/packet.h>
|
#include <epan/packet.h>
|
||||||
#include "range.h"
|
#include <epan/packet-range.h>
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
#include "file.h"
|
#include "file.h"
|
||||||
#include "menu.h"
|
#include "menu.h"
|
||||||
|
|
2
file.h
2
file.h
|
@ -25,7 +25,7 @@
|
||||||
#ifndef __FILE_H__
|
#ifndef __FILE_H__
|
||||||
#define __FILE_H__
|
#define __FILE_H__
|
||||||
|
|
||||||
#include "range.h"
|
#include <epan/packet-range.h>
|
||||||
#include "wiretap/wtap.h"
|
#include "wiretap/wtap.h"
|
||||||
#include <epan/dfilter/dfilter.h>
|
#include <epan/dfilter/dfilter.h>
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
#include "range.h"
|
#include <epan/packet-range.h>
|
||||||
#include <epan/filesystem.h>
|
#include <epan/filesystem.h>
|
||||||
|
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
||||||
#include "range.h"
|
#include <epan/packet-range.h>
|
||||||
#include "ui_util.h"
|
#include "ui_util.h"
|
||||||
#include "dlg_utils.h"
|
#include "dlg_utils.h"
|
||||||
#include "compat_macros.h"
|
#include "compat_macros.h"
|
||||||
|
|
2
print.c
2
print.c
|
@ -39,8 +39,8 @@
|
||||||
#include <epan/epan_dissect.h>
|
#include <epan/epan_dissect.h>
|
||||||
#include <epan/tvbuff.h>
|
#include <epan/tvbuff.h>
|
||||||
#include <epan/packet.h>
|
#include <epan/packet.h>
|
||||||
|
#include <epan/packet-range.h>
|
||||||
|
|
||||||
#include "range.h"
|
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
#include "ps.h"
|
#include "ps.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
Loading…
Reference in New Issue