[svn-commits] mnicholson: trunk r229102 - /trunk/channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Tue Nov 10 09:53:52 2009
New Revision: 229102

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=229102
Log:
Reverted revision 201717.

(closes issue 0016175)
Reported by: paul-tg

Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=229102&r1=229101&r2=229102
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue Nov 10 09:53:52 2009
@@ -6468,14 +6468,6 @@
 {
 	format_t fmt;
 	const char *codec;
-	struct ast_channel* chan;
-
-	chan = ast_channel_ref(p->owner);
-	while (ast_channel_trylock(chan)) {
-		sip_pvt_unlock(p);
-		sched_yield();
-		sip_pvt_lock(p);
-	}
 
 	if (p->outgoing_call) {
 		codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC_OUTBOUND");
@@ -6483,12 +6475,7 @@
 		codec = pbx_builtin_getvar_helper(p->owner, "SIP_CODEC");
 	}
 
-	codec = ast_strdupa(S_OR(codec, ""));
-
-	ast_channel_unlock(chan);
-	chan = ast_channel_unref(chan);
-
-	if (ast_strlen_zero(codec))
+	if (!codec) 
 		return;
 
 	fmt = ast_getformatbyname(codec);