diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-02-02 20:07:03 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-02-02 20:07:03 +0000 |
| commit | 851ecd2ac41b2aba59fc20a3ef3b6e49ce117798 (patch) | |
| tree | b7a41a2d4d3ffe7bd349658b292b59f46f86939b /epan/dissectors/packet-fcels.c | |
| parent | 93ea4470f0850361f4f5105313db6e08250c0508 (diff) | |
From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image
are present, and T.38 conversation if only m=image is present. I expect that
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38
packets.
svn path=/trunk/; revision=13243
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 d3c54c2960..8b1ae55c37 100644 --- a/epan/dissectors/packet-fcels.c +++ b/epan/dissectors/packet-fcels.c @@ -1531,12 +1531,12 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { options = NO_PORT2; } - conversation = find_conversation (&pinfo->dst, &pinfo->src, + conversation = find_conversation (pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, pinfo->oxid, pinfo->rxid, options); if (!conversation) { - conversation = conversation_new (&pinfo->dst, &pinfo->src, + conversation = conversation_new (pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, pinfo->oxid, pinfo->rxid, options); } @@ -1566,7 +1566,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) isreq = FC_ELS_RPLY; options = NO_PORT2; - conversation = find_conversation (&pinfo->dst, &pinfo->src, + conversation = find_conversation (pinfo->fd->num, &pinfo->dst, &pinfo->src, pinfo->ptype, pinfo->oxid, pinfo->rxid, options); if (!conversation) { @@ -1576,7 +1576,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) addrdata[0] = addrdata[1] = 0; addrdata[2] = pinfo->dst.data[2]; SET_ADDRESS (&dstaddr, AT_FC, 3, addrdata); - conversation = find_conversation (&dstaddr, &pinfo->src, + conversation = find_conversation (pinfo->fd->num, &dstaddr, &pinfo->src, pinfo->ptype, pinfo->oxid, pinfo->rxid, options); } @@ -1584,7 +1584,7 @@ dissect_fcels (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (!conversation) { /* Finally check for FLOGI with both NO_PORT2 and NO_ADDR2 set */ options = NO_ADDR2 | NO_PORT2; - conversation = find_conversation (&pinfo->src, &pinfo->dst, + conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->oxid, pinfo->rxid, options); if (!conversation) { |