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

- Pass each PROGRESS-type to Asterisk, but only once. 

- enable early-b3 on each PROGRESS-Indicator type.
This commit is contained in:
MelwareDE 2005-09-04 13:51:50 +00:00
parent 92ae437462
commit 874567ff21
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
chan_capi.c
View File

@ -1708,6 +1708,21 @@ static int search_did(struct ast_channel *c)
return -1;
}
/*
* signal 'progress' to Asterisk
*/
static void send_progress(struct ast_capi_pvt *i)
{
struct ast_frame fr;
if (!(i->isdnstate & CAPI_ISDN_STATE_PROGRESS)) {
i->isdnstate |= CAPI_ISDN_STATE_PROGRESS;
fr.frametype = AST_FRAME_CONTROL;
fr.subclass = AST_CONTROL_PROGRESS;
pipe_frame(i, &fr);
}
}
/*
* Progress Indicator
*/
@ -1746,21 +1761,22 @@ static void handle_progress_indicator(_cmsg *CMSG, unsigned int PLCI, struct ast
case 0x08:
cc_ast_verbose(4, 1, VERBOSE_PREFIX_4 "%s: In-band information available\n",
i->name);
if ((i->doB3 != AST_CAPI_B3_DONT) &&
(i->earlyB3 == -1) &&
(i->state != CAPI_STATE_BCONNECTED)) {
/* we do early B3 Connect */
i->earlyB3 = 1;
memset(&CMSG2, 0, sizeof(_cmsg));
CONNECT_B3_REQ_HEADER(&CMSG2, ast_capi_ApplID, get_ast_capi_MessageNumber(), 0);
CONNECT_B3_REQ_PLCI(&CMSG2) = PLCI;
_capi_put_cmsg(&CMSG2);
}
break;
default:
cc_ast_verbose(3, 1, VERBOSE_PREFIX_4 "%s: Unknown progress description %02x\n",
i->name, INFO_IND_INFOELEMENT(CMSG)[2]);
}
if ((i->doB3 != AST_CAPI_B3_DONT) &&
(i->earlyB3 == -1) &&
(i->state != CAPI_STATE_BCONNECTED)) {
/* we do early B3 Connect */
i->earlyB3 = 1;
memset(&CMSG2, 0, sizeof(_cmsg));
CONNECT_B3_REQ_HEADER(&CMSG2, ast_capi_ApplID, get_ast_capi_MessageNumber(), 0);
CONNECT_B3_REQ_PLCI(&CMSG2) = PLCI;
_capi_put_cmsg(&CMSG2);
}
send_progress(i);
}
/*
@ -2109,9 +2125,7 @@ static void capi_handle_info_indication(_cmsg *CMSG, unsigned int PLCI, unsigned
break;
}
}
fr.frametype = AST_FRAME_CONTROL;
fr.subclass = AST_CONTROL_PROGRESS;
pipe_frame(i, &fr);
send_progress(i);
break;
case 0x8005: /* SETUP */
cc_ast_verbose(3, 1, VERBOSE_PREFIX_3 "%s: info element SETUP\n",

9
chan_capi.h
View File

@ -167,10 +167,11 @@ struct ast_capi_gains {
unsigned char rxgains[256];
};
#define CAPI_ISDN_STATE_SETUP 0x01
#define CAPI_ISDN_STATE_SETUP_ACK 0x02
#define CAPI_ISDN_STATE_HOLD 0x04
#define CAPI_ISDN_STATE_ECT 0x08
#define CAPI_ISDN_STATE_SETUP 0x0001
#define CAPI_ISDN_STATE_SETUP_ACK 0x0002
#define CAPI_ISDN_STATE_HOLD 0x0004
#define CAPI_ISDN_STATE_ECT 0x0008
#define CAPI_ISDN_STATE_PROGRESS 0x0010
/* ! Private data for a capi device */
struct ast_capi_pvt {