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

Merged revisions 60456 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r60456 | mattf | 2007-04-06 12:03:15 -0500 (Fri, 06 Apr 2007) | 2 lines

There should only be one code path for doing DTMF conditionals on channels.  This fixes it.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@60459 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Fredrickson
2007-04-06 17:32:31 +00:00
parent f6ab517b3f
commit 96a8eadf29
1 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
channels/chan_zap.c
View File

@@ -3580,6 +3580,73 @@ static int get_alarms(struct zt_pvt *p)
}
return zi.alarms;
}
static void zt_handle_dtmfup(struct ast_channel *ast, int index, struct ast_frame **dest)
{
struct zt_pvt *p = ast->tech_pvt;
struct ast_frame *f = *dest;
ast_log(LOG_DEBUG, "DTMF digit: %c on %s\n", f->subclass, ast->name);
if (p->confirmanswer) {
ast_log(LOG_DEBUG, "Confirm answer on %s!\n", ast->name);
/* Upon receiving a DTMF digit, consider this an answer confirmation instead
of a DTMF digit */
p->subs[index].f.frametype = AST_FRAME_CONTROL;
p->subs[index].f.subclass = AST_CONTROL_ANSWER;
*dest = &p->subs[index].f;
/* Reset confirmanswer so DTMF's will behave properly for the duration of the call */
p->confirmanswer = 0;
} else if (p->callwaitcas) {
if ((f->subclass == 'A') || (f->subclass == 'D')) {
ast_log(LOG_DEBUG, "Got some DTMF, but it's for the CAS\n");
if (p->cidspill)
free(p->cidspill);
send_cwcidspill(p);
}
if ((f->subclass != 'm') && (f->subclass != 'u'))
p->callwaitcas = 0;
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
*dest = &p->subs[index].f;
} else if (f->subclass == 'f') {
/* Fax tone -- Handle and return NULL */
if (!p->faxhandled) {
p->faxhandled++;
if (strcmp(ast->exten, "fax")) {
const char *target_context = S_OR(ast->macrocontext, ast->context);
if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->name);
/* Save the DID/DNIS when we transfer the fax call to a "fax" extension */
pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten);
if (ast_async_goto(ast, target_context, "fax", 1))
ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, target_context);
} else
ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
} else
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
} else
ast_log(LOG_DEBUG, "Fax already handled\n");
zt_confmute(p, 0);
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
*dest = &p->subs[index].f;
} else if (f->subclass == 'm') {
/* Confmute request */
zt_confmute(p, 1);
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
*dest = &p->subs[index].f;
} else if (f->subclass == 'u') {
/* Unmute */
zt_confmute(p, 0);
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
*dest = &p->subs[index].f;
} else
zt_confmute(p, 0);
}
static struct ast_frame *zt_handle_event(struct ast_channel *ast)
{
@@ -3590,6 +3657,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
pthread_t threadid;
pthread_attr_t attr;
struct ast_channel *chan;
struct ast_frame *f;
index = zt_get_index(ast, p, 0);
mysig = p->sig;
@@ -3603,6 +3671,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
p->subs[index].f.offset = 0;
p->subs[index].f.src = "zt_handle_event";
p->subs[index].f.data = NULL;
f = &p->subs[index].f;
if (index < 0)
return &p->subs[index].f;
if (p->fake_event) {
@@ -3615,6 +3685,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
if (res & (ZT_EVENT_PULSEDIGIT | ZT_EVENT_DTMFUP)) {
p->pulsedial = (res & ZT_EVENT_PULSEDIGIT) ? 1 : 0;
ast_log(LOG_DEBUG, "Detected %sdigit '%c'\n", p->pulsedial ? "pulse ": "", res & 0xff);
#ifdef HAVE_PRI
if (!p->proceeding && p->sig == SIG_PRI && p->pri && p->pri->overlapdial) {
@@ -3626,9 +3697,8 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
#ifdef HAVE_PRI
}
#endif
/* Unmute conference, return the captured digit */
zt_confmute(p, 0);
return &p->subs[index].f;
zt_handle_dtmfup(ast, index, &f);
return f;
}
if (res & ZT_EVENT_DTMFDOWN) {
@@ -4786,68 +4856,9 @@ static struct ast_frame *zt_read(struct ast_channel *ast)
}
} else
f = &p->subs[index].f;
if (f && (f->frametype == AST_FRAME_DTMF)) {
ast_log(LOG_DEBUG, "DTMF digit: %c on %s\n", f->subclass, ast->name);
if (p->confirmanswer) {
ast_log(LOG_DEBUG, "Confirm answer on %s!\n", ast->name);
/* Upon receiving a DTMF digit, consider this an answer confirmation instead
of a DTMF digit */
p->subs[index].f.frametype = AST_FRAME_CONTROL;
p->subs[index].f.subclass = AST_CONTROL_ANSWER;
f = &p->subs[index].f;
/* Reset confirmanswer so DTMF's will behave properly for the duration of the call */
p->confirmanswer = 0;
} else if (p->callwaitcas) {
if ((f->subclass == 'A') || (f->subclass == 'D')) {
ast_log(LOG_DEBUG, "Got some DTMF, but it's for the CAS\n");
if (p->cidspill)
free(p->cidspill);
send_cwcidspill(p);
}
if ((f->subclass != 'm') && (f->subclass != 'u'))
p->callwaitcas = 0;
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
f = &p->subs[index].f;
} else if (f->subclass == 'f') {
/* Fax tone -- Handle and return NULL */
if (!p->faxhandled) {
p->faxhandled++;
if (strcmp(ast->exten, "fax")) {
const char *target_context = S_OR(ast->macrocontext, ast->context);
if (ast_exists_extension(ast, target_context, "fax", 1, ast->cid.cid_num)) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Redirecting %s to fax extension\n", ast->name);
/* Save the DID/DNIS when we transfer the fax call to a "fax" extension */
pbx_builtin_setvar_helper(ast, "FAXEXTEN", ast->exten);
if (ast_async_goto(ast, target_context, "fax", 1))
ast_log(LOG_WARNING, "Failed to async goto '%s' into fax of '%s'\n", ast->name, target_context);
} else
ast_log(LOG_NOTICE, "Fax detected, but no fax extension\n");
} else
ast_log(LOG_DEBUG, "Already in a fax extension, not redirecting\n");
} else
ast_log(LOG_DEBUG, "Fax already handled\n");
zt_confmute(p, 0);
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
f = &p->subs[index].f;
} else if (f->subclass == 'm') {
/* Confmute request */
zt_confmute(p, 1);
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
f = &p->subs[index].f;
} else if (f->subclass == 'u') {
/* Unmute */
zt_confmute(p, 0);
p->subs[index].f.frametype = AST_FRAME_NULL;
p->subs[index].f.subclass = 0;
f = &p->subs[index].f;
} else
zt_confmute(p, 0);
}
if (f && (f->frametype == AST_FRAME_DTMF))
zt_handle_dtmfup(ast, index, &f);
/* If we have a fake_event, trigger exception to handle it */
if (p->fake_event)