diff options
| author | John Thacker <johnthacker@gmail.com> | 2022-10-19 07:23:50 -0400 |
|---|---|---|
| committer | John Thacker <johnthacker@gmail.com> | 2022-10-20 14:03:38 +0000 |
| commit | 2d831519c3f58979b4caa434fef7a3e8cd6a10cf (patch) | |
| tree | b46c4192f6253c4a43b74e4620553d819ca9c1ff | |
| parent | cac6a8452b63c96c30e705ad850136d2448a0890 (diff) | |
rtcp: Use setup_frame_number to look for conversations
Use the setup_frame_number to look for and create conversations
with srtcp_add_address, the same way as done in srtp_add_address.
This ensures that RTP and RTCP find the same conversation when
called back to back (as when handling them multiplexed on the
same conversation.
Related to #18460.
| -rw-r--r-- | epan/dissectors/packet-rtcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 04dfa2eab9..303911fc4e 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -934,14 +934,14 @@ void srtcp_add_address( packet_info *pinfo, * Check if the ip address and port combination is not * already registered as a conversation. */ - p_conv = find_conversation( pinfo->num, addr, &null_addr, CONVERSATION_UDP, port, other_port, + p_conv = find_conversation( setup_frame_number, addr, &null_addr, CONVERSATION_UDP, port, other_port, NO_ADDR_B | (!other_port ? NO_PORT_B : 0)); /* * If not, create a new conversation. */ if ( ! p_conv ) { - p_conv = conversation_new( pinfo->num, addr, &null_addr, CONVERSATION_UDP, + p_conv = conversation_new( setup_frame_number, addr, &null_addr, CONVERSATION_UDP, (guint32)port, (guint32)other_port, NO_ADDR2 | (!other_port ? NO_PORT2 : 0)); } |