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/trunk@161014 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/rtp.c b/main/rtp.c
index 3da025a2be372d2b0a63d819fc2f1fd9a5278561..9f4c34284a0dd427ab05684b1f9bfc06042a4f17 100644 (file)
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -3583,8 +3583,10 @@ static int ast_rtp_raw_write(struct ast_rtp *rtp, struct ast_frame *f, int codec
                        rtp->txcount++;
                        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);
+                       }
                }
                                
                if (rtp_debug_test_addr(&rtp->them))