From 2b5c86b9a3e044f0cb1a1d231f7dc8b4ae7f242b Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Fri, 7 Oct 2016 10:59:45 +0200 Subject: [PATCH] refclock: fix check for old samples The fix in commit 0a848e2528aaef0b3347de0b49ce50da8dc1c9a4 was incorrect. --- refclock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/refclock.c b/refclock.c index 4439d9c..85e1899 100644 --- a/refclock.c +++ b/refclock.c @@ -92,7 +92,7 @@ static ARR_Instance refclocks; static LOG_FileID logfileid; -static int valid_sample_time(RCL_Instance instance, struct timeval *tv); +static int valid_sample_time(RCL_Instance instance, struct timeval *raw, struct timeval *cooked); static int pps_stratum(RCL_Instance instance, struct timeval *tv); static void poll_timeout(void *arg); static void slew_samples(struct timeval *raw, struct timeval *cooked, double dfreq, @@ -372,7 +372,7 @@ RCL_AddSample(RCL_Instance instance, struct timeval *sample_time, double offset, /* Make sure the timestamp and offset provided by the driver are sane */ if (!UTI_IsTimeOffsetSane(sample_time, offset) || - !valid_sample_time(instance, sample_time)) + !valid_sample_time(instance, sample_time, &cooked_time)) return 0; switch (leap) { @@ -412,7 +412,7 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second) dispersion += instance->precision; if (!UTI_IsTimeOffsetSane(pulse_time, 0.0) || - !valid_sample_time(instance, pulse_time)) + !valid_sample_time(instance, pulse_time, &cooked_time)) return 0; rate = instance->pps_rate; @@ -503,21 +503,21 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second) } static int -valid_sample_time(RCL_Instance instance, struct timeval *tv) +valid_sample_time(RCL_Instance instance, struct timeval *raw, struct timeval *cooked) { struct timeval raw_time, last_sample_time; double diff, last_offset, last_dispersion; LCL_ReadRawTime(&raw_time); - UTI_DiffTimevalsToDouble(&diff, &raw_time, tv); + UTI_DiffTimevalsToDouble(&diff, &raw_time, raw); if (diff < 0.0 || diff > UTI_Log2ToDouble(instance->poll + 1) || (filter_get_last_sample(&instance->filter, &last_sample_time, &last_offset, &last_dispersion) && - UTI_CompareTimevals(&last_sample_time, tv) >= 0)) { - DEBUG_LOG(LOGF_Refclock, "%s refclock sample not valid age=%.6f ts=%s lastts=%s", + UTI_CompareTimevals(&last_sample_time, cooked) >= 0)) { + DEBUG_LOG(LOGF_Refclock, "%s refclock sample not valid age=%.6f raw=%s cooked=%s", UTI_RefidToString(instance->ref_id), diff, - UTI_TimevalToString(tv), UTI_TimevalToString(&last_sample_time)); + UTI_TimevalToString(raw), UTI_TimevalToString(cooked)); return 0; }