[asterisk-commits] sgriepentrog: branch 1.8 r405486 - /branches/1.8/channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: sgriepentrog
Date: Tue Jan 14 12:35:13 2014
New Revision: 405486

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405486
Log:
chan_sip: No BYE message sent after INVITE with Replaces

Setting channel state DOWN is an unnecessary step that was
only being done in handle_invite_replaces().  This changes
that by removing the call and reducing locking.


Modified:
    branches/1.8/channels/chan_sip.c

Modified: branches/1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_sip.c?view=diff&rev=405486&r1=405485&r2=405486
==============================================================================
--- branches/1.8/channels/chan_sip.c (original)
+++ branches/1.8/channels/chan_sip.c Tue Jan 14 12:35:13 2014
@@ -22903,12 +22903,11 @@
 	if (ast_do_masquerade(replacecall)) {
 		ast_log(LOG_WARNING, "Failed to perform masquerade with INVITE replaces\n");
 	}
-	ast_channel_lock(c);
 	if (earlyreplace || oneleggedreplace ) {
+		ast_channel_lock(c);
 		c->hangupcause = AST_CAUSE_SWITCH_CONGESTION;
-	}
-	ast_setstate(c, AST_STATE_DOWN);
-	ast_channel_unlock(c);
+		ast_channel_unlock(c);
+	}
 
 	/* The call should be down with no ast_channel, so hang it up */
 	c->tech_pvt = dialog_unref(c->tech_pvt, "unref dialog c->tech_pvt");