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-fcsb3.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-fcsb3.c')
| -rw-r--r-- | epan/dissectors/packet-fcsb3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 363046fa17..2c538a64a7 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -780,7 +780,7 @@ static void dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo, } /* Retrieve conversation state to determine expected payload */ - conversation = find_conversation (&pinfo->src, &pinfo->dst, + conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_SBCCS, ch_cu_id, dev_addr, 0); if (conversation) { @@ -791,7 +791,7 @@ static void dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo, } else if ((type == FC_SBCCS_IU_CMD_HDR) || (type != FC_SBCCS_IU_CMD_DATA)) { - conversation = conversation_new (&pinfo->src, &pinfo->dst, + conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_SBCCS, ch_cu_id, dev_addr, 0); task_key.conv_id = conversation->index; task_key.task_id = ccw; |