kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add incomplete matching to PBX code and app_dial

Browse Source 
(closes issue #12351)
 Reported by: Corydon76
 Patches: 
       20080402__pbx_incomplete__3.diff.txt uploaded by Corydon76 (license 14)
       pbx_incomplete_with_timeout.diff uploaded by fabled (license 448)
 Tested by: Corydon76, fabled


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114773 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-04-28 16:37:45 +00:00
parent a4d544714c
commit 6a81da594d
3 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/app_dial.c
View File

@@ -1619,6 +1619,13 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
} else { /* Nobody answered, next please? */
res = 0;
}
/* SIP, in particular, sends back this error code to indicate an
* overlap dialled number needs more digits. */
if (chan->hangupcause == AST_CAUSE_INVALID_NUMBER_FORMAT) {
res = AST_PBX_INCOMPLETE;
}
/* almost done, although the 'else' block is 400 lines */
} else {
const char *number;
@@ -1958,7 +1965,7 @@ out:
senddialendevent(chan, pa.status);
ast_debug(1, "Exiting with DIALSTATUS=%s.\n", pa.status);
if ((ast_test_flag64(peerflags, OPT_GO_ON)) && !ast_check_hangup(chan) && (res != AST_PBX_KEEPALIVE)) {
if ((ast_test_flag64(peerflags, OPT_GO_ON)) && !ast_check_hangup(chan) && (res != AST_PBX_KEEPALIVE) && (res != AST_PBX_INCOMPLETE)) {
if (calldurationlimit)
chan->whentohangup = 0;
res = 0;
@@ -2059,9 +2066,9 @@ static int retrydial_exec(struct ast_channel *chan, void *data)
}
}
if (res < 0)
if (res < 0 || res == AST_PBX_INCOMPLETE) {
break;
else if (res > 0) { /* Trying to send the call elsewhere (1 digit ext) */
} else if (res > 0) { /* Trying to send the call elsewhere (1 digit ext) */
if (onedigit_goto(chan, context, (char) res, 1)) {
res = 0;
break;