automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59638 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 48c8063e68d866092a8f01400b5ac2822cce7009..ec38f47bf7775421a93a19e8fd2d9b9fbd6b2da9 100644 (file)
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -1755,11 +1755,11 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout)
                misdn_cfg_get( 0, MISDN_GEN_BRIDGING, &bridging, sizeof(int));
                if (bridging && ch->other_ch) {
 #ifdef MISDN_1_2
-                       chan_misdn_log(0, port, "Disabling EC (aka Pipeline) on both Sides\n");
+                       chan_misdn_log(1, port, "Disabling EC (aka Pipeline) on both Sides\n");
                        *ch->bc->pipeline=0;
                        *ch->other_ch->bc->pipeline=0;
 #else
-                       chan_misdn_log(0, port, "Disabling EC on both Sides\n");
+                       chan_misdn_log(1, port, "Disabling EC on both Sides\n");
                        ch->bc->ec_enable=0;
                        ch->other_ch->bc->ec_enable=0;
 #endif

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 73ee200963a884106a29cd2bf55e4d8a90035fac..194b07bd7515496f9bd4ce44514df06bbf3c809b 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -429,9 +429,11 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int d
        }
        
        channel--;
+
+       int bnums=stack->pri?stack->b_num:stack->b_num-1;
  
        if (dec) {
-               for (i = stack->b_num-1; i >=0; i--) {
+               for (i = bnums; i >=0; i--) {
                        if (i != 15 && (channel < 0 || i == channel)) { /* skip E1 Dchannel ;) and work with chan preselection */
                                if (!stack->channels[i]) {
                                        cb_log (3, stack->port, " --> found chan%s: %d\n", channel>=0?" (preselected)":"", i+1);
@@ -440,7 +442,7 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, int channel, int d
                        }
                }
        } else {
-               for (i = 0; i < stack->b_num; i++) {
+               for (i = 0; i <= bnums; i++) {
                        if (i != 15 && (channel < 0 || i == channel)) { /* skip E1 Dchannel ;) and work with chan preselection */
                                if (!stack->channels[i]) {
                                        cb_log (3, stack->port, " --> found chan%s: %d\n", channel>=0?" (preselected)":"", i+1);