diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-12 22:58:49 +0000 |
commit | 41df2e668668137091861464cabe91cf110f4302 (patch) | |
tree | 921cb941ba1a59df6cc1650b935d249fa0b73f84 /channels/chan_zap.c | |
parent | 476ed07a1111e6172eb4f860ad239d3ef7bb5f49 (diff) |
manual update, since automerge is not running at this time
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@48421 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r-- | channels/chan_zap.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 69177a981..277a152c1 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3339,7 +3339,7 @@ static int attempt_transfer(struct zt_pvt *p) stop if now if appropriate */ if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) ast_moh_stop(ast_bridged_channel(p->subs[SUB_THREEWAY].owner)); - if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) { + if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) { ast_indicate(ast_bridged_channel(p->subs[SUB_REAL].owner), AST_CONTROL_RINGING); } if (p->subs[SUB_REAL].owner->cdr) { @@ -3363,7 +3363,7 @@ static int attempt_transfer(struct zt_pvt *p) ast_mutex_unlock(&p->subs[SUB_THREEWAY].owner->lock); unalloc_sub(p, SUB_THREEWAY); } else if (ast_bridged_channel(p->subs[SUB_THREEWAY].owner)) { - if (p->subs[SUB_REAL].owner->_state == AST_STATE_RINGING) { + if (p->subs[SUB_THREEWAY].owner->_state == AST_STATE_RINGING) { ast_indicate(ast_bridged_channel(p->subs[SUB_THREEWAY].owner), AST_CONTROL_RINGING); } ast_moh_stop(ast_bridged_channel(p->subs[SUB_THREEWAY].owner)); @@ -4853,11 +4853,10 @@ static int zt_indicate(struct ast_channel *chan, int condition) } #endif res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_RINGTONE); - if (chan->_state != AST_STATE_UP) { - if ((chan->_state != AST_STATE_RING) || - ((p->sig != SIG_FXSKS) && + if (chan->_state != AST_STATE_UP && chan->_state != AST_STATE_RING) { + if ((p->sig != SIG_FXSKS) && (p->sig != SIG_FXSLS) && - (p->sig != SIG_FXSGS))) + (p->sig != SIG_FXSGS)) ast_setstate(chan, AST_STATE_RINGING); } break; @@ -6268,7 +6267,9 @@ static int handle_init_event(struct zt_pvt *i, int event) case SIG_FXOLS: case SIG_FXOGS: case SIG_FXOKS: - zt_set_hook(i->subs[SUB_REAL].zfd, ZT_OFFHOOK); + res = zt_set_hook(i->subs[SUB_REAL].zfd, ZT_OFFHOOK); + if (res && (errno == EBUSY)) + break; if (i->cidspill) { /* Cancel VMWI spill */ free(i->cidspill); |