[svn-commits] sgriepentrog: branch 11 r405487 - in /branches/11: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: sgriepentrog
Date: Tue Jan 14 12:43:56 2014
New Revision: 405487

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=405487
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.

(closes issue ASTERISK-23010)
Reported by: Ryan Tilton
Review: https://reviewboard.asterisk.org/r/3116/
........

Merged revisions 405486 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/11/   (props changed)
    branches/11/channels/chan_sip.c

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_sip.c?view=diff&rev=405487&r1=405486&r2=405487
==============================================================================
--- branches/11/channels/chan_sip.c (original)
+++ branches/11/channels/chan_sip.c Tue Jan 14 12:43:56 2014
@@ -24893,12 +24893,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);
 		ast_channel_hangupcause_set(c, AST_CAUSE_SWITCH_CONGESTION);
-	}
-	ast_setstate(c, AST_STATE_DOWN);
-	ast_channel_unlock(c);
+		ast_channel_unlock(c);
+	}
 
 	/* c and c's tech pvt must be unlocked at this point for ast_hangup */
 	ast_hangup(c);