diff options
author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-30 23:14:09 +0000 |
---|---|---|
committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2013-07-30 23:14:09 +0000 |
commit | 9bb17b7b2b62c56349f7893f6db4bec0b71fc9c8 (patch) | |
tree | f5aa723966ba22645160f1dbb5715d028efad449 /file.c | |
parent | 564c6234fca693005c975e3e70625007baeac7b0 (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 'file.c')
-rw-r--r-- | file.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -3996,9 +3996,9 @@ save_packet(capture_file *cf _U_, frame_data *fdata, hdr.presence_flags = 0; if (fdata->flags.has_ts) hdr.presence_flags |= WTAP_HAS_TS; - if (fdata->flags.has_if_id) + if (phdr->presence_flags & WTAP_HAS_INTERFACE_ID) hdr.presence_flags |= WTAP_HAS_INTERFACE_ID; - if (fdata->flags.has_pack_flags) + if (phdr->presence_flags & WTAP_HAS_PACK_FLAGS) hdr.presence_flags |= WTAP_HAS_PACK_FLAGS; hdr.ts.secs = fdata->abs_ts.secs; hdr.ts.nsecs = fdata->abs_ts.nsecs; @@ -4006,9 +4006,9 @@ save_packet(capture_file *cf _U_, frame_data *fdata, hdr.len = fdata->pkt_len; hdr.pkt_encap = fdata->lnk_t; /* pcapng */ - hdr.interface_id = fdata->interface_id; /* identifier of the interface. */ + hdr.interface_id = phdr->interface_id; /* identifier of the interface. */ /* options */ - hdr.pack_flags = fdata->pack_flags; + hdr.pack_flags = phdr->pack_flags; hdr.opt_comment = fdata->opt_comment; /* NULL if not available */ /* pseudo */ hdr.pseudo_header = phdr->pseudo_header; |