diff options
| author | Russell Bryant <russell@russellbryant.com> | 2008-03-13 21:40:43 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2008-03-13 21:40:43 +0000 |
| commit | 835df7d30f895e4ce18cdc7d870461d07db06a07 (patch) | |
| tree | 104d02463b6f0b711b7802bc61a346ea6985044f /apps/app_chanspy.c | |
| parent | 5f58a11ff2daa1d462a1d010e827bff3509a622e (diff) | |
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/trunk@108584 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_chanspy.c')
| -rw-r--r-- | apps/app_chanspy.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index d7047d047..32d5e7c0b 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -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) |