faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reference: announce leap second only on last day of June and December

Browse source
This commit is contained in:
Miroslav Lichvar 2014-06-04 14:55:00 +02:00
parent a646cf7923
commit 779b341b61
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
reference.c
View file

@ -593,6 +593,15 @@ is_offset_ok(double offset)
/* ================================================== */ /* ================================================== */
static int
is_leap_second_day(struct tm *stm) {
/* Allow leap second only on the last day of June and December */
return (stm->tm_mon == 5 && stm->tm_mday == 30) ||
(stm->tm_mon == 11 && stm->tm_mday == 31);
}
/* ================================================== */
static NTP_Leap static NTP_Leap
get_tz_leap(time_t when) get_tz_leap(time_t when)
{ {
@ -610,12 +619,7 @@ get_tz_leap(time_t when)
stm = *gmtime(&when); stm = *gmtime(&when);
/* Check for leap second only in the latter half of June and December */ if (!is_leap_second_day(&stm))
if (stm.tm_mon == 5 && stm.tm_mday > 14)
stm.tm_mday = 30;
else if (stm.tm_mon == 11 && stm.tm_mday > 14)
stm.tm_mday = 31;
else
return tz_leap; return tz_leap;
/* Temporarily switch to the timezone containing leap seconds */ /* Temporarily switch to the timezone containing leap seconds */
@ -657,7 +661,6 @@ get_tz_leap(time_t when)
static void static void
update_leap_status(NTP_Leap leap, time_t now) update_leap_status(NTP_Leap leap, time_t now)
{ {
struct tm stm;
int leap_sec; int leap_sec;
leap_sec = 0; leap_sec = 0;
@ -666,20 +669,16 @@ update_leap_status(NTP_Leap leap, time_t now)
leap = get_tz_leap(now); leap = get_tz_leap(now);
if (leap == LEAP_InsertSecond || leap == LEAP_DeleteSecond) { if (leap == LEAP_InsertSecond || leap == LEAP_DeleteSecond) {
/* Insert/delete leap second only on June 30 or December 31 /* Check that leap second is allowed today */
and in other months ignore the leap status completely */
stm = *gmtime(&now); if (is_leap_second_day(gmtime(&now))) {
if (stm.tm_mon != 5 && stm.tm_mon != 11) {
leap = LEAP_Normal;
} else if ((stm.tm_mon == 5 && stm.tm_mday == 30) ||
(stm.tm_mon == 11 && stm.tm_mday == 31)) {
if (leap == LEAP_InsertSecond) { if (leap == LEAP_InsertSecond) {
leap_sec = 1; leap_sec = 1;
} else { } else {
leap_sec = -1; leap_sec = -1;
} }
} else {
leap = LEAP_Normal;
} }
} }