diff options
Diffstat (limited to 'main/channel.c')
-rw-r--r-- | main/channel.c | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/main/channel.c b/main/channel.c index b422c254d..2a5728754 100644 --- a/main/channel.c +++ b/main/channel.c @@ -1327,21 +1327,39 @@ struct ast_channel *ast_channel_search_locked(int (*is_match)(struct ast_channel int ast_safe_sleep_conditional(struct ast_channel *chan, int ms, int (*cond)(void*), void *data) { struct ast_frame *f; + struct ast_silence_generator *silgen = NULL; + int res = 0; + + /* If no other generator is present, start silencegen while waiting */ + if (ast_opt_transmit_silence && !chan->generatordata) { + silgen = ast_channel_start_silence_generator(chan); + } while (ms > 0) { - if (cond && ((*cond)(data) == 0)) - return 0; + if (cond && ((*cond)(data) == 0)) { + break; + } ms = ast_waitfor(chan, ms); - if (ms < 0) - return -1; + if (ms < 0) { + res = -1; + break; + } if (ms > 0) { f = ast_read(chan); - if (!f) - return -1; + if (!f) { + res = -1; + break; + } ast_frfree(f); } } - return 0; + + /* stop silgen if present */ + if (silgen) { + ast_channel_stop_silence_generator(chan, silgen); + } + + return res; } /*! \brief Wait, look for hangups */ |