kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 14:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_rtp_asterisk: Clearing the remote RTCP address causes RTCP failures"

Browse Source
This commit is contained in:
Jenkins2
2017-05-04 17:55:54 -05:00
committed by Gerrit Code Review
parent 7b0e3b92fd 008e25def9
commit 4262a5aa6a
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
res/res_rtp_asterisk.c
View File

@@ -3908,7 +3908,7 @@ static int ast_rtp_write(struct ast_rtp_instance *instance, struct ast_frame *fr
return 0;
}
if (ast_sockaddr_isnull(&rtp->rtcp->them)) {
if (ast_sockaddr_isnull(&rtp->rtcp->them) || rtp->rtcp->schedid < 0) {
/*
* RTCP was stopped.
*/
@@ -5527,21 +5527,20 @@ static void ast_rtp_remote_address_set(struct ast_rtp_instance *instance, struct
}
}
if (rtp->rtcp) {
if (rtp->rtcp && !ast_sockaddr_isnull(addr)) {
ast_debug(1, "Setting RTCP address on RTP instance '%p'\n", instance);
ast_sockaddr_copy(&rtp->rtcp->them, addr);
if (!ast_sockaddr_isnull(addr)) {
if (rtp->rtcp->type == AST_RTP_INSTANCE_RTCP_STANDARD) {
ast_sockaddr_set_port(&rtp->rtcp->them, ast_sockaddr_port(addr) + 1);
/* Update the local RTCP address with what is being used */
ast_sockaddr_set_port(&local, ast_sockaddr_port(&local) + 1);
}
ast_sockaddr_copy(&rtp->rtcp->us, &local);
if (rtp->rtcp->type == AST_RTP_INSTANCE_RTCP_STANDARD) {
ast_sockaddr_set_port(&rtp->rtcp->them, ast_sockaddr_port(addr) + 1);
ast_free(rtp->rtcp->local_addr_str);
rtp->rtcp->local_addr_str = ast_strdup(ast_sockaddr_stringify(&local));
/* Update the local RTCP address with what is being used */
ast_sockaddr_set_port(&local, ast_sockaddr_port(&local) + 1);
}
ast_sockaddr_copy(&rtp->rtcp->us, &local);
ast_free(rtp->rtcp->local_addr_str);
rtp->rtcp->local_addr_str = ast_strdup(ast_sockaddr_stringify(&local));
}
rtp->rxseqno = 0;
@@ -5751,9 +5750,6 @@ static void ast_rtp_stop(struct ast_rtp_instance *instance)
}
ast_rtp_instance_set_remote_address(instance, &addr);
if (rtp->rtcp) {
ast_sockaddr_setnull(&rtp->rtcp->them);
}
ast_set_flag(rtp, FLAG_NEED_MARKER_BIT);
}