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-rtsp.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-rtsp.c')
-rw-r--r-- | epan/dissectors/packet-rtsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c index a6181762b0..78b7d38e0a 100644 --- a/epan/dissectors/packet-rtsp.c +++ b/epan/dissectors/packet-rtsp.c @@ -233,7 +233,7 @@ dissect_rtspinterleaved(tvbuff_t *tvb, int offset, packet_info *pinfo, length_remaining = rf_len; next_tvb = tvb_new_subset(tvb, offset, length_remaining, rf_len); - conv = find_conversation(&pinfo->src, &pinfo->dst, pinfo->ptype, + conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (conv && @@ -410,10 +410,10 @@ rtsp_create_conversation(packet_info *pinfo, const guchar *line_begin, pinfo->fd->num); return; } - conv = find_conversation(&pinfo->src, &pinfo->dst, pinfo->ptype, + conv = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if (!conv) { - conv = conversation_new(&pinfo->src, &pinfo->dst, + conv = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } |