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/dissectors/packet-pcp.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/dissectors/packet-pcp.c')
| -rw-r--r-- | epan/dissectors/packet-pcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-pcp.c b/epan/dissectors/packet-pcp.c index f28ec7fb15..e1d9d6ff1c 100644 --- a/epan/dissectors/packet-pcp.c +++ b/epan/dissectors/packet-pcp.c @@ -506,8 +506,8 @@ static void mark_this_frame_as_last_pmns_names_frame(packet_info *pinfo) { pcp_conv_info_t *pcp_conv_info; pcp_conv_info = get_pcp_conversation_info(pinfo); - if(pinfo->fd->num > pcp_conv_info->last_pmns_names_frame) { - pcp_conv_info->last_pmns_names_frame = pinfo->fd->num; + if(pinfo->num > pcp_conv_info->last_pmns_names_frame) { + pcp_conv_info->last_pmns_names_frame = pinfo->num; } } @@ -569,7 +569,7 @@ static pcp_conv_info_t* get_pcp_conversation_info(packet_info *pinfo) { conversation_t *conversation; pcp_conv_info_t *pcp_conv_info; - conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); @@ -601,7 +601,7 @@ static int is_unvisited_pmns_names_frame(packet_info *pinfo) { pcp_conv_info = get_pcp_conversation_info(pinfo); - return pinfo->fd->num > pcp_conv_info->last_processed_pmns_names_frame && pinfo->fd->num > pcp_conv_info->last_pmns_names_frame; + return pinfo->num > pcp_conv_info->last_processed_pmns_names_frame && pinfo->num > pcp_conv_info->last_pmns_names_frame; } static void populate_pmids_to_names(packet_info *pinfo, tvbuff_t *tvb, int offset, guint32 num_ids) { |