epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

libCom/osi: More NTP time quality checking.

Browse Source 
Reject NTP timespec values before the EPICS epoch.
This commit is contained in:
Andrew Johnson
2010-10-22 17:34:13 -05:00
parent 2957fdcaf7
commit 66864fcb23
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libCom/osi/osiNTPTime.c
+13 -6
View File
@@ -99,10 +99,12 @@ static void NTPTime_InitOnce(void *pprio)
/* Try to sync with NTP server */
if (!osdNTPGet(&timespecNow)) {
NTPTimePvt.syncTick = osdTickGet();
epicsTimeFromTimespec(&NTPTimePvt.syncTime, &timespecNow);
NTPTimePvt.clockTick = NTPTimePvt.syncTick;
NTPTimePvt.clockTime = NTPTimePvt.syncTime;
NTPTimePvt.synchronized = 1;
if (timespecNow.tv_sec > POSIX_TIME_AT_EPICS_EPOCH && epicsTimeOK ==
epicsTimeFromTimespec(&NTPTimePvt.syncTime, &timespecNow)) {
NTPTimePvt.clockTick = NTPTimePvt.syncTick;
NTPTimePvt.clockTime = NTPTimePvt.syncTime;
NTPTimePvt.synchronized = 1;
}
}
/* Start the sync thread */
@@ -164,9 +166,14 @@ static void NTPTimeSync(void *dummy)
continue;
}
epicsTimeFromTimespec(&timeNow, &timespecNow);
ntpDelta = epicsTimeDiffInSeconds(&timeNow, &NTPTimePvt.syncTime);
if (timespecNow.tv_sec <= POSIX_TIME_AT_EPICS_EPOCH ||
epicsTimeFromTimespec(&timeNow, &timespecNow) == epicsTimeERROR) {
errlogPrintf("NTPTimeSync: Bad time received from NTP server\n");
NTPTimePvt.synchronized = 0;
continue;
}
ntpDelta = epicsTimeDiffInSeconds(&timeNow, &NTPTimePvt.syncTime);
if (ntpDelta <= 0.0 && NTPTimePvt.synchronized) {
errlogPrintf("NTPTimeSync: NTP time not increasing, delta = %g\n",
ntpDelta);