kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the channel lock wrappers (issue #7120, Mithraen)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@26528 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-05-10 15:30:59 +00:00
parent e0f0f4b4a4
commit 932c5c7fd7
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_chanspy.c
View File

@@ -198,9 +198,9 @@ static int start_spying(struct ast_channel *chan, struct ast_channel *spychan, s
ast_log(LOG_NOTICE, "Attaching %s to %s\n", spychan->name, chan->name);
ast_mutex_lock(&chan->lock);
ast_channel_lock(chan);
res = ast_channel_spy_add(chan, spy);
ast_mutex_unlock(&chan->lock);
ast_channel_unlock(chan);
if (!res && ast_test_flag(chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(chan))) {
ast_softhangup(peer, AST_SOFTHANGUP_UNBRIDGE);
@@ -219,9 +219,9 @@ static void stop_spying(struct ast_channel *chan, struct ast_channel_spy *spy)
if (!chan)
return;
ast_mutex_lock(&chan->lock);
ast_channel_lock(chan);
ast_channel_spy_remove(chan, spy);
ast_mutex_unlock(&chan->lock);
ast_channel_unlock(chan);
};
/* Map 'volume' levels from -4 through +4 into

6
apps/app_sendtext.c
View File

@@ -93,9 +93,9 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
priority_jump = 1;
}
ast_mutex_lock(&chan->lock);
ast_channel_lock(chan);
if (!chan->tech->send_text) {
ast_mutex_unlock(&chan->lock);
ast_channel_unlock(chan);
/* Does not support transport */
if (priority_jump || ast_opt_priority_jumping)
ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
@@ -103,7 +103,7 @@ static int sendtext_exec(struct ast_channel *chan, void *data)
return 0;
}
status = "FAILURE";
ast_mutex_unlock(&chan->lock);
ast_channel_unlock(chan);
res = ast_sendtext(chan, args.text);
if (!res)
status = "SUCCESS";

8
funcs/func_channel.c
View File

@@ -40,15 +40,15 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/stringfields.h"
#define locked_copy_string(chan, dest, source, len) \
do { \
ast_mutex_lock(&chan->lock); \
ast_channel_lock(chan); \
ast_copy_string(dest, source, len); \
ast_mutex_unlock(&chan->lock); \
ast_channel_unlock(chan); \
} while (0)
#define locked_string_field_set(chan, field, source) \
do { \
ast_mutex_lock(&chan->lock); \
ast_channel_lock(chan); \
ast_string_field_set(chan, field, source); \
ast_mutex_unlock(&chan->lock); \
ast_channel_unlock(chan); \
} while (0)
static int func_channel_read(struct ast_channel *chan, char *function,