[svn-commits] oej: branch oej/midcomstuff r65008 - in /team/oej/midcomstuff: ./ channels/

[svn-commits at lists.digium.com]

Author: oej
Date: Fri May 18 06:50:01 2007
New Revision: 65008

URL: http://svn.digium.com/view/asterisk?view=rev&rev=65008
Log:
Resolve conflict caused by that %&?&#?&! oej and reset automerge

Modified:
    team/oej/midcomstuff/   (props changed)
    team/oej/midcomstuff/channels/chan_sip.c

Propchange: team/oej/midcomstuff/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/midcomstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri May 18 06:50:01 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-64934
+/branches/1.4:1-65007

Modified: team/oej/midcomstuff/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/midcomstuff/channels/chan_sip.c?view=diff&rev=65008&r1=65007&r2=65008
==============================================================================
--- team/oej/midcomstuff/channels/chan_sip.c (original)
+++ team/oej/midcomstuff/channels/chan_sip.c Fri May 18 06:50:01 2007
@@ -1300,6 +1300,7 @@
 				char **m_buf, size_t *m_size, char **a_buf, size_t *a_size,
 				int debug);
 static enum sip_result add_sdp(struct sip_request *resp, struct sip_pvt *p);
+static void stop_media_flows(struct sip_pvt *p);
 
 /*--- Authentication stuff */
 static int reply_digest(struct sip_pvt *p, struct sip_request *req, char *header, int sipmethod, char *digest, int digest_len);
@@ -3548,6 +3549,8 @@
         if (midcom_cb && ast_test_flag(&p->flags[0], SIP_OUTGOING)) 
 		needcancel = 0;
 #endif
+
+	stop_media_flows(p); /* Immediately stop RTP, VRTP and UDPTL as applicable */
 
 	/* Disconnect */
 	if (p->vad)