From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 15 Jul 2009 04:35:46 +0000 (-0400)
Subject: [Bug 1245] Broken xmt time sent in fast_xmit() of 4.2.5p187
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3914568ba7f82d15c4be795b4813f9ad6ea3a02e;p=thirdparty%2Fntp.git

[Bug 1245] Broken xmt time sent in fast_xmit() of 4.2.5p187

bk: 4a5d5ca2BayGiBA5_3IxrsDDMOcN6A
---

diff --git a/ChangeLog b/ChangeLog
index 7bb7b7492c..8004143ec6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1245] Broken xmt time sent in fast_xmit() of 4.2.5p187.
 (4.2.5p187) 2009/07/11 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1042] multicast listeners IPv4+6 ignore new interfaces.
 * [Bug 1237] Windows serial code treat CR and LF both as line
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 8caf9fc761..53c6e361f9 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -3249,12 +3249,12 @@ fast_xmit(
 		HTONL_FP(&sys_reftime, &xpkt.reftime);
 		xpkt.org = rpkt->xmt;
 		HTONL_FP(&rbufp->recv_time, &xpkt.rec);
+		get_systime(&xmt_tx);
 		HTONL_FP(&xmt_tx, &xpkt.xmt);
 	}
 
 #ifdef HAVE_NTP_SIGND
 	if (flags & RES_MSSNTP) {
-		get_systime(&xmt_tx);
 		send_via_ntp_signd(rbufp, xmode, xkeyid, flags, &xpkt);
 		return;
 	}
@@ -3267,7 +3267,6 @@ fast_xmit(
 	 */
 	sendlen = LEN_PKT_NOMAC;
 	if (rbufp->recv_length == sendlen) {
-		get_systime(&xmt_tx);
 		sendpkt(&rbufp->recv_srcadr, rbufp->dstadr, 0, &xpkt,
 		    sendlen);
 #ifdef DEBUG