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-iser.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-iser.c')
-rw-r--r-- | epan/dissectors/packet-iser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-iser.c b/epan/dissectors/packet-iser.c index eee5be583e..5dc88df529 100644 --- a/epan/dissectors/packet-iser.c +++ b/epan/dissectors/packet-iser.c @@ -258,14 +258,14 @@ dissect_iser(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* first try to find a conversation between the two current hosts. in most cases this will not work since we do not have the source QP. this WILL succeed when we're still in the process of CM negotiations */ - conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->src, &pinfo->dst, PT_IBQP, pinfo->srcport, pinfo->destport, 0); if (!conv) { /* if not, try to find an established RC channel. recall Infiniband conversations are registered with one side of the channel. since the packet is only guaranteed to contain the qpn of the destination, we'll use this */ - conv = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->dst, + conv = find_conversation(pinfo->num, &pinfo->dst, &pinfo->dst, PT_IBQP, pinfo->destport, pinfo->destport, NO_ADDR_B|NO_PORT_B); if (!conv) |