[asterisk-commits] schmidts: trunk r334792 - in /trunk: ./ main/features.c

[SVN commits to the Asterisk project]

Author: schmidts
Date: Wed Sep  7 10:37:32 2011
New Revision: 334792

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=334792
Log:
Merged revisions 334747 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r334747 | schmidts | 2011-09-07 15:10:37 +0000 (Wed, 07 Sep 2011) | 9 lines
  
  Merged revisions 334682 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r334682 | schmidts | 2011-09-07 13:26:50 +0000 (Wed, 07 Sep 2011) | 3 lines
    
    Adding the Feature to sent a Reason Header in a SIP Cancel message by set the flag AST_FLAG_ANSWERED_ELSEWHERE before doing a masquerade in the pickup function.
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=334792&r1=334791&r2=334792
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Sep  7 10:37:32 2011
@@ -7063,6 +7063,9 @@
 		ast_log(LOG_WARNING, "Unable to queue answer on '%s'\n", chan_name);
 		goto pickup_failed;
 	}
+	
+	/* setting this flag to generate a reason header in the cancel message to the ringing channel */
+	ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE);
 
 	if (ast_channel_masquerade(target, chan)) {
 		ast_log(LOG_WARNING, "Unable to masquerade '%s' into '%s'\n", chan_name,