From: John Hay <hay@ntp.org>
Date: Wed, 31 Jul 2002 19:33:33 +0000 (+0200)
Subject: Remove stop_timer() and so make multiple servers work again. I really don't
X-Git-Tag: NTP_4_1_73~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7923b5ba60f5b4ad160df5cefecea6a7d00c8b0f;p=thirdparty%2Fntp.git

Remove stop_timer() and so make multiple servers work again. I really don't
know why this piece of code came with the original IPv6 port. Ntpdate did not
need it before and is broken with it.

bk: 3d483b8d8UtBhrg8XPxg-V7ogxGZoA
---

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index 3c9137f30b..0112e8ed91 100644
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -199,7 +199,6 @@ int never_step = 0;
 
 int 	ntpdatemain P((int, char **));
 
-static	void	stop_timer	P((void));
 static	void	transmit	P((struct server *));
 static	void	receive 	P((struct recvbuf *));
 static	void	server_data P((struct server *, s_fp, l_fp *, u_fp));
@@ -663,19 +662,6 @@ ntpdatemain (
 	return clock_adjust();
 }
 
-static void
-stop_timer(void)
-{
-        struct itimerval itimer;
-
-        itimer.it_interval.tv_sec = itimer.it_value.tv_sec = 9999;
-	itimer.it_interval.tv_usec = 1000000/TIMER_HZ;
-	itimer.it_value.tv_usec = 1000000/(TIMER_HZ<<1);
-        setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);
-
-}
-
-
 
 /*
  * transmit - transmit a packet to the given server, or mark it completed.
@@ -1548,11 +1534,6 @@ init_alarm(void)
 	itimer.it_interval.tv_usec = 1000000/TIMER_HZ;
 	itimer.it_value.tv_usec = 1000000/(TIMER_HZ<<1);
 
-        /*itimer.it_interval.tv_sec = itimer.it_value.tv_sec = 999;
-	itimer.it_interval.tv_usec = 1000000/TIMER_HZ;
-        itimer.it_value.tv_sec = 0;
-        itimer.it_value.tv_usec = 1000;
-        */
 	setitimer(ITIMER_REAL, &itimer, (struct itimerval *)0);
 # endif
 #if defined SYS_CYGWIN32
@@ -1848,7 +1829,7 @@ input_handler(void)
 	fd_set fds;
 #endif
         int fdc = 0;
-        stop_timer();
+
 	/*
 	 * Do a poll to see if we have data
 	 */