retronetworking
/
chan-capi
mirror of https://github.com/MelwareDE/chan-capi.git
13
0
Fork 0
Code Issues Projects Releases Wiki Activity

- handle errors in CONNECT_CONF correctly

This commit is contained in:
MelwareDE 2006-07-08 18:40:20 +00:00
parent c7ce547983
commit e9b36aa1af
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chan_capi.c
View File

@ -1397,16 +1397,17 @@ static int pbx_capi_call(struct ast_channel *c, char *idest, int timeout)
i->outgoing = 1; i->outgoing = 1;
i->isdnstate |= CAPI_ISDN_STATE_PBX; i->isdnstate |= CAPI_ISDN_STATE_PBX;
i->state = CAPI_STATE_CONNECTPENDING;
ast_setstate(c, AST_STATE_DIALING);
if ((error = _capi_put_cmsg_wait_conf(i, &CMSG))) { if ((error = _capi_put_cmsg_wait_conf(i, &CMSG))) {
i->state = CAPI_STATE_DISCONNECTED;
ast_setstate(c, AST_STATE_RESERVED);
cc_mutex_unlock(&i->lock); cc_mutex_unlock(&i->lock);
return error; return error;
} }
i->state = CAPI_STATE_CONNECTPENDING;
cc_mutex_unlock(&i->lock); cc_mutex_unlock(&i->lock);
ast_setstate(c, AST_STATE_DIALING);
/* now we shall return .... the rest has to be done by handle_msg */ /* now we shall return .... the rest has to be done by handle_msg */
return 0; return 0;
} }
@ -3845,7 +3846,8 @@ static void capidev_handle_msg(_cmsg *CMSG)
if (wInfo == 0) { if (wInfo == 0) {
i->PLCI = PLCI; i->PLCI = PLCI;
} else { } else {
/* here, something has to be done --> */ /* error in connect, so set correct state and signal busy */
i->state = CAPI_STATE_DISCONNECTED;
struct ast_frame fr = { AST_FRAME_CONTROL, AST_CONTROL_BUSY, }; struct ast_frame fr = { AST_FRAME_CONTROL, AST_CONTROL_BUSY, };
local_queue_frame(i, &fr); local_queue_frame(i, &fr);
} }