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

- simplified call to ast_exists_extension()

This commit is contained in:
MelwareDE 2005-09-27 17:52:13 +00:00
parent ff47191932
commit 47df07e707
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
chan_capi.c
View File

@ -1084,11 +1084,7 @@ struct ast_frame *capi_read(struct ast_channel *c)
}
if ((i->fr.frametype == AST_FRAME_DTMF) && (i->fr.subclass == 'f')) {
if (strcmp(c->exten, "fax")) {
#ifdef CC_AST_CHANNEL_HAS_CID
if (ast_exists_extension(c, ast_strlen_zero(c->macrocontext) ? c->context : c->macrocontext, "fax", 1, c->cid.cid_num)) {
#else
if (ast_exists_extension(c, ast_strlen_zero(c->macrocontext) ? c->context : c->macrocontext, "fax", 1, c->callerid)) {
#endif
if (ast_exists_extension(c, ast_strlen_zero(c->macrocontext) ? c->context : c->macrocontext, "fax", 1, i->cid)) {
cc_ast_verbose(2, 0, VERBOSE_PREFIX_3 "%s: Redirecting %s to fax extension\n",
i->name, c->name);
/* Save the DID/DNIS when we transfer the fax call to a "fax" extension */
@ -1753,7 +1749,6 @@ static int capi_receive_fax(struct ast_channel *c, char *data)
static void capi_handle_dtmf_fax(struct ast_channel *ast)
{
struct ast_capi_pvt *p;
char *cid;
if (!ast) {
ast_log(LOG_ERROR, "No channel!\n");
@ -1772,12 +1767,8 @@ static void capi_handle_dtmf_fax(struct ast_channel *ast)
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
return;
}
#ifdef CC_AST_CHANNEL_HAS_CID
cid = ast->cid.cid_num;
#else
cid = ast->callerid;
#endif
if (!ast_exists_extension(ast, ast->context, "fax", 1, cid)) {
if (!ast_exists_extension(ast, ast->context, "fax", 1, p->cid)) {
cc_ast_verbose(3, 0, VERBOSE_PREFIX_3 "Fax tone detected, but no fax extension for %s\n", ast->name);
return;
}