From b5eb8b7462ae848e98e9eea958d8c12287bb6a6f Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Tue, 27 May 2008 16:43:36 +0000 Subject: Merged revisions 118365 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r118365 | mmichelson | 2008-05-27 11:38:38 -0500 (Tue, 27 May 2008) | 14 lines Add a unique id to the datastore allocated in app_chanspy since it is possible that multiple spies may be listening to the same channel. (closes issue #12376) Reported by: DougUDI Patches: 12376_chanspy_uid.diff uploaded by putnopvut (license 60) Tested by: destiny6628 (closes issue #12243) Reported by: atis ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@118371 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_chanspy.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'apps/app_chanspy.c') diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index f6886347d..e968d7872 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -541,11 +541,13 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds) if (chanspy_ds->chan) { struct ast_datastore *datastore; struct ast_channel *chan; + char uid[20]; chan = chanspy_ds->chan; ast_channel_lock(chan); - if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, NULL))) { + snprintf(uid, sizeof(uid), "%p", chanspy_ds); + if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, uid))) { ast_channel_datastore_remove(chan, datastore); /* chanspy_ds->chan is NULL after this call */ chanspy_ds_destroy(datastore->data); @@ -563,10 +565,13 @@ static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds) static struct chanspy_ds *setup_chanspy_ds(struct ast_channel *chan, struct chanspy_ds *chanspy_ds) { struct ast_datastore *datastore = NULL; + char uid[20]; ast_mutex_lock(&chanspy_ds->lock); - if (!(datastore = ast_channel_datastore_alloc(&chanspy_ds_info, NULL))) { + snprintf(uid, sizeof(uid), "%p", chanspy_ds); + + if (!(datastore = ast_channel_datastore_alloc(&chanspy_ds_info, uid))) { ast_mutex_unlock(&chanspy_ds->lock); chanspy_ds = chanspy_ds_free(chanspy_ds); ast_channel_unlock(chan); -- cgit v1.2.3