diff options
| author | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-12 13:08:06 +0000 |
|---|---|---|
| committer | crichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-12 13:08:06 +0000 |
| commit | 52f3cfaa1fccdd1551e50c8383e50a80979e4924 (patch) | |
| tree | 6409c884ea4ae289a07fdf2ed82827ac3c532356 /channels/misdn | |
| parent | d3d44c7d2adb5f650b9cf32e84be2975d7de4903 (diff) | |
Merged revisions 57034,57523,57753,58558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r57034 | crichter | 2007-02-28 17:09:27 +0100 (Mi, 28 Feb 2007) | 1 line
fixed bugs.digium.com bugs: #9157 and bugs.beronet.com bugs: #302, #303, #304
........
r57523 | crichter | 2007-03-02 19:32:51 +0100 (Fr, 02 Mar 2007) | 1 line
fixed typo
........
r57753 | crichter | 2007-03-04 11:39:50 +0100 (So, 04 Mar 2007) | 1 line
fixed another place where the out_cause was hardcoded to 16
........
r58558 | crichter | 2007-03-09 15:43:58 +0100 (Fr, 09 Mar 2007) | 1 line
we can free channel 31 as well, since we can occupy it
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@58826 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/misdn')
| -rw-r--r-- | channels/misdn/isdn_lib.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 8f587e5d0..13e6a8207 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -463,7 +463,7 @@ static int find_free_chan_in_stack(struct misdn_stack *stack, struct misdn_bchan static int empty_chan_in_stack(struct misdn_stack *stack, int channel) { - if (channel<=0 || channel>=MAX_BCHANS) { + if (channel<=0 || channel>MAX_BCHANS) { cb_log(0,stack?stack->port:0, "empty_chan_in_stack: cannot empty channel %d\n",channel); return -1; } @@ -1534,8 +1534,10 @@ static int handle_event ( struct misdn_bchannel *bc, enum event_e event, iframe_ if (bc->channel>0) empty_chan_in_stack(stack,bc->channel); int tmpcause=bc->cause; + int tmp_out_cause=bc->out_cause; empty_bc(bc); bc->cause=tmpcause; + bc->out_cause=tmp_out_cause; clean_up_bc(bc); break; default: @@ -3331,8 +3333,10 @@ int misdn_lib_send_event(struct misdn_bchannel *bc, enum event_e event ) if (bc->channel>0) empty_chan_in_stack(stack,bc->channel); int tmpcause=bc->cause; + int tmp_out_cause=bc->out_cause; empty_bc(bc); bc->cause=tmpcause; + bc->out_cause=tmp_out_cause; clean_up_bc(bc); } break; |