diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-23 13:07:13 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-05-23 13:07:13 +0000 |
| commit | 3de69f3f7ddab1bd6090ffc2d884b1e3d6986235 (patch) | |
| tree | 8ed8a59659d49748e895708bbaf1083d03661212 /channels/chan_zap.c | |
| parent | 869b34a720c155810c90356f11321a5788bd7f3d (diff) | |
Merged revisions 65588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r65588 | russell | 2007-05-23 08:06:17 -0500 (Wed, 23 May 2007) | 3 lines
Revert revision 62417 as someone reported problems with it to Mark. This was
related to issue #9588.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@65589 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_zap.c')
| -rw-r--r-- | channels/chan_zap.c | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index c0e9a5bc8..95e0e5abc 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -9073,17 +9073,25 @@ static void *pri_dchannel(void *vpri) else if (pri->pvts[chanpos]->owner) { /* Queue a BUSY instead of a hangup if our cause is appropriate */ pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause; - - if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP) + switch(e->hangup.cause) { + case PRI_CAUSE_USER_BUSY: + pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1; + break; + case PRI_CAUSE_CALL_REJECTED: + case PRI_CAUSE_NETWORK_OUT_OF_ORDER: + case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION: + case PRI_CAUSE_SWITCH_CONGESTION: + case PRI_CAUSE_DESTINATION_OUT_OF_ORDER: + case PRI_CAUSE_NORMAL_TEMPORARY_FAILURE: + pri->pvts[chanpos]->subs[SUB_REAL].needcongestion =1; + break; + default: pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; - else if (pri->pvts[chanpos]->owner->hangupcause == PRI_CAUSE_USER_BUSY) - pri->pvts[chanpos]->subs[SUB_REAL].needbusy = 1; - else - pri->pvts[chanpos]->subs[SUB_REAL].needcongestion = 1; + } } if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup, cause %d\n", - pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, e->hangup.cause); + ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup\n", + pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span); } else { pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause); pri->pvts[chanpos]->call = NULL; @@ -9129,16 +9137,23 @@ static void *pri_dchannel(void *vpri) pri_hangup_all(pri->pvts[chanpos]->realcall, pri); else if (pri->pvts[chanpos]->owner) { pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause; - - if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP) + switch(e->hangup.cause) { + case PRI_CAUSE_USER_BUSY: + pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1; + break; + case PRI_CAUSE_CALL_REJECTED: + case PRI_CAUSE_NETWORK_OUT_OF_ORDER: + case PRI_CAUSE_NORMAL_CIRCUIT_CONGESTION: + case PRI_CAUSE_SWITCH_CONGESTION: + case PRI_CAUSE_DESTINATION_OUT_OF_ORDER: + case PRI_CAUSE_NORMAL_TEMPORARY_FAILURE: + pri->pvts[chanpos]->subs[SUB_REAL].needcongestion =1; + break; + default: pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; - else if (pri->pvts[chanpos]->owner->hangupcause == PRI_CAUSE_USER_BUSY) - pri->pvts[chanpos]->subs[SUB_REAL].needbusy = 1; - else - pri->pvts[chanpos]->subs[SUB_REAL].needcongestion = 1; - + } if (option_verbose > 2) - ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup request, cause %d\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span, e->hangup.cause); + ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup request\n", PRI_SPAN(e->hangup.channel), PRI_CHANNEL(e->hangup.channel), pri->span); if (e->hangup.aoc_units > -1) if (option_verbose > 2) ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n", |