kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a hold/retrieve issue.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@82249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Christian Richter
2007-09-11 16:01:27 +00:00
parent faad24c675
commit 370b3437ee
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/chan_misdn.c
View File

@@ -4687,7 +4687,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ret=write(ch->pipe[1], bc->bframe, bc->bframe_len);
if (ret<=0) {
chan_misdn_log(-1, bc->port, "Write returned <=0 (err=%s) --> hanging up channel\n",strerror(errno));
chan_misdn_log(0, bc->port, "Write returned <=0 (err=%s) --> hanging up channel\n",strerror(errno));
stop_bc_tones(ch);
hangup_chan(ch);
@@ -4754,7 +4754,7 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
{
struct ast_channel *hold_ast;
if (!ch) {
chan_misdn_log(4, bc->port, " --> no CH, searching in holded");
chan_misdn_log(4, bc->port, " --> no CH, searching in holded\n");
ch=find_holded_l3(cl_te, bc->l3_id,1);
}
@@ -4777,8 +4777,10 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ast_moh_stop(hold_ast);
}
if ( misdn_lib_send_event(bc, EVENT_RETRIEVE_ACKNOWLEDGE) < 0)
if ( misdn_lib_send_event(bc, EVENT_RETRIEVE_ACKNOWLEDGE) < 0) {
chan_misdn_log(4, bc->port, " --> RETRIEVE_ACK failed\n");
misdn_lib_send_event(bc, EVENT_RETRIEVE_REJECT);
}
}
break;

2
channels/misdn/isdn_lib.c
View File

@@ -1824,6 +1824,7 @@ handle_event_nt(void *dat, void *arg)
free(hold_bc);
bc->holded=0;
bc->b_stid=0;
}
}
@@ -2860,7 +2861,6 @@ static int handle_mgmt(msg_t *msg)
case SSTATUS_L1_DEACTIVATED:
cb_log(3, 0, "MGMT: SSTATUS: L1_DEACTIVATED \n");
stack->l1link=0;
clear_l3(stack);
break;