提交 503db7b2 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-10675: [mod_fifo] Wrap Up + fifo_caller_exit_key in mod_fifo #resolve

上级 5bb6e348
...@@ -3575,7 +3575,6 @@ SWITCH_STANDARD_APP(fifo_function) ...@@ -3575,7 +3575,6 @@ SWITCH_STANDARD_APP(fifo_function)
if (fifo_consumer_wrapup_time) { if (fifo_consumer_wrapup_time) {
wrapup_time_started = switch_micro_time_now(); wrapup_time_started = switch_micro_time_now();
}
if (!zstr(fifo_consumer_wrapup_key) && strcmp(buf, fifo_consumer_wrapup_key)) { if (!zstr(fifo_consumer_wrapup_key) && strcmp(buf, fifo_consumer_wrapup_key)) {
while (switch_channel_ready(channel)) { while (switch_channel_ready(channel)) {
...@@ -3596,7 +3595,7 @@ SWITCH_STANDARD_APP(fifo_function) ...@@ -3596,7 +3595,7 @@ SWITCH_STANDARD_APP(fifo_function)
break; break;
} }
} }
} else if (fifo_consumer_wrapup_time && (zstr(fifo_consumer_wrapup_key) || !strcmp(buf, fifo_consumer_wrapup_key))) { } else if ((zstr(fifo_consumer_wrapup_key) || !strcmp(buf, fifo_consumer_wrapup_key))) {
while (switch_channel_ready(channel)) { while (switch_channel_ready(channel)) {
wrapup_time_elapsed = (switch_micro_time_now() - wrapup_time_started) / 1000; wrapup_time_elapsed = (switch_micro_time_now() - wrapup_time_started) / 1000;
if (wrapup_time_elapsed > fifo_consumer_wrapup_time) { if (wrapup_time_elapsed > fifo_consumer_wrapup_time) {
...@@ -3605,6 +3604,8 @@ SWITCH_STANDARD_APP(fifo_function) ...@@ -3605,6 +3604,8 @@ SWITCH_STANDARD_APP(fifo_function)
switch_yield(500); switch_yield(500);
} }
} }
}
switch_channel_set_variable(channel, "fifo_status", "WAITING"); switch_channel_set_variable(channel, "fifo_status", "WAITING");
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论