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/conversation.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/conversation.c')
| -rw-r--r-- | epan/conversation.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/conversation.c b/epan/conversation.c index b6912e7689..9357f0e9ed 100644 --- a/epan/conversation.c +++ b/epan/conversation.c @@ -1312,12 +1312,12 @@ try_conversation_dissector(const address *addr_a, const address *addr_b, const p { conversation_t *conversation; - conversation = find_conversation(pinfo->fd->num, addr_a, addr_b, ptype, port_a, + conversation = find_conversation(pinfo->num, addr_a, addr_b, ptype, port_a, port_b, 0); if (conversation != NULL) { int ret; - dissector_handle_t handle = (dissector_handle_t)wmem_tree_lookup32_le(conversation->dissector_tree, pinfo->fd->num); + dissector_handle_t handle = (dissector_handle_t)wmem_tree_lookup32_le(conversation->dissector_tree, pinfo->num); if (handle == NULL) return FALSE; ret=call_dissector_only(handle, tvb, pinfo, tree, data); @@ -1345,25 +1345,25 @@ find_or_create_conversation(packet_info *pinfo) conversation_t *conv=NULL; DPRINT(("called for frame #%d: %s:%d -> %s:%d (ptype=%d)", - pinfo->fd->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, + pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, pinfo->ptype)); DINDENT(); /* Have we seen this conversation before? */ - if((conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + if((conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0)) != NULL) { DPRINT(("found previous conversation for frame #%d (last_frame=%d)", - pinfo->fd->num, conv->last_frame)); - if (pinfo->fd->num > conv->last_frame) { - conv->last_frame = pinfo->fd->num; + pinfo->num, conv->last_frame)); + if (pinfo->num > conv->last_frame) { + conv->last_frame = pinfo->num; } } else { /* No, this is a new conversation. */ DPRINT(("did not find previous conversation for frame #%d", - pinfo->fd->num)); + pinfo->num)); DINDENT(); - conv = conversation_new(pinfo->fd->num, &pinfo->src, + conv = conversation_new(pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); DENDENT(); |