From: Dave Hart <hart@ntp.org>
Date: Sat, 27 Aug 2011 03:45:35 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2001
X-Git-Tag: NTP_4_2_7P209~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b51e45eb4b5fe152f606b19c32d321d989643f81;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2001
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2000-01

bk: 4e58685fEKinFGlH54puDHHEO75EFQ
---

b51e45eb4b5fe152f606b19c32d321d989643f81
diff --cc ntpd/ntp_request.c
index 54bd940b3,bc490fae8..af7b4ffb9
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@@ -1234,19 -1255,21 +1234,21 @@@ io_stats
   */
  static void
  timer_stats(
- 	sockaddr_u *srcadr,
- 	endpt *inter,
- 	struct req_pkt *inpkt
+ 	sockaddr_u *		srcadr,
 -	struct interface *	inter,
++	endpt *			inter,
+ 	struct req_pkt *	inpkt
  	)
  {
- 	register struct info_timer_stats *ts;
+ 	struct info_timer_stats *	ts;
+ 	u_long				sincereset;
  
- 	ts = (struct info_timer_stats *)prepare_pkt(srcadr, inter, inpkt,
- 						    sizeof(struct info_timer_stats));
+ 	ts = (struct info_timer_stats *)prepare_pkt(srcadr, inter,
+ 						    inpkt, sizeof(*ts));
  
- 	ts->timereset = htonl((u_int32)(current_time - timer_timereset));
- 	ts->alarms = htonl((u_int32)alarm_overflow);
- 	ts->overflows = htonl((u_int32)timer_overflows);
+ 	sincereset = current_time - timer_timereset;
+ 	ts->timereset = htonl((u_int32)sincereset);
+ 	ts->alarms = ts->timereset;
+ 	ts->overflows = htonl((u_int32)alarm_overflow);
  	ts->xmtcalls = htonl((u_int32)timer_xmtcalls);
  
  	(void) more_pkt();