osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
John Thacker 2022-10-19 07:23:50 -04:00
parent cac6a8452b
commit 2d831519c3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-rtcp.c
View File

@ -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));
}