kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch

This commit is contained in:
Brian West 2015-02-19 14:31:43 -06:00
parent 497605821d 5febdbbc08
commit 5173675d9f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mod/applications/mod_callcenter/mod_callcenter.c
View File

@ -1794,8 +1794,9 @@ static void *SWITCH_THREAD_FUNC outbound_agent_thread_run(switch_thread_t *threa
} else {
/* Agent didn't answer or originate failed */
int delay_next_agent_call = 0;
sql = switch_mprintf("UPDATE members SET state = '%q', serving_agent = '', serving_system = ''"
sql = switch_mprintf("UPDATE members SET state = case state when '%q' then '%q' else state end, serving_agent = '', serving_system = ''"
" WHERE serving_agent = '%q' AND serving_system = '%q' AND uuid = '%q' AND system = 'single_box'",
cc_member_state2str(CC_MEMBER_STATE_TRYING), /* Only switch to Waiting from Trying (state may be set to Abandoned in callcenter_function()) */
cc_member_state2str(CC_MEMBER_STATE_WAITING),
h->agent_name, h->agent_system, h->member_uuid);
cc_execute_sql(NULL, sql, NULL);

2
src/mod/codecs/mod_com_g729/Makefile.am
View File

@ -1,7 +1,7 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_com_g729
VERSION=194
VERSION=201501231218
if ISLINUX

12
src/switch_time.c
View File

@ -416,9 +416,9 @@ static switch_status_t timerfd_start_interval(interval_timer_t *it, int interval
val.it_interval.tv_sec = interval / 1000;
val.it_interval.tv_nsec = (interval % 1000) * 1000000;
val.it_value.tv_sec = 0;
val.it_value.tv_nsec = val.it_interval.tv_nsec;
val.it_value.tv_nsec = 100000;
if (timerfd_settime(fd, TFD_TIMER_ABSTIME, &val, NULL) < 0) {
if (timerfd_settime(fd, 0, &val, NULL) < 0) {
close(fd);
return SWITCH_STATUS_GENERR;
}
@ -1038,10 +1038,10 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
if (tfd > -1) {
spec.it_interval.tv_sec = 0;
spec.it_interval.tv_nsec = runtime.microseconds_per_tick * 1000;
spec.it_value.tv_sec = spec.it_interval.tv_sec;
spec.it_value.tv_nsec = spec.it_interval.tv_nsec;
spec.it_value.tv_sec = 0;
spec.it_value.tv_nsec = 100000;
if (timerfd_settime(tfd, TFD_TIMER_ABSTIME, &spec, NULL)) {
if (timerfd_settime(tfd, 0, &spec, NULL)) {
close(tfd);
tfd = -1;
}
@ -1109,7 +1109,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(softtimer_runtime)
#ifdef HAVE_TIMERFD_CREATE
if (last_MICROSECONDS_PER_TICK != runtime.microseconds_per_tick) {
spec.it_interval.tv_nsec = runtime.microseconds_per_tick * 1000;
timerfd_settime(tfd, TFD_TIMER_ABSTIME, &spec, NULL);
timerfd_settime(tfd, 0, &spec, NULL);
}
last_MICROSECONDS_PER_TICK = runtime.microseconds_per_tick;