Merged revisions 334682 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

........
  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/trunk@334712 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/features.c b/main/features.c
index 9af0a86..a683ffe 100644 (file)
--- a/main/features.c
+++ b/main/features.c
@@ -7067,6 +7067,9 @@ int ast_do_pickup(struct ast_channel *chan, struct ast_channel *target)
        /* setting this flag to generate a reason header in the cancel message to the ringing channel */
        ast_set_flag(chan, AST_FLAG_ANSWERED_ELSEWHERE);
 
+       /* 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,
                        target_name);