summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-07-05 20:41:36 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-07-05 20:41:36 +0000
commita3f5e4942d14085145d002d9e6dee3158de04ed9 (patch)
treebb3bc0c9cd3518b2ae2c6bb5403f1dc3b896be90
parentaf7c27ada0431e0ccda48f4555c5c80f97e3d3b3 (diff)
delay, not error
-rw-r--r--usr.sbin/ntpd/client.c6
-rw-r--r--usr.sbin/ntpd/ntpd.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/ntpd/client.c b/usr.sbin/ntpd/client.c
index ea706f94ffc..8b97f9f82ee 100644
--- a/usr.sbin/ntpd/client.c
+++ b/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/usr.sbin/ntpd/ntpd.h b/usr.sbin/ntpd/ntpd.h
index a89e7c6b99f..4d321821b05 100644
--- a/usr.sbin/ntpd/ntpd.h
+++ b/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 {