diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-27 16:48:50 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-27 16:48:50 +0000 |
| commit | 490b0430a735171fb510fc745a399461a975d5fe (patch) | |
| tree | 1ffc6b4867b8afe6de09055d10def5e671b94fc4 /apps/app_chanspy.c | |
| parent | d82ff4f32306472fd42a9247514a397ec5f77578 (diff) | |
Merged revisions 118371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r118371 | mmichelson | 2008-05-27 11:43:36 -0500 (Tue, 27 May 2008) | 22 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@118382 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_chanspy.c')
| -rw-r--r-- | apps/app_chanspy.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 9e525b2f0..6f1ca4a72 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -452,11 +452,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); @@ -474,10 +476,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); |