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
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@185122 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 74e368b..071f756 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -941,7 +941,7 @@ static int create_process(int midev, struct misdn_bchannel *bc)
                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;