diff options
author | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-02 07:38:38 +0000 |
---|---|---|
committer | automerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-04-02 07:38:38 +0000 |
commit | ffe3f8ff345f6d38e4beec4801a4d25428dd1d1d (patch) | |
tree | 8f75618e8592f727b668522ec4965b31be961be7 | |
parent | c87e9105a91c95f978f075879e0b4ee80d21fad0 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59638 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_misdn.c | 4 | ||||
-rw-r--r-- | channels/misdn/isdn_lib.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index 48c8063e6..ec38f47bf 100644 --- 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 73ee20096..194b07bd7 100644 --- 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); |