kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-23 16:05:30 -07:00
Code Issues Packages Projects Releases Wiki Activity

Do more complete locking of the chan_iax2_pvt struct in the indicate callback.

Browse Source 
(Problem brought up by Ben Smithurst on the asterisk-dev list)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@56785 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-02-26 16:51:18 +00:00
parent 693cdc775e
commit 268fc8a9cc
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+17 -6
View File
@@ -3184,23 +3184,34 @@ static int iax2_answer(struct ast_channel *c)
static int iax2_indicate(struct ast_channel *c, int condition, const void *data, size_t datalen)
{
unsigned short callno = PTR_TO_CALLNO(c->tech_pvt);
struct chan_iax2_pvt *pvt = c->tech_pvt;
int res = 0;
if (option_debug && iaxdebug)
ast_log(LOG_DEBUG, "Indicating condition %d\n", condition);
if (!strcasecmp(iaxs[callno]->mohinterpret, "passthrough"))
return send_command_locked(callno, AST_FRAME_CONTROL, condition, 0, data, datalen, -1);
ast_mutex_lock(&iaxsl[callno]);
if (!strcasecmp(pvt->mohinterpret, "passthrough")) {
res = send_command(pvt, AST_FRAME_CONTROL, condition, 0, data, datalen, -1);
ast_mutex_unlock(&iaxsl[callno]);
return res;
}
switch (condition) {
case AST_CONTROL_HOLD:
ast_moh_start(c, data, iaxs[callno]->mohinterpret);
return 0;
ast_moh_start(c, data, pvt->mohinterpret);
break;
case AST_CONTROL_UNHOLD:
ast_moh_stop(c);
return 0;
break;
default:
return send_command_locked(callno, AST_FRAME_CONTROL, condition, 0, data, datalen, -1);
res = send_command(pvt, AST_FRAME_CONTROL, condition, 0, data, datalen, -1);
}
ast_mutex_unlock(&iaxsl[callno]);
return res;
}
static int iax2_transfer(struct ast_channel *c, const char *dest)