[svn-commits] oej: branch oej/pinefrog-1.4 r248110 - in /team/oej/pinefrog-1.4: ./ main/rtp.c

[SVN commits to the Digium repositories]

Author: oej
Date: Sat Feb 20 16:53:04 2010
New Revision: 248110

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=248110
Log:
Resolve conflict, remove some extra debugging

Modified:
    team/oej/pinefrog-1.4/   (props changed)
    team/oej/pinefrog-1.4/main/rtp.c

Propchange: team/oej/pinefrog-1.4/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 20 16:53:04 2010
@@ -1,1 +1,1 @@
-/branches/1.4:1-248053
+/branches/1.4:1-248109

Modified: team/oej/pinefrog-1.4/main/rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/pinefrog-1.4/main/rtp.c?view=diff&rev=248110&r1=248109&r2=248110
==============================================================================
--- team/oej/pinefrog-1.4/main/rtp.c (original)
+++ team/oej/pinefrog-1.4/main/rtp.c Sat Feb 20 16:53:04 2010
@@ -2831,8 +2831,6 @@
 	sdes = (char *) rtcp_packet;
 	switch (type) {
 	case SDES_CNAME:
-		ast_log(LOG_DEBUG, "----About to copy CNAME to SDES packet --- (len %d)\n", len);
-
 		cnamelen = (int) rtp->rtcp->ourcnamelength;
 
 		*sdes = SDES_CNAME;
@@ -2843,7 +2841,6 @@
 
 		/* THere must be a multiple of four bytes in the packet */
 		sdeslen = cnamelen;
-		ast_log(LOG_DEBUG, "----our CNAME %s--- (cnamelen %d len %d)\n", rtp->rtcp->ourcname, cnamelen, len);
 		break;
 	case SDES_END:
 		*sdes = SDES_END;
@@ -2854,8 +2851,6 @@
 	}
 	len += sdeslen + (sdeslen % 4 == 0 ? 0 : 4 - (sdeslen % 4)) ;
 
-	ast_log(LOG_DEBUG, "----Copied our CNAME to SDES packet --- (len %d)\n", len);
-
 	return len;
 }
 
@@ -2868,7 +2863,6 @@
 	int len, res;
 
 	if (!rtp || !rtp->rtcp) {
-		ast_log(LOG_DEBUG, "---- NOT sending empty RTCP packet\n");
 		return 0;
 	} 
 	if (fd == -1) {
@@ -2880,7 +2874,9 @@
 		AST_SCHED_DEL(rtp->sched, rtp->rtcp->schedid);
 		return 0;
 	}
-	ast_log(LOG_DEBUG,  "---- About to send empty RTCP packet\n");
+	if (rtcp_debug_test_addr(&rtp->rtcp->them)) {
+		ast_log(LOG_DEBUG,  "---- About to send empty RTCP packet\n");
+	}
 	rtcpheader = (unsigned int *)bdata;
 	/* Add a RR header with no reports (chunks = 0) - The RFC says that it's always needed 
 		first in a compound packet.
@@ -2996,7 +2992,6 @@
 	len = add_sdes_bodypart(rtp, &rtcpheader[len/4], len, SDES_CNAME);
 	len = add_sdes_bodypart(rtp, &rtcpheader[len/4], len, SDES_END);
 	/* Now, add header when we know the actual length */
-	ast_log(LOG_DEBUG, "----- AFTER SENDING CNAME RTCP Len: %d \n", len);
 	add_sdes_header(rtp, start, len - srlen);
 
 	if (goodbye) {