diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-10-05 18:52:42 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-10-05 18:52:42 +0000 |
commit | 71ed773862716ff3a4def1884fa1d7f427f1ea47 (patch) | |
tree | a64d5aa615db95e124d5d0a94c12c70e9d82997a /packet-range.h | |
parent | dec2d034b0d4465e3c43f3a05350d9ceff06a5c1 (diff) |
Add a capture_file * element to packet_range_t and pass it explicitly in
packet_range_init(). Get rid of global cfile references in
packet-range.c. C++-ize packet-range.h. Shuffle some includes around.
svn path=/trunk/; revision=45333
Diffstat (limited to 'packet-range.h')
-rw-r--r-- | packet-range.h | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/packet-range.h b/packet-range.h index 451931c6ea..ac9cada687 100644 --- a/packet-range.h +++ b/packet-range.h @@ -28,12 +28,17 @@ #ifndef __PACKET_RANGE_H__ #define __PACKET_RANGE_H__ -#include <glib.h> +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ -#include <epan/frame_data.h> +#include <glib.h> #include <epan/range.h> +#include "cfile.h" + + extern guint32 curr_selected_frame; typedef enum { @@ -59,14 +64,13 @@ typedef struct packet_range_tag { guint32 selected_packet; /* the currently selected packet */ /* current packet counts (captured) */ - /* cfile.count */ /* packets in capture file */ - /* cfile.marked_count */ /* packets marked */ - guint32 mark_range_cnt; /* packets in marked range */ - guint32 user_range_cnt; /* packets in user specified range */ - guint32 ignored_cnt; /* packets ignored */ - guint32 ignored_marked_cnt; /* packets ignored and marked */ - guint32 ignored_mark_range_cnt;/* packets ignored in marked range */ - guint32 ignored_user_range_cnt;/* packets ignored in user specified range */ + capture_file *cf; /* Associated capture file. */ + guint32 mark_range_cnt; /* packets in marked range */ + guint32 user_range_cnt; /* packets in user specified range */ + guint32 ignored_cnt; /* packets ignored */ + guint32 ignored_marked_cnt; /* packets ignored and marked */ + guint32 ignored_mark_range_cnt; /* packets ignored in marked range */ + guint32 ignored_user_range_cnt; /* packets ignored in user specified range */ /* current packet counts (displayed) */ guint32 displayed_cnt; @@ -92,7 +96,7 @@ typedef enum { } range_process_e; /* init the range structure */ -extern void packet_range_init(packet_range_t *range); +extern void packet_range_init(packet_range_t *range, capture_file *cf); /* check whether the packet range is OK */ extern convert_ret_t packet_range_check(packet_range_t *range); @@ -109,4 +113,8 @@ extern range_process_e packet_range_process_packet(packet_range_t *range, frame_ /* convert user given string to the internal user specified range representation */ extern void packet_range_convert_str(packet_range_t *range, const gchar *es); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + #endif /* __PACKET_RANGE_H__ */ |