[asterisk-commits] seanbright: branch seanbright/issue5014-1.4 r144157 - /team/seanbright/issue5...

[SVN commits to the Asterisk project]

Author: seanbright
Date: Tue Sep 23 19:25:11 2008
New Revision: 144157

URL: http://svn.digium.com/view/asterisk?view=rev&rev=144157
Log:
Properly dispose of our zombie channel.

Modified:
    team/seanbright/issue5014-1.4/channels/chan_sip.c

Modified: team/seanbright/issue5014-1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/seanbright/issue5014-1.4/channels/chan_sip.c?view=diff&rev=144157&r1=144156&r2=144157
==============================================================================
--- team/seanbright/issue5014-1.4/channels/chan_sip.c (original)
+++ team/seanbright/issue5014-1.4/channels/chan_sip.c Tue Sep 23 19:25:11 2008
@@ -14533,7 +14533,12 @@
 			ast_setstate(c, AST_STATE_RING);
 
 			/* Do the pickup itself */
+			ast_channel_unlock(c);
+			*nounlock = 1;
 			do_magic_pickup(c, pickup->exten, pickup->context);
+
+			/* Now we're either masqueraded or we failed to pickup, in either case we... */
+			ast_hangup(c);
 
 			/* Do a bit of cleanup */
 			ast_free(pickup->exten);