[svn-commits] rmudgett: branch 1.4 r185120 - /branches/1.4/channels/misdn/isdn_lib.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Mar 30 15:38:11 2009
New Revision: 185120

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=185120
Log:
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.4/channels/misdn/isdn_lib.c

Modified: branches/1.4/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/channels/misdn/isdn_lib.c?view=diff&rev=185120&r1=185119&r2=185120
==============================================================================
--- branches/1.4/channels/misdn/isdn_lib.c (original)
+++ branches/1.4/channels/misdn/isdn_lib.c Mon Mar 30 15:38:11 2009
@@ -915,7 +915,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;