diff --git a/daemon/call.c b/daemon/call.c index 644882f22..29d379650 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -271,7 +271,7 @@ next: goto out; // update every 5 minutes - if (has_srtp && timeval_from_us(rtpe_now).tv_sec - atomic64_get_na(&c->last_redis_update) > 60*5) + if (has_srtp && rtpe_now - atomic64_get_na(&c->last_redis_update_us) > 60*5*1000000LL) do_update = true; goto out; diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c index f659b6834..40f4d117e 100644 --- a/daemon/call_interfaces.c +++ b/daemon/call_interfaces.c @@ -3099,7 +3099,7 @@ void ng_call_stats(ng_command_ctx_t *ctx, call_t *call, const str *fromtag, cons parser->dict_add_int(ctx->resp, "created_us", call->created % 1000000L); parser->dict_add_int(ctx->resp, "created_ts", call->created); parser->dict_add_int(ctx->resp, "last signal", call->last_signal_us / 1000000L); - parser->dict_add_int(ctx->resp, "last redis update", atomic64_get_na(&call->last_redis_update)); + parser->dict_add_int(ctx->resp, "last redis update", atomic64_get_na(&call->last_redis_update_us) / 1000000L); if (call->metadata.s) parser->dict_add_str(ctx->resp, "metadata", &call->metadata); diff --git a/daemon/cli.c b/daemon/cli.c index 9a4f0aa64..d5399dc18 100644 --- a/daemon/cli.c +++ b/daemon/cli.c @@ -697,13 +697,13 @@ static void cli_list_call_info(struct cli_writer *cw, call_t *c) { "tos: %u\n" "last_signal: %" PRId64 "\n" "redis_keyspace: %i\n" - "last redis update: %llu\n" + "last redis update: %" PRId64 "\n" "foreign: %s\n" "recording: %s\n" "\n", c->callid.s, c->ml_deleted_us ? "yes" : "no", c->created / 1000000, c->created_from, (unsigned int) c->tos, c->last_signal_us / 1000000L, c->redis_hosted_db, - (unsigned long long) atomic64_get_na(&c->last_redis_update), + atomic64_get_na(&c->last_redis_update_us), IS_FOREIGN_CALL(c) ? "yes" : "no", c->recording ? "yes" : "no"); for (__auto_type l = c->monologues.head; l; l = l->next) { diff --git a/daemon/redis.c b/daemon/redis.c index 8228adba6..52d1232e7 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -2781,7 +2781,7 @@ void redis_update_onekey(call_t *c, struct redis *r) { if (redis_check_conn(r) == REDIS_STATE_DISCONNECTED) return; - atomic64_set_na(&c->last_redis_update, timeval_from_us(rtpe_now).tv_sec); + atomic64_set_na(&c->last_redis_update_us, rtpe_now); rwlock_lock_r(&c->master_lock); diff --git a/include/call.h b/include/call.h index b5b2ffa93..13d38a856 100644 --- a/include/call.h +++ b/include/call.h @@ -780,7 +780,7 @@ struct call { endpoint_t dtmf_log_dest; int redis_hosted_db; - atomic64 last_redis_update; + atomic64 last_redis_update_us; struct recording *recording; str metadata;