diff options
| author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-02-02 20:07:03 +0000 |
|---|---|---|
| committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-02-02 20:07:03 +0000 |
| commit | 60315b22c41fd1b9d83d267c2fef7dbfcc1261e2 (patch) | |
| tree | b7a41a2d4d3ffe7bd349658b292b59f46f86939b /epan/dissectors/packet-msproxy.c | |
| parent | 6ecaec3e0975cac874e60118b264684cf8c93e02 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13243 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-msproxy.c')
| -rw-r--r-- | epan/dissectors/packet-msproxy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c index ee8585af4f..c69edf9e68 100644 --- a/epan/dissectors/packet-msproxy.c +++ b/epan/dissectors/packet-msproxy.c @@ -203,7 +203,7 @@ static void msproxy_sub_dissector( tvbuff_t *tvb, packet_info *pinfo, proto_tree *msp_tree; proto_item *ti; - conversation = find_conversation( &pinfo->src, &pinfo->dst, + conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); g_assert( conversation); /* should always find a conversation */ @@ -279,12 +279,12 @@ static void add_msproxy_conversation( packet_info *pinfo, return; } - conversation = find_conversation( &pinfo->src, + conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst, hash_info->proto, hash_info->server_int_port, hash_info->clnt_port, 0); if ( !conversation) { - conversation = conversation_new( &pinfo->src, &pinfo->dst, + conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst, hash_info->proto, hash_info->server_int_port, hash_info->clnt_port, 0); } @@ -1099,11 +1099,11 @@ static void dissect_msproxy(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (check_col(pinfo->cinfo, COL_INFO)) col_clear(pinfo->cinfo, COL_INFO); - conversation = find_conversation( &pinfo->src, &pinfo->dst, + conversation = find_conversation( pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if ( !conversation) { - conversation = conversation_new( &pinfo->src, &pinfo->dst, + conversation = conversation_new( pinfo->fd->num, &pinfo->src, &pinfo->dst, pinfo->ptype, pinfo->srcport, pinfo->destport, 0); } hash_info = conversation_get_proto_data(conversation, proto_msproxy); |