Merged revisions 65589 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r65589 | russell | 2007-05-23 08:07:13 -0500 (Wed, 23 May 2007) | 11 lines 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: https://origsvn.digium.com/svn/asterisk/trunk@65591 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
998261f602
commit
5558323d0c
|
@ -10091,17 +10091,25 @@ static void *pri_dchannel(void *vpri)
|
||||||
else if (pri->pvts[chanpos]->owner) {
|
else if (pri->pvts[chanpos]->owner) {
|
||||||
/* Queue a BUSY instead of a hangup if our cause is appropriate */
|
/* Queue a BUSY instead of a hangup if our cause is appropriate */
|
||||||
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
|
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
|
||||||
|
switch(e->hangup.cause) {
|
||||||
if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
|
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;
|
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)
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup, cause %d\n",
|
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d got hangup\n",
|
||||||
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span, e->hangup.cause);
|
pri->pvts[chanpos]->logicalspan, pri->pvts[chanpos]->prioffset, pri->span);
|
||||||
} else {
|
} else {
|
||||||
pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause);
|
pri_hangup(pri->pri, pri->pvts[chanpos]->call, e->hangup.cause);
|
||||||
pri->pvts[chanpos]->call = NULL;
|
pri->pvts[chanpos]->call = NULL;
|
||||||
|
@ -10147,16 +10155,23 @@ static void *pri_dchannel(void *vpri)
|
||||||
pri_hangup_all(pri->pvts[chanpos]->realcall, pri);
|
pri_hangup_all(pri->pvts[chanpos]->realcall, pri);
|
||||||
else if (pri->pvts[chanpos]->owner) {
|
else if (pri->pvts[chanpos]->owner) {
|
||||||
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
|
pri->pvts[chanpos]->owner->hangupcause = e->hangup.cause;
|
||||||
|
switch(e->hangup.cause) {
|
||||||
if (pri->pvts[chanpos]->owner->_state == AST_STATE_UP)
|
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;
|
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)
|
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 (e->hangup.aoc_units > -1)
|
||||||
if (option_verbose > 2)
|
if (option_verbose > 2)
|
||||||
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
|
ast_verbose(VERBOSE_PREFIX_3 "Channel %d/%d, span %d received AOC-E charging %d unit%s\n",
|
||||||
|
|
Loading…
Reference in New Issue