[asterisk-commits] rmudgett: branch 1.6.1 r203918 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Jun 26 20:18:48 2009
New Revision: 203918

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=203918
Log:
Merged revisions 203909 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r203909 | rmudgett | 2009-06-26 20:07:52 -0500 (Fri, 26 Jun 2009) | 23 lines
  
  Merged revisions 203908 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r203908 | rmudgett | 2009-06-26 19:55:12 -0500 (Fri, 26 Jun 2009) | 16 lines
    
    The ISDN CPE side should not exclusively pick B channels normally.
    
    Before this patch, Asterisk unconditionally picked B channels exclusively
    on the CPE side and normally allowed alternative B channels on the network
    side.  Now Asterisk does the opposite.
    
    Reasons for the CPE side to normally not pick B channels exclusively:
    *  For CPE point-to-multipoint mode (i.e. phone side), the CPE side does
    not have enough information to exclusively pick B channels.  (There may be
    other devices on the line.)
    *  Q.931 gives preference to the network side picking B channels.
    *  Some telcos require the CPE side to not pick B channels exclusively.
    
    (closes issue #14383)
    Reported by: mbrancaleoni
  ........
................

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=203918&r1=203917&r2=203918
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Jun 26 20:18:48 2009
@@ -2937,15 +2937,12 @@
 			pri_set_crv(p->pri->pri, p->call, p->channel, 0);
 		}
 		p->digital = IS_DIGITAL(ast->transfercapability);
-		/* Add support for exclusive override */
-		if (p->priexclusive)
+
+		/* Should the picked channel be used exclusively? */
+		if (p->priexclusive || p->pri->nodetype == PRI_NETWORK) {
 			exclusive = 1;
-		else {
-		/* otherwise, traditional behavior */
-			if (p->pri->nodetype == PRI_NETWORK)
-				exclusive = 0;
-			else
-				exclusive = 1;
+		} else {
+			exclusive = 0;
 		}
 		
 		pri_sr_set_channel(sr, p->bearer ? PVT_TO_CHANNEL(p->bearer) : PVT_TO_CHANNEL(p), exclusive, 1);