diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-09-05 20:58:19 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-09-05 20:58:19 +0000 |
| commit | 8bcfddc8ecd9568c26709a6032b435d5e1957b41 (patch) | |
| tree | a7f23b0e5e3f8d490abe51d42907b7b86adf7c21 /include | |
| parent | 01c1449d9838a3310914bd7514c2f94478127768 (diff) | |
Merged revisions 81599 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r81599 | russell | 2007-09-05 15:53:41 -0500 (Wed, 05 Sep 2007) | 11 lines
Fix an issue that can occur when you do an attended transfer to parking. If
you complete the transfer before the announcement of the parking spot finishes,
then the channel being parked will hear the remainder of the announcement.
These changes make it so that will not happen anymore.
Basically, res_features sets a flag on the channel is playing the announcement
to so that the file streaming core knows that it needs to watch out for a
channel masquerade, and if it occurs, to abort the announcement.
(closes BE-182)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@81600 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 3 | ||||
| -rw-r--r-- | include/asterisk/file.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 11fb1df38..57b7552c6 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -546,6 +546,9 @@ enum { /*! Flag to show channels that this call is hangup due to the fact that the call was indeed anwered, but in another channel */ AST_FLAG_ANSWERED_ELSEWHERE = (1 << 15), + /*! This flag indicates that on a masquerade, an active stream should not + * be carried over */ + AST_FLAG_MASQ_NOSTREAM = (1 << 16), }; /*! \brief ast_bridge_config flags */ diff --git a/include/asterisk/file.h b/include/asterisk/file.h index 22a887c66..f94fa71c4 100644 --- a/include/asterisk/file.h +++ b/include/asterisk/file.h @@ -133,6 +133,7 @@ struct ast_filestream { int lastwriteformat; int lasttimeout; struct ast_channel *owner; + const char *orig_chan_name; FILE *f; struct ast_frame fr; /*!< frame produced by read, typically */ char *buf; /*!< buffer pointed to by ast_frame; */ |