sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#55283 convert timestamp/check to int64_t

Browse Source 
Change-Id: If669a04aff9e24ee3b4775e4e7c7ba6c006f0445
master
Richard Fuchs 3 weeks ago
parent 27ce6148ce
commit 9405f3df63
1 changed files with 8 additions and 8 deletions

16
daemon/call.c
Unescape View File

@ -124,7 +124,7 @@ void call_make_own_foreign(call_t *c, bool foreign) {
/* called with hashlock held */ /* called with hashlock held */
static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) { static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) {
unsigned int check; int64_t check;
bool good = false; bool good = false;
bool do_update = false; bool do_update = false;
bool has_srtp = false; bool has_srtp = false;
@ -132,7 +132,7 @@ static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) {
stream_fd *sfd; stream_fd *sfd;
int tmp_t_reason = UNKNOWN; int tmp_t_reason = UNKNOWN;
enum call_stream_state css; enum call_stream_state css;
uint64_t timestamp; int64_t timestamp;
hlp->count++; hlp->count++;
@ -182,7 +182,7 @@ static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) {
for (__auto_type it = c->streams.head; it; it = it->next) { for (__auto_type it = c->streams.head; it; it = it->next) {
ps = it->data; ps = it->data;
timestamp = packet_stream_last_packet(ps) / 1000000L; timestamp = packet_stream_last_packet(ps);
if (!ps->media) if (!ps->media)
goto next; goto next;
@ -195,7 +195,7 @@ static void call_timer_iterator(call_t *c, struct iterator_helper *hlp) {
css = call_stream_state_machine(ps); css = call_stream_state_machine(ps);
if (css == CSS_ICE) if (css == CSS_ICE)
timestamp = atomic64_get_na(&ps->media->ice_agent->last_activity) / 1000000; // XXX timestamp = atomic64_get_na(&ps->media->ice_agent->last_activity);
if (PS_ISSET(ps, RTP)) { if (PS_ISSET(ps, RTP)) {
if (rtpe_now - atomic64_get_na(&ps->stats_in->last_packet_us) < 2000000LL) { if (rtpe_now - atomic64_get_na(&ps->stats_in->last_packet_us) < 2000000LL) {
@ -237,18 +237,18 @@ no_sfd:
if (good) if (good)
goto next; goto next;
check = atomic_get_na(&rtpe_config.timeout); check = atomic_get_na(&rtpe_config.timeout) * 1000000L; // XXX scale to micro
tmp_t_reason = TIMEOUT; tmp_t_reason = TIMEOUT;
if (!MEDIA_ISSET(ps->media, RECV) || !sfd) { if (!MEDIA_ISSET(ps->media, RECV) || !sfd) {
check = atomic_get_na(&rtpe_config.silent_timeout); check = atomic_get_na(&rtpe_config.silent_timeout) * 1000000L; // XXX scale to micro
tmp_t_reason = SILENT_TIMEOUT; tmp_t_reason = SILENT_TIMEOUT;
} }
else if (!PS_ISSET(ps, FILLED)) { else if (!PS_ISSET(ps, FILLED)) {
check = atomic_get_na(&rtpe_config.offer_timeout); check = atomic_get_na(&rtpe_config.offer_timeout) * 1000000L; // XXX scale to micro
tmp_t_reason = OFFER_TIMEOUT; tmp_t_reason = OFFER_TIMEOUT;
} }
if (timestamp > timeval_from_us(rtpe_now).tv_sec || timeval_from_us(rtpe_now).tv_sec - timestamp < check) if (timestamp > rtpe_now || rtpe_now - timestamp < check)
good = true; good = true;
next: next:

Write Preview
Loading…
Cancel
Save