From 25baf3f65625d15bd72cee7c4c34d453641eb82d Mon Sep 17 00:00:00 2001
From: henning <>
Date: Mon, 5 Jul 2004 20:41:35 +0000
Subject: [PATCH] delay, not error

---
 src/usr.sbin/ntpd/client.c | 6 +++---
 src/usr.sbin/ntpd/ntpd.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
index ea706f94..8b97f9f8 100644
--- a/src/usr.sbin/ntpd/client.c
+++ b/src/usr.sbin/ntpd/client.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: client.c,v 1.5 2004/07/04 22:24:20 henning Exp $ */
+/*	$OpenBSD: client.c,v 1.6 2004/07/05 20:41:34 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -136,13 +136,13 @@ client_dispatch(struct ntp_peer *p)
 	T3 = lfp_to_d(msg.xmttime);
 
 	p->offset = ((T2 - T1) + (T3 - T4)) / 2;
-	p->error = (T2 - T1) - (T3 - T4);
+	p->delay = (T2 - T1) - (T3 - T4);
 
 	p->state = STATE_REPLY_RECEIVED;
 	p->next = time(NULL) + INTERVAL_QUERY;
 	p->deadline = 0;
 
-	log_debug("reply received: offset %f error %f", p->offset, p->error);
+	log_debug("reply received: offset %f delay %f", p->offset, p->delay);
 
 	return (0);
 }
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index a89e7c6b..4d321821 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.h,v 1.10 2004/07/05 07:46:16 henning Exp $ */
+/*	$OpenBSD: ntpd.h,v 1.11 2004/07/05 20:41:35 henning Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -60,7 +60,7 @@ struct ntp_peer {
 	time_t				 next;
 	time_t				 deadline;
 	double				 offset;
-	double				 error;
+	double				 delay;
 };
 
 struct ntpd_conf {