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 /plugins/ethercat | |
parent | baea677290f84d4e30e86194c79bafef0fdc1ad2 (diff) | |
download | wireshark-bc5a0374bfd162d08834f5f7503bebd33d8ec943.tar.gz |
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 'plugins/ethercat')
-rw-r--r-- | plugins/ethercat/packet-esl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ethercat/packet-esl.c b/plugins/ethercat/packet-esl.c index df96742717..aed683517c 100644 --- a/plugins/ethercat/packet-esl.c +++ b/plugins/ethercat/packet-esl.c @@ -229,7 +229,7 @@ static void modify_times(tvbuff_t *tvb, gint offset, packet_info *pinfo) { ref_time_frame.esl_ts = tvb_get_letoh64(tvb, offset+8); ref_time_frame.fd = pinfo->fd; - ref_time_frame.num = pinfo->fd->num; + ref_time_frame.num = pinfo->num; ref_time_frame.abs_ts = pinfo->abs_ts; } else if ( !pinfo->fd->flags.visited ) @@ -268,7 +268,7 @@ dissect_esl_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data in_heur = TRUE; /*TRY */ { - if ( ref_time_frame.fd != NULL && !pinfo->fd->flags.visited && pinfo->fd->num <= ref_time_frame.num ) + if ( ref_time_frame.fd != NULL && !pinfo->fd->flags.visited && pinfo->num <= ref_time_frame.num ) ref_time_frame.fd = NULL; /* Check that there's enough data */ |