kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-05 20:51:51 +00:00
Code Issues Projects Releases Wiki Activity

minor tweaks

Browse Source
This commit is contained in:
Anthony Minessale 2010-10-05 10:50:07 -05:00
parent b24231587c
commit 748b82f640
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_ivr_async.c
View File

@ -71,8 +71,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_create(switch_ivr_dmachine_t
switch_byte_t my_pool = !!pool; switch_byte_t my_pool = !!pool;
switch_ivr_dmachine_t *dmachine; switch_ivr_dmachine_t *dmachine;
if (digit_timeout_ms < 1 || input_timeout_ms < 1) return SWITCH_STATUS_FALSE;
if (!pool) { if (!pool) {
switch_core_new_memory_pool(&pool); switch_core_new_memory_pool(&pool);
} }
@ -229,9 +227,13 @@ static switch_bool_t switch_ivr_dmachine_check_timeout(switch_ivr_dmachine_t *dm
{ {
switch_time_t now = switch_time_now(); switch_time_t now = switch_time_now();
uint32_t timeout = dmachine->cur_digit_len ? dmachine->digit_timeout_ms : dmachine->input_timeout_ms; uint32_t timeout = dmachine->cur_digit_len ? dmachine->digit_timeout_ms : dmachine->input_timeout_ms;
if ((uint32_t)((now - dmachine->last_digit_time) / 1000) > timeout) { if (!dmachine->last_digit_time) dmachine->last_digit_time = now;
return SWITCH_TRUE;
if (timeout) {
if ((uint32_t)((now - dmachine->last_digit_time) / 1000) > timeout) {
return SWITCH_TRUE;
}
} }
return SWITCH_FALSE; return SWITCH_FALSE;
@ -253,7 +255,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_ping(switch_ivr_dmachine_t *
dm_match_t is_match = switch_ivr_dmachine_check_match(dmachine, is_timeout); dm_match_t is_match = switch_ivr_dmachine_check_match(dmachine, is_timeout);
switch_status_t r; switch_status_t r;
if (!dmachine->last_digit_time) { if (zstr(dmachine->digits) && !is_timeout) {
r = SWITCH_STATUS_SUCCESS; r = SWITCH_STATUS_SUCCESS;
} else if (dmachine->cur_digit_len > dmachine->max_digit_len) { } else if (dmachine->cur_digit_len > dmachine->max_digit_len) {
r = SWITCH_STATUS_FALSE; r = SWITCH_STATUS_FALSE;