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-isns.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-isns.c')
| -rw-r--r-- | epan/dissectors/packet-isns.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c index e8a38af721..fc41e4f75f 100644 --- a/epan/dissectors/packet-isns.c +++ b/epan/dissectors/packet-isns.c @@ -942,19 +942,19 @@ dissect_isns_attr_port(tvbuff_t *tvb, guint offset, proto_tree *parent_tree, int if ((port_type == ISNS_ESI_PORT) || (port_type == ISNS_SCN_PORT)) { if (isudp) { - conversation = find_conversation (&pinfo->src, &pinfo->dst, PT_UDP, + conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, port, 0, NO_PORT_B); if (conversation == NULL) { - conversation = conversation_new (&pinfo->src, &pinfo->dst, + conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP, port, 0, NO_PORT2_FORCE); conversation_set_dissector (conversation, isns_udp_handle); } } else { - conversation = find_conversation (&pinfo->src, &pinfo->dst, PT_TCP, + conversation = find_conversation (pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_TCP, port, 0, NO_PORT_B); if (conversation == NULL) { - conversation = conversation_new (&pinfo->src, &pinfo->dst, + conversation = conversation_new (pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_TCP, port, 0, NO_PORT2_FORCE); conversation_set_dissector (conversation, isns_tcp_handle); } |