diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-28 23:10:14 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-28 23:10:14 +0000 |
commit | 83fdaa72f7001d2f2260b81ea15e0bdcb14b3124 (patch) | |
tree | 2794fc86c3f44dae1496cd39a926e5c5a3d3f674 /channels/chan_zap.c | |
parent | a64d4868758aaadf3a8ec3981f819150e9cbd02d (diff) |
Remove possibility of manager deadlocks from manager actions
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6687 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rwxr-xr-x | channels/chan_zap.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index f1c3594cc..84c2e43a2 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9862,7 +9862,6 @@ static int action_zapshowchannels(struct mansession *s, struct message *m) while (tmp) { if (tmp->channel > 0) { int alarm = get_alarms(tmp); - ast_mutex_lock(&s->lock); ast_cli(s->fd, "Event: ZapShowChannels\r\n" "Channel: %d\r\n" @@ -9875,7 +9874,6 @@ static int action_zapshowchannels(struct mansession *s, struct message *m) tmp->channel, sig2str(tmp->sig), tmp->context, tmp->dnd ? "Enabled" : "Disabled", alarm2str(alarm), idText); - ast_mutex_unlock(&s->lock); } tmp = tmp->next; @@ -9883,13 +9881,11 @@ static int action_zapshowchannels(struct mansession *s, struct message *m) ast_mutex_unlock(&iflock); - ast_mutex_lock(&s->lock); ast_cli(s->fd, "Event: ZapShowChannelsComplete\r\n" "%s" "\r\n", idText); - ast_mutex_unlock(&s->lock); return 0; } |