summaryrefslogtreecommitdiff
path: root/main/features.c
diff options
context:
space:
mode:
authorStefan Schmidt <sst@sil.at>2011-09-07 15:37:32 +0000
committerStefan Schmidt <sst@sil.at>2011-09-07 15:37:32 +0000
commit081dcb4a465c9183ac8b48aa4f4788dc2cb4ea31 (patch)
tree209c3972ad0678d185eed630b9e70aac2d895c25 /main/features.c
parent40f505c00979f3a871a20f75ca9bb08ca10ab314 (diff)
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. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@334792 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index 7afd71b4a..9af0a8653 100644
--- 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,