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 /main/channel.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 'main/channel.c')
| -rw-r--r-- | main/channel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index 93f6f58f3..aeb4845cc 100644 --- a/main/channel.c +++ b/main/channel.c @@ -3878,8 +3878,14 @@ int ast_do_masquerade(struct ast_channel *original) ast_app_group_update(clone, original); /* 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_TRAVERSE(&original->datastores, ds, entry) { + if (ds->info->chan_fixup) + ds->info->chan_fixup(ds->data, clone, original); + } + } clone_variables(original, clone); /* Presense of ADSI capable CPE follows clone */ |