[asterisk-commits] pcadach: trunk r44091 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Sat Sep 30 14:23:59 2006
New Revision: 44091

URL: http://svn.digium.com/view/asterisk?rev=44091&view=rev
Log:
Merged revisions 44090 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44090 | pcadach | 2006-10-01 01:20:38 +0600 (Вск, 01 Окт 2006) | 1 line

Allow one-way RTP streams (device->Asterisk)
........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?rev=44091&r1=44090&r2=44091&view=diff
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Sat Sep 30 14:23:59 2006
@@ -1137,9 +1137,11 @@
 		return &ast_null_frame;
 	}
 
+#if 0	/* Allow to receive RTP stream with closed transmission path */
 	/* If we don't have the other side's address, then ignore this */
 	if (!rtp->them.sin_addr.s_addr || !rtp->them.sin_port)
 		return &ast_null_frame;
+#endif
 
 	/* Send to whoever send to us if NAT is turned on */
 	if (rtp->nat) {
@@ -1205,7 +1207,8 @@
 		rtp->seedrxseqno = seqno;
 	}
 
-	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) {
 		/* Schedule transmission of Receiver Report */
 		rtp->rtcp->schedid = ast_sched_add(rtp->sched, ast_rtcp_calc_interval(rtp), ast_rtcp_write, rtp);
 	}
@@ -2208,11 +2211,12 @@
 	struct timeval dlsr;
 	char bdata[512];
 
-	if (!rtp || !rtp->rtcp || (&rtp->rtcp->them.sin_addr == 0))
+	/* Commented condition is always not NULL if rtp->rtcp is not NULL */
+	if (!rtp || !rtp->rtcp/* || (&rtp->rtcp->them.sin_addr == 0)*/)
 		return 0;
 	
 	if (!rtp->rtcp->them.sin_addr.s_addr) {  /* This'll stop rtcp for this rtp session */
-		ast_verbose("RTCP SR transmission error, rtcp halted %s\n",strerror(errno));
+		ast_verbose("RTCP SR transmission error, rtcp halted\n");
 		if (rtp->rtcp->schedid > 0)
 			ast_sched_del(rtp->sched, rtp->rtcp->schedid);
 		rtp->rtcp->schedid = -1;