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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@334747 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index 7afd71b4aa88b277a5c4fbbf33201deba9debda1..9af0a865331aa2ecd45f9db483383c4fc3c59b4b 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -7063,6 +7063,9 @@ int ast_do_pickup(struct ast_channel *chan, struct ast_channel *target)
                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,