From bc5a0374bfd162d08834f5f7503bebd33d8ec943 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sat, 23 Jan 2016 19:40:51 -0800 Subject: 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 --- epan/dissectors/packet-synphasor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-synphasor.c') diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c index be7694fdd9..0a1d92552b 100644 --- a/epan/dissectors/packet-synphasor.c +++ b/epan/dissectors/packet-synphasor.c @@ -495,7 +495,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v /* fill the config_frame */ config_frame *frame = config_frame_fast(tvb); - frame->fnum = pinfo->fd->num; + frame->fnum = pinfo->num; /* find a conversation, create a new one if none exists */ conversation = find_or_create_conversation(pinfo); @@ -508,7 +508,7 @@ static int dissect_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v conversation_add_proto_data(conversation, proto_synphasor, frame); } else if (DATA == frame_type) { - conversation_t *conversation = find_conversation(pinfo->fd->num, + conversation_t *conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, -- cgit v1.2.3