[asterisk-commits] rmudgett: branch 1.8 r286118 - in /branches/1.8: ./ channels/sig_pri.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Sep 10 15:55:37 2010
New Revision: 286118

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=286118
Log:
Merged revisions 286116 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r286116 | rmudgett | 2010-09-10 15:42:44 -0500 (Fri, 10 Sep 2010) | 18 lines
  
  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.8/   (props changed)
    branches/1.8/channels/sig_pri.c

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

Modified: branches/1.8/channels/sig_pri.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/sig_pri.c?view=diff&rev=286118&r1=286117&r2=286118
==============================================================================
--- branches/1.8/channels/sig_pri.c (original)
+++ branches/1.8/channels/sig_pri.c Fri Sep 10 15:55:37 2010
@@ -5225,6 +5225,14 @@
 									do_hangup = 1;
 									break;
 								default:
+									if (!pri->pvts[chanpos]->outgoing) {
+										/*
+										 * The incoming call leg hung up before getting
+										 * connected so just hangup the call.
+										 */
+										do_hangup = 1;
+										break;
+									}
 									switch (e->hangup.cause) {
 									case PRI_CAUSE_USER_BUSY:
 										pri_queue_control(pri, chanpos, AST_CONTROL_BUSY);
@@ -5358,6 +5366,14 @@
 								do_hangup = 1;
 								break;
 							default:
+								if (!pri->pvts[chanpos]->outgoing) {
+									/*
+									 * The incoming call leg hung up before getting
+									 * connected so just hangup the call.
+									 */
+									do_hangup = 1;
+									break;
+								}
 								switch (e->hangup.cause) {
 								case PRI_CAUSE_USER_BUSY:
 									pri_queue_control(pri, chanpos, AST_CONTROL_BUSY);