[svn-commits] russell: branch 1.6.1 r211115 - in /branches/1.6.1: ./ apps/app_chanspy.c

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Aug  7 15:17:08 2009
New Revision: 211115

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=211115
Log:
Merged revisions 211113 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r211113 | russell | 2009-08-07 15:12:21 -0500 (Fri, 07 Aug 2009) | 11 lines
  
  Recorded merge of revisions 211112 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r211112 | russell | 2009-08-07 15:11:31 -0500 (Fri, 07 Aug 2009) | 4 lines
    
    Resolve a deadlock involving app_chanspy and masquerades.
    
    (ABE-1936)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_chanspy.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_chanspy.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_chanspy.c?view=diff&rev=211115&r1=211114&r2=211115
==============================================================================
--- branches/1.6.1/apps/app_chanspy.c (original)
+++ branches/1.6.1/apps/app_chanspy.c Fri Aug  7 15:17:08 2009
@@ -552,17 +552,20 @@
 
 static struct chanspy_ds *chanspy_ds_free(struct chanspy_ds *chanspy_ds)
 {
-	if (!chanspy_ds)
+	struct ast_channel *chan;
+
+	if (!chanspy_ds) {
 		return NULL;
+	}
 
 	ast_mutex_lock(&chanspy_ds->lock);
-	if (chanspy_ds->chan) {
+	while ((chan = chanspy_ds->chan)) {
 		struct ast_datastore *datastore;
-		struct ast_channel *chan;
-
-		chan = chanspy_ds->chan;
-
-		ast_channel_lock(chan);
+
+		if (ast_channel_trylock(chan)) {
+			DEADLOCK_AVOIDANCE(&chanspy_ds->lock);
+			continue;
+		}
 		if ((datastore = ast_channel_datastore_find(chan, &chanspy_ds_info, chanspy_ds->unique_id))) {
 			ast_channel_datastore_remove(chan, datastore);
 			/* chanspy_ds->chan is NULL after this call */
@@ -571,6 +574,7 @@
 			ast_datastore_free(datastore);
 		}
 		ast_channel_unlock(chan);
+		break;
 	}
 	ast_mutex_unlock(&chanspy_ds->lock);