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-fcfcs.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-fcfcs.c')
| -rw-r--r-- | epan/dissectors/packet-fcfcs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c index 14956e8348..614f3853e2 100644 --- a/epan/dissectors/packet-fcfcs.c +++ b/epan/dissectors/packet-fcfcs.c @@ -729,11 +729,11 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) cthdr.maxres_size = g_ntohs (cthdr.maxres_size); if ((opcode != FCCT_MSG_ACC) && (opcode != FCCT_MSG_RJT)) { - 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, NO_PORT2); if (!conversation) { - conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst, + conversation = conversation_new (pinfo->num, &pinfo->src, &pinfo->dst, pinfo->ptype, fchdr->oxid, fchdr->rxid, NO_PORT2); } @@ -763,7 +763,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) } else { /* Opcode is ACC or RJT */ - 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, NO_PORT2); isreq = 0; |