From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 10 Sep 2010 20:42:44 +0000 (+0000)
Subject: Merged revisions 286113 via svnmerge from
X-Git-Tag: 1.6.2.14-rc1~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3423bb637d881d48e5c428e49453f3b029127e97;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@286116 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 8026ca574a..bad9e2c813 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;