diff --git a/CHANGES b/CHANGES index d862f3fbe6..eaadb526b8 100644 --- a/CHANGES +++ b/CHANGES @@ -92,6 +92,10 @@ Dialplan functions ID for the call (not the Asterisk call ID or unique ID), provided that the channel driver supports this. For SIP, you get the SIP call-ID for the bridged channel which you can store in the CDR with a custom field. + * Added the function AUDIOHOOK_INHERIT. This actually is already in Asterisk + 1.4, but since it was added late in the release cycle, I felt it was a good + idea to list it here as well. See the CLI output for "core show function + AUDIOHOOK_INHERIT" for more details CLI Changes ----------- diff --git a/include/asterisk/audiohook.h b/include/asterisk/audiohook.h index d8a6eac6ae..231c8c2c58 100644 --- a/include/asterisk/audiohook.h +++ b/include/asterisk/audiohook.h @@ -150,6 +150,21 @@ int ast_audiohook_detach(struct ast_audiohook *audiohook); */ int ast_audiohook_detach_list(struct ast_audiohook_list *audiohook_list); +/*! \brief Move an audiohook from one channel to a new one + * + * \todo Currently only the first audiohook of a specific source found will be moved. + * We should add the capability to move multiple audiohooks from a single source as well. + * + * \note It is required that both old_chan and new_chan are locked prior to calling + * this function. Besides needing to protect the data within the channels, not locking + * these channels can lead to a potential deadlock + * + * \param old_chan The source of the audiohook to move + * \param new_chan The destination to which we want the audiohook to move + * \param source The source of the audiohook we want to move + */ +void ast_audiohook_move_by_source(struct ast_channel *old_chan, struct ast_channel *new_chan, const char *source); + /*! * \brief Detach specified source audiohook from channel * @@ -162,6 +177,18 @@ int ast_audiohook_detach_list(struct ast_audiohook_list *audiohook_list); */ int ast_audiohook_detach_source(struct ast_channel *chan, const char *source); +/*! + * \brief Remove an audiohook from a specified channel + * + * \param chan Channel to remove from + * \param audiohook Audiohook to remove + * + * \return Returns 0 on success, -1 on failure + * + * \note The channel does not need to be locked before calling this function + */ +int ast_audiohook_remove(struct ast_channel *chan, struct ast_audiohook *audiohook); + /*! \brief Pass a frame off to be handled by the audiohook core * \param chan Channel that the list is coming off of * \param audiohook_list List of audiohooks diff --git a/main/audiohook.c b/main/audiohook.c index ce0039bdd1..08d762e188 100644 --- a/main/audiohook.c +++ b/main/audiohook.c @@ -412,6 +412,11 @@ int ast_audiohook_detach_list(struct ast_audiohook_list *audiohook_list) return 0; } +/*! \brief find an audiohook based on its source + * \param audiohook_list The list of audiohooks to search in + * \param source The source of the audiohook we wish to find + * \return Return the corresponding audiohook or NULL if it cannot be found. + */ static struct ast_audiohook *find_audiohook_by_source(struct ast_audiohook_list *audiohook_list, const char *source) { struct ast_audiohook *audiohook = NULL; @@ -434,6 +439,25 @@ static struct ast_audiohook *find_audiohook_by_source(struct ast_audiohook_list return NULL; } +void ast_audiohook_move_by_source (struct ast_channel *old_chan, struct ast_channel *new_chan, const char *source) +{ + struct ast_audiohook *audiohook = find_audiohook_by_source(old_chan->audiohooks, source); + + if (!audiohook) { + return; + } + + /* By locking both channels and the audiohook, we can assure that + * another thread will not have a chance to read the audiohook's status + * as done, even though ast_audiohook_remove signals the trigger + * condition + */ + ast_audiohook_lock(audiohook); + ast_audiohook_remove(old_chan, audiohook); + ast_audiohook_attach(new_chan, audiohook); + ast_audiohook_unlock(audiohook); +} + /*! \brief Detach specified source audiohook from channel * \param chan Channel to detach from * \param source Name of source to detach @@ -461,6 +485,42 @@ int ast_audiohook_detach_source(struct ast_channel *chan, const char *source) return (audiohook ? 0 : -1); } +/*! + * \brief Remove an audiohook from a specified channel + * + * \param chan Channel to remove from + * \param audiohook Audiohook to remove + * + * \return Returns 0 on success, -1 on failure + * + * \note The channel does not need to be locked before calling this function + */ +int ast_audiohook_remove(struct ast_channel *chan, struct ast_audiohook *audiohook) +{ + ast_channel_lock(chan); + + if (!chan->audiohooks) { + ast_channel_unlock(chan); + return -1; + } + + if (audiohook->type == AST_AUDIOHOOK_TYPE_SPY) + AST_LIST_REMOVE(&chan->audiohooks->spy_list, audiohook, list); + else if (audiohook->type == AST_AUDIOHOOK_TYPE_WHISPER) + AST_LIST_REMOVE(&chan->audiohooks->whisper_list, audiohook, list); + else if (audiohook->type == AST_AUDIOHOOK_TYPE_MANIPULATE) + AST_LIST_REMOVE(&chan->audiohooks->manipulate_list, audiohook, list); + + ast_audiohook_lock(audiohook); + audiohook->status = AST_AUDIOHOOK_STATUS_DONE; + ast_cond_signal(&audiohook->trigger); + ast_audiohook_unlock(audiohook); + + ast_channel_unlock(chan); + + return 0; +} + /*! \brief Pass a DTMF frame off to be handled by the audiohook core * \param chan Channel that the list is coming off of * \param audiohook_list List of audiohooks diff --git a/main/channel.c b/main/channel.c index 11ed7a2a0a..464c9faf18 100644 --- a/main/channel.c +++ b/main/channel.c @@ -4084,11 +4084,11 @@ int ast_do_masquerade(struct ast_channel *original) /* Move data stores over */ if (AST_LIST_FIRST(&clone->datastores)) { struct ast_datastore *ds; - AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry); - AST_LIST_TRAVERSE(&original->datastores, ds, entry) { + AST_LIST_TRAVERSE(&clone->datastores, ds, entry) { if (ds->info->chan_fixup) ds->info->chan_fixup(ds->data, clone, original); } + AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry); } clone_variables(original, clone);