diff options
| -rw-r--r-- | channels/chan_dahdi.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 6e5e8994c..ff6756af5 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -9743,9 +9743,12 @@ 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 (pri->pvts[chanpos]->owner->_state) { + case AST_STATE_BUSY: + case AST_STATE_UP: pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; - else { + break; + default: switch (e->hangup.cause) { case PRI_CAUSE_USER_BUSY: pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1; @@ -9761,6 +9764,7 @@ static void *pri_dchannel(void *vpri) default: pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; } + break; } } if (option_verbose > 2) @@ -9814,9 +9818,12 @@ 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 (pri->pvts[chanpos]->owner->_state) { + case AST_STATE_BUSY: + case AST_STATE_UP: pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; - else { + break; + default: switch (e->hangup.cause) { case PRI_CAUSE_USER_BUSY: pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1; @@ -9832,6 +9839,7 @@ static void *pri_dchannel(void *vpri) default: pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; } + break; } 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); |