kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-07 13:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 108583 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r108583 | russell | 2008-03-13 16:38:16 -0500 (Thu, 13 Mar 2008) | 11 lines

Fix another issue that was causing crashes in chanspy.  This introduces a new
datastore callback, called chan_fixup().  The concept is exactly like the
fixup callback that is used in the channel technology interface.  This callback
gets called when the owning channel changes due to a masquerade.  Before this
was introduced, if a masquerade happened on a channel being spyed on, the
channel pointer in the datastore became invalid.

(closes issue #12187)
(reported by, and lots of testing from atis)
(props to file for the help with ideas)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-13 21:40:43 +00:00
parent 5f58a11ff2
commit 835df7d30f
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/app_chanspy.c
View File

@@ -427,9 +427,19 @@ static void chanspy_ds_destroy(void *data)
ast_mutex_unlock(&chanspy_ds->lock); ast_mutex_unlock(&chanspy_ds->lock);
} }
static void chanspy_ds_chan_fixup(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan)
{
struct chanspy_ds *chanspy_ds = data;
ast_mutex_lock(&chanspy_ds->lock);
chanspy_ds->chan = new_chan;
ast_mutex_unlock(&chanspy_ds->lock);
}
static const struct ast_datastore_info chanspy_ds_info = { static const struct ast_datastore_info chanspy_ds_info = {
.type = "chanspy", .type = "chanspy",
.destroy = chanspy_ds_destroy, .destroy = chanspy_ds_destroy,
.chan_fixup = chanspy_ds_chan_fixup,
}; };
static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds) static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)

15
include/asterisk/channel.h
View File

@@ -191,6 +191,21 @@ struct ast_datastore_info {
const char *type; /*!< Type of data store */ const char *type; /*!< Type of data store */
void *(*duplicate)(void *data); /*!< Duplicate item data (used for inheritance) */ void *(*duplicate)(void *data); /*!< Duplicate item data (used for inheritance) */
void (*destroy)(void *data); /*!< Destroy function */ void (*destroy)(void *data); /*!< Destroy function */
/*!
* \brief Fix up channel references
*
* \arg data The datastore data
* \arg old_chan The old channel owning the datastore
* \arg new_chan The new channel owning the datastore
*
* This is exactly like the fixup callback of the channel technology interface.
* It allows a datastore to fix any pointers it saved to the owning channel
* in case that the owning channel has changed. Generally, this would happen
* when the datastore is set to be inherited, and a masquerade occurs.
*
* \return nothing.
*/
void (*chan_fixup)(void *data, struct ast_channel *old_chan, struct ast_channel *new_chan);
}; };
/*! \brief Structure for a channel data store */ /*! \brief Structure for a channel data store */

8
main/channel.c
View File

@@ -3878,8 +3878,14 @@ int ast_do_masquerade(struct ast_channel *original)
ast_app_group_update(clone, original); ast_app_group_update(clone, original);
/* Move data stores over */ /* Move data stores over */
if (AST_LIST_FIRST(&clone->datastores)) if (AST_LIST_FIRST(&clone->datastores)) {
struct ast_datastore *ds;
AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry); AST_LIST_APPEND_LIST(&original->datastores, &clone->datastores, entry);
AST_LIST_TRAVERSE(&original->datastores, ds, entry) {
if (ds->info->chan_fixup)
ds->info->chan_fixup(ds->data, clone, original);
}
}
clone_variables(original, clone); clone_variables(original, clone);
/* Presense of ADSI capable CPE follows clone */ /* Presense of ADSI capable CPE follows clone */