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
This commit is contained in:
parent
0912b731c3
commit
f06c1b5fb0
|
@ -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 \
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
2
file.c
2
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"
|
||||
|
|
2
file.h
2
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"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#include <epan/packet-range.h>
|
||||
#include "packet-range.h"
|
||||
#include <epan/filesystem.h>
|
||||
|
||||
#include "globals.h"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
2
print.c
2
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"
|
||||
|
|
Loading…
Reference in New Issue