dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Fix recently introduced zap crash from HOLD/UNHOLD patch (bug #3365) 

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4831 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
markster 2005-01-18 11:37:08 +00:00
parent 493670b15a
commit 29dd0c8e46
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
channels/chan_zap.c
View File

@ -4392,12 +4392,11 @@ static int zt_indicate(struct ast_channel *chan, int condition)
chan->_softhangup |= AST_SOFTHANGUP_DEV;
res = 0;
} else if (!p->proceeding && p->sig==SIG_PRI && p->pri && !p->outgoing) {
if (p->pri->pri) {
if (p->pri) {
if (!pri_grab(p, p->pri)) {
pri_progress(p->pri->pri,p->call, PVT_TO_CHANNEL(p), 1);
pri_rel(p->pri);
}
else
} else
ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);
}
p->proceeding=1;
@ -4408,10 +4407,22 @@ static int zt_indicate(struct ast_channel *chan, int condition)
break;
#ifdef ZAPATA_PRI
case AST_CONTROL_HOLD:
res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_HOLD);
if (p->pri) {
if (!pri_grab(p, p->pri)) {
res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_HOLD);
pri_rel(p->pri);
} else
ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);
}
break;
case AST_CONTROL_UNHOLD:
res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_RETRIEVAL);
if (p->pri) {
if (!pri_grab(p, p->pri)) {
res = pri_notify(p->pri->pri, p->call, p->prioffset, PRI_NOTIFY_REMOTE_RETRIEVAL);
pri_rel(p->pri);
} else
ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", p->span);
}
break;
#endif
case AST_CONTROL_RADIO_KEY: