aboutsummaryrefslogtreecommitdiffstats
path: root/epan/frame_data.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-07-30 23:14:09 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-07-30 23:14:09 +0000
commit9bb17b7b2b62c56349f7893f6db4bec0b71fc9c8 (patch)
treef5aa723966ba22645160f1dbb5715d028efad449 /epan/frame_data.c
parent564c6234fca693005c975e3e70625007baeac7b0 (diff)
Remove interface_id, pack_flags from frame_data structure.
This patch assumes that wtap_phdr interface_id, pack_flags both from initial read and seek read will contain same values. Please fix if it's not. svn path=/trunk/; revision=51041
Diffstat (limited to 'epan/frame_data.c')
-rw-r--r--epan/frame_data.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/epan/frame_data.c b/epan/frame_data.c
index c2cbed7b50..a7d66c73bf 100644
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -263,7 +263,6 @@ frame_data_init(frame_data *fdata, guint32 num,
{
fdata->pfd = NULL;
fdata->num = num;
- fdata->interface_id = phdr->interface_id;
fdata->pkt_len = phdr->len;
fdata->cum_bytes = cum_bytes + phdr->len;
fdata->cap_len = phdr->caplen;
@@ -272,7 +271,6 @@ frame_data_init(frame_data *fdata, guint32 num,
/* To save some memory, we coerce it into a gint16 */
g_assert(phdr->pkt_encap <= G_MAXINT16);
fdata->lnk_t = (gint16) phdr->pkt_encap;
- fdata->pack_flags = phdr->pack_flags;
fdata->flags.passed_dfilter = 0;
fdata->flags.dependent_of_displayed = 0;
fdata->flags.encoding = PACKET_CHAR_ENC_CHAR_ASCII;
@@ -281,8 +279,6 @@ frame_data_init(frame_data *fdata, guint32 num,
fdata->flags.ref_time = 0;
fdata->flags.ignored = 0;
fdata->flags.has_ts = (phdr->presence_flags & WTAP_HAS_TS) ? 1 : 0;
- fdata->flags.has_if_id = (phdr->presence_flags & WTAP_HAS_INTERFACE_ID) ? 1 : 0;
- fdata->flags.has_pack_flags = (phdr->presence_flags & WTAP_HAS_PACK_FLAGS) ? 1 : 0;
fdata->color_filter = NULL;
fdata->abs_ts.secs = phdr->ts.secs;
fdata->abs_ts.nsecs = phdr->ts.nsecs;