kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-14 13:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 161014 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r161014 | jpeeler | 2008-12-04 12:32:20 -0600 (Thu, 04 Dec 2008) | 17 lines

Merged revisions 161013 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r161013 | jpeeler | 2008-12-04 12:30:41 -0600 (Thu, 04 Dec 2008) | 9 lines

(closes issue #13835)
Reported by: matt_b
Tested by: jpeeler

This mirrors a check that was present in ast_rtp_read to also be in ast_rtp_raw_write to not schedule sending the receiver report if the remote RTCP endpoint address isn't present in the RTCP structure.

Closes AST-142.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@161016 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2008-12-04 18:37:08 +00:00
parent 1f2f7df7f3
commit 69b97df472
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/rtp.c
View File

@@ -3583,8 +3583,10 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
rtp->txcount++; rtp->txcount++;
rtp->txoctetcount +=(res - hdrlen); rtp->txoctetcount +=(res - hdrlen);
if (rtp->rtcp && rtp->rtcp->schedid < 1) /* Do not schedule RR if RTCP isn't run */
if (rtp->rtcp && rtp->rtcp->them.sin_addr.s_addr && rtp->rtcp->schedid < 1) {
rtp->rtcp->schedid = ast_sched_add(rtp->sched, ast_rtcp_calc_interval(rtp), ast_rtcp_write, rtp); rtp->rtcp->schedid = ast_sched_add(rtp->sched, ast_rtcp_calc_interval(rtp), ast_rtcp_write, rtp);
}
} }
if (rtp_debug_test_addr(&rtp->them)) if (rtp_debug_test_addr(&rtp->them))