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

app_dial: Fix progress timeout calculation with no answer timeout.

Browse Source 
If to_answer is -1, simply comparing to see if the progress timeout
is smaller than the answer timeout to prefer it will fail. Add
an additional check that chooses the progress timeout if there is
no answer timeout (or as before, if the progress timeout is smaller).

Resolves: #821
(cherry picked from commit 6a6f962acb)
This commit is contained in:
Naveen Albert
2024-10-16 17:46:42 -04:00
committed by Asterisk Development Team
parent f85838fb93
commit e66f69d45e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_dial.c
View File

@@ -1349,7 +1349,7 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in,
}
/* If progress timeout is active, use that if it's the shorter of the 2 timeouts. */
winner = ast_waitfor_n(watchers, pos, *to_progress > 0 && *to_progress < *to_answer ? to_progress : to_answer);
winner = ast_waitfor_n(watchers, pos, *to_progress > 0 && (*to_answer < 0 || *to_progress < *to_answer) ? to_progress : to_answer);
AST_LIST_TRAVERSE(out_chans, o, node) {
int res = 0;