diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-01-23 19:40:51 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-01-24 03:41:28 +0000 |
| commit | bc5a0374bfd162d08834f5f7503bebd33d8ec943 (patch) | |
| tree | 6d5be93a3e35c6eb144ce6d2b1d95650b5cbbd86 /epan/packet.c | |
| parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
Add the packet number to the packet_info structure, and use it.
That removes most of the uses of the frame number field in the
frame_data structure.
Change-Id: Ie22e4533e87f8360d7c0a61ca6ffb796cc233f22
Reviewed-on: https://code.wireshark.org/review/13509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/packet.c b/epan/packet.c index fda35e95db..90f417006a 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -384,7 +384,7 @@ void mark_frame_as_depended_upon(packet_info *pinfo, guint32 frame_num) { /* Don't mark a frame as dependent on itself */ - if (frame_num != PINFO_FD_NUM(pinfo)) { + if (frame_num != pinfo->num) { pinfo->dependent_frames = g_slist_prepend(pinfo->dependent_frames, GUINT_TO_POINTER(frame_num)); } } @@ -462,6 +462,7 @@ dissect_record(epan_dissect_t *edt, int file_type_subtype, edt->pi.current_proto = "<Missing Protocol Name>"; edt->pi.cinfo = cinfo; edt->pi.presence_flags = 0; + edt->pi.num = fd->num; if (fd->flags.has_ts) { edt->pi.presence_flags |= PINFO_HAS_TS; edt->pi.abs_ts = fd->abs_ts; |