diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-05 20:53:41 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-09-05 20:53:41 +0000 |
| commit | 348b34d836c65a46bdd097e3a3cf84d315cd74dd (patch) | |
| tree | 21079dca25ed1c23c36170ebb92db4b70f3eba9b /include | |
| parent | 32be69e04efba6789deebe6204853932deef69db (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@81599 f38db490-d61c-443f-a65b-d21fe96a405b
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 063d325ef..7035b5746 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -478,6 +478,9 @@ enum { /*! This is set to tell the channel not to generate DTMF begin frames, and * to instead only generate END frames. */ AST_FLAG_END_DTMF_ONLY = (1 << 14), + /*! This flag indicates that on a masquerade, an active stream should not + * be carried over */ + AST_FLAG_MASQ_NOSTREAM = (1 << 15), }; /*! \brief ast_bridge_config flags */ diff --git a/include/asterisk/file.h b/include/asterisk/file.h index 029bcf25d..936735c4a 100644 --- a/include/asterisk/file.h +++ b/include/asterisk/file.h @@ -129,6 +129,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; */ |