From: Brian Utterback <utterback@ntp.org>
Date: Tue, 30 Sep 2003 03:37:34 +0000 (-0400)
Subject: ntp_timer.c:
X-Git-Tag: NTP_4_2_0~6^2~5^2~2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6777a1b69d625282b77fcb7bdc1fbbcf4017255c;p=thirdparty%2Fntp.git

ntp_timer.c:
  Double check that value isn't zero and thus disarm the timer.

bk: 3f78fa7eJgZ8PsCBWBGnDiRivgB9qQ
---

diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index e33b48bab3..b673a99375 100644
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -102,6 +102,13 @@ reinit_timer(void)
 	if (itimer.it_value.tv_sec < 0 || itimer.it_value.tv_sec > (1<<EVENT_TIMEOUT)) {
 		itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
 	}
+	if (itimer.it_value.tv_nsec < 0 ) {
+		itimer.it_value.tv_nsec = 0;
+	}
+	if (itimer.it_value.tv_sec == 0 && itimer.it_value.tv_nsec == 0) {
+		itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
+		itimer.it_value.tv_nsec = 0;
+	}
 	itimer.it_interval.tv_sec = (1<<EVENT_TIMEOUT);
 	itimer.it_interval.tv_nsec = 0;
 	timer_settime(ntpd_timerid, 0 /*!TIMER_ABSTIME*/, &itimer, NULL);
@@ -110,6 +117,13 @@ reinit_timer(void)
 	if (itimer.it_value.tv_sec < 0 || itimer.it_value.tv_sec > (1<<EVENT_TIMEOUT)) {
 		itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
 	}
+	if (itimer.it_value.tv_nsec < 0 ) {
+		itimer.it_value.tv_usec = 0;
+	}
+	if (itimer.it_value.tv_sec == 0 && itimer.it_value.tv_nsec == 0) {
+		itimer.it_value.tv_sec = (1<<EVENT_TIMEOUT);
+		itimer.it_value.tv_usec = 0;
+	}
 	itimer.it_interval.tv_sec = (1<<EVENT_TIMEOUT);
 	itimer.it_interval.tv_usec = 0;
 	setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);