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

Merged revisions 108584 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r108584 | russell | 2008-03-13 16:40:43 -0500 (Thu, 13 Mar 2008) | 19 lines

Merged revisions 108583 via svnmerge from 
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/branches/1.6.0@108585 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2008-03-13 21:41:14 +00:00
parent 27803e8d3e
commit e2d7bed99a
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);
}
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 = {
.type = "chanspy",
.destroy = chanspy_ds_destroy,
.chan_fixup = chanspy_ds_chan_fixup,
};
static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)