[asterisk-commits] rmudgett: branch 1.6.0 r185124 - in /branches/1.6.0: ./ channels/misdn/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Mar 30 15:46:24 2009
New Revision: 185124

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

................
  r185122 | rmudgett | 2009-03-30 15:41:24 -0500 (Mon, 30 Mar 2009) | 26 lines
  
  Merged revisions 185120 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r185120 | rmudgett | 2009-03-30 15:38:11 -0500 (Mon, 30 Mar 2009) | 19 lines
    
    Make chan_misdn BRI TE side normally defer channel selection to the NT side.
    
    Channel allocation collisions are not handled by chan_misdn very well.
    This patch simply avoids the problem for BRI only.
    
    For PRI, allocation collisions are still possible but less likely since
    there are simply more channels available and each end could use a different
    allocation strategy.
    
    misdn.conf options available:
    te_choose_channel - Use to force the TE side to allocate channels.
    method - Specify the channel allocation strategy.
    
    (closes issue #13488)
    Reported by: Christian_Pinedo
    Patches:
          isdn_lib.patch.txt uploaded by crich
    Tested by: crich, siepkes, festr
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/misdn/isdn_lib.c

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

Modified: branches/1.6.0/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/channels/misdn/isdn_lib.c?view=diff&rev=185124&r1=185123&r2=185124
==============================================================================
--- branches/1.6.0/channels/misdn/isdn_lib.c (original)
+++ branches/1.6.0/channels/misdn/isdn_lib.c Mon Mar 30 15:46:24 2009
@@ -925,7 +925,7 @@
 		bc->l3_id = l3_id;
 		cb_log(3, stack->port, " --> new_l3id %x\n", l3_id);
 	} else {
-		if (stack->ptp || bc->te_choose_channel) {
+		if ((stack->pri && stack->ptp) || bc->te_choose_channel) {
 			/* we know exactly which channels are in use */
 			if (find_free_chan_in_stack(stack, bc, bc->channel_preselected ? bc->channel : 0, bc->dec) < 0) {
 				return -1;