[asterisk-commits] rmudgett: branch 1.6.2 r286116 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 10 15:42:44 2010
New Revision: 286116

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286116
Log:
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.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/channels/chan_dahdi.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=286116&r1=286115&r2=286116
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Fri Sep 10 15:42:44 2010
@@ -13402,6 +13402,14 @@
 									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 @@
 								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;