aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/app_chanspy.c10
-rw-r--r--include/asterisk/channel.h15
-rw-r--r--main/channel.c8
3 files changed, 32 insertions, 1 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)
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index e5fd5ba81..ddba96f89 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -191,6 +191,21 @@ struct ast_datastore_info {
const char *type; /*!< Type of data store */
void *(*duplicate)(void *data); /*!< Duplicate item data (used for inheritance) */
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 */
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 */