mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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: https://origsvn.digium.com/svn/asterisk/branches/1.4@58826 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user