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

[SVN commits to the Digium repositories]

Author: oej
Date: Wed Feb  3 01:23:01 2010
New Revision: 244498

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=244498
Log:
Small updates

Modified:
    team/oej/pinefrog-1.4/main/rtp.c

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=244498&r1=244497&r2=244498
==============================================================================
--- team/oej/pinefrog-1.4/main/rtp.c (original)
+++ team/oej/pinefrog-1.4/main/rtp.c Wed Feb  3 01:23:01 2010
@@ -2459,15 +2459,18 @@
 
 void ast_rtp_stop(struct ast_rtp *rtp)
 {
-	if (rtp->rtcp) {
+	if (rtp->rtcp && rtp->sched != -1) {
 		AST_SCHED_DEL(rtp->sched, rtp->rtcp->schedid);
+		rtp->sched = -1;
+	}
+	/* Send RTCP goodbye packet */
+	if (rtp->isactive) {
+		ast_rtcp_write_sr((const void *) rtp, 1);
 	}
 
 	memset(&rtp->them.sin_addr, 0, sizeof(rtp->them.sin_addr));
 	memset(&rtp->them.sin_port, 0, sizeof(rtp->them.sin_port));
 	if (rtp->rtcp) {
-		/* Send RTCP goodbye packet */
-		ast_rtcp_write_sr((const void *) rtp, 1);
 		memset(&rtp->rtcp->them.sin_addr, 0, sizeof(rtp->rtcp->them.sin_addr));
 		memset(&rtp->rtcp->them.sin_port, 0, sizeof(rtp->rtcp->them.sin_port));
 	}