From f824e7035a456e9d02e5d9da713b6d735f3bb809 Mon Sep 17 00:00:00 2001 From: rmudgett Date: Fri, 10 Sep 2010 20:42:44 +0000 Subject: Merged revisions 286113 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r286113 | rmudgett | 2010-09-10 15:33:16 -0500 (Fri, 10 Sep 2010) | 11 lines An outgoing call may not get hung up if a pre-connect incoming ISDN call is disconnected. If the ISDN link a pre-connect incoming call is using fails or is reset, the outgoing leg may not hang up or be delayed in hanging up. (Causes: PRI_CAUSE_NETWORK_OUT_OF_ORDER, PRI_CAUSE_DESTINATION_OUT_OF_ORDER, and PRI_CAUSE_NORMAL_TEMPORARY_FAILURE.) Just hang up the call if the incoming call leg hangs up before connecting for any reason. It makes no sense to send a BUSY or CONGESTION control frame to the outgoing call leg under these circumstances. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@286116 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_dahdi.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'channels') diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 8026ca574..bad9e2c81 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -13402,6 +13402,14 @@ static void *pri_dchannel(void *vpri) pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; break; default: + if (!pri->pvts[chanpos]->outgoing) { + /* + * The incoming call leg hung up before getting + * connected so just hangup the call. + */ + pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; + break; + } switch (e->hangup.cause) { case PRI_CAUSE_USER_BUSY: pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1; @@ -13474,6 +13482,14 @@ static void *pri_dchannel(void *vpri) pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; break; default: + if (!pri->pvts[chanpos]->outgoing) { + /* + * The incoming call leg hung up before getting + * connected so just hangup the call. + */ + pri->pvts[chanpos]->owner->_softhangup |= AST_SOFTHANGUP_DEV; + break; + } switch (e->hangup.cause) { case PRI_CAUSE_USER_BUSY: pri->pvts[chanpos]->subs[SUB_REAL].needbusy =1; -- cgit v1.2.3