[asterisk-commits] twilson: trunk r275998 - in /trunk/channels: chan_sip.c sip/include/dialog.h

[SVN commits to the Asterisk project]

Author: twilson
Date: Tue Jul 13 12:11:37 2010
New Revision: 275998

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275998
Log:
Destroy RTP fds when we schedule final dialog destruction

Since we are only keeping the dialog around for retransmissions at this point
and there is no possibility that we are still handling RTP, go ahead and
destroy the RTP sessions. Keeping them alive for 32 past when they are used
is unnecessary and can lead to problems with having too many open file
descriptors, etc.

Modified:
    trunk/channels/chan_sip.c
    trunk/channels/sip/include/dialog.h

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=275998&r1=275997&r2=275998
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Jul 13 12:11:37 2010
@@ -3497,6 +3497,23 @@
 	return 0;
 }
 
+/*! \brief Destroy all RTP instances allocated for a dialog */
+void sip_destroy_rtp(struct sip_pvt *p)
+{
+	if (p->rtp) {
+		ast_rtp_instance_destroy(p->rtp);
+		p->rtp = NULL;
+	}
+	if (p->vrtp) {
+		ast_rtp_instance_destroy(p->vrtp);
+		p->vrtp = NULL;
+	}
+	if (p->trtp) {
+		ast_rtp_instance_destroy(p->trtp);
+		p->trtp = NULL;
+	}
+}
+
 /*! \brief Schedule final destruction of SIP dialog.  This can not be canceled.
  *  This function is used to keep a dialog around for a period of time in order
  *  to properly respond to any retransmits. */
@@ -3510,6 +3527,8 @@
 	if (p->autokillid != -1) {
 		p->final_destruction_scheduled = 1;
 	}
+
+	sip_destroy_rtp(p);
 }
 
 /*! \brief Schedule destruction of SIP dialog */
@@ -5176,15 +5195,9 @@
 		ast_free(p->notify->content);
 		ast_free(p->notify);
 	}
-	if (p->rtp) {
-		ast_rtp_instance_destroy(p->rtp);
-	}
-	if (p->vrtp) {
-		ast_rtp_instance_destroy(p->vrtp);
-	}
-	if (p->trtp) {
-		ast_rtp_instance_destroy(p->trtp);
-	}
+
+	sip_destroy_rtp(p);
+
 	if (p->udptl)
 		ast_udptl_destroy(p->udptl);
 	if (p->refer)

Modified: trunk/channels/sip/include/dialog.h
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/sip/include/dialog.h?view=diff&rev=275998&r1=275997&r2=275998
==============================================================================
--- trunk/channels/sip/include/dialog.h (original)
+++ trunk/channels/sip/include/dialog.h Tue Jul 13 12:11:37 2010
@@ -40,6 +40,10 @@
 void sip_scheddestroy(struct sip_pvt *p, int ms);
 int sip_cancel_destroy(struct sip_pvt *p);
 
+/*! \brief Destroy the RTP instances associated with a dialog
+ */
+void sip_destroy_rtp(struct sip_pvt *p);
+
 /*! \brief Destroy SIP call structure.
  * Make it return NULL so the caller can do things like
  *	foo = sip_destroy(foo);