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-fcels.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-fcels.c')
| -rw-r--r-- | epan/dissectors/packet-fcels.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c index e7e4e55e11..d6c883807b 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1882,12 +1882,12 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) else { options = NO_PORT2; } - conversation = find_conversation (pinfo->fd->num, &pinfo->dst, &pinfo->src, + conversation = find_conversation (pinfo->num, &pinfo->dst, &pinfo->src, pinfo->ptype, fchdr->oxid, fchdr->rxid, options); if (!conversation) { - conversation = conversation_new (pinfo->fd->num, &pinfo->dst, &pinfo->src, + conversation = conversation_new (pinfo->num, &pinfo->dst, &pinfo->src, pinfo->ptype, fchdr->oxid, fchdr->rxid, options); } @@ -1917,7 +1917,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) isreq = FC_ELS_RPLY; options = NO_PORT2; - conversation = find_conversation (pinfo->fd->num, &pinfo->dst, &pinfo->src, + conversation = find_conversation (pinfo->num, &pinfo->dst, &pinfo->src, pinfo->ptype, fchdr->oxid, fchdr->rxid, options); if (!conversation) { @@ -1939,7 +1939,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) addrdata[0] = addrdata[1] = 0; addrdata[2] = dstfc[2]; set_address (&dstaddr, AT_FC, 3, addrdata); - conversation = find_conversation (pinfo->fd->num, &dstaddr, &pinfo->src, + conversation = find_conversation (pinfo->num, &dstaddr, &pinfo->src, pinfo->ptype, fchdr->oxid, fchdr->rxid, options); } @@ -1947,7 +1947,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) if (!conversation) { /* Finally check for FLOGI with both NO_PORT2 and NO_ADDR2 set */ options = NO_ADDR2 | NO_PORT2; - conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = find_conversation (pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, fchdr->oxid, fchdr->rxid, options); if (!conversation) { |