access channel locks through ast_channel_lock/unlock/trylock and not

through ast_mutex primitives.

To detect all occurrences, I have renamed the lock field in struct ast_channel
so it is clear that it shouldn't be used directly.

There are some uses in res/res_features.c (see details of the diff)
that are error prone as they try and lock two channels without
caring about the order (or without explaining why it is safe).



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@89293 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 2 insertions, 2 deletions

diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index de04b0c23..f1bfee9bf 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -102,13 +102,13 @@ static int manager_play_dtmf(struct mansession *s, const struct message *m)
 	}
 	if (!digit) {
 		astman_send_error(s, m, "No digit specified");
-		ast_mutex_unlock(&chan->lock);
+		ast_channel_unlock(chan);
 		return 0;
 	}
 
 	ast_senddigit(chan, *digit, 0);
 
-	ast_mutex_unlock(&chan->lock);
+	ast_channel_unlock(chan);
 	astman_send_ack(s, m, "DTMF successfully queued");
 	
 	return 0;