From b521cde7ce053a8360ebf199e4a98c866c27ecab Mon Sep 17 00:00:00 2001 From: mickey <> Date: Wed, 8 Dec 2004 15:47:38 +0000 Subject: [PATCH] uniquely name members of s_fixedpt and l_fixedpt; henning@ ok --- src/usr.sbin/ntpd/client.c | 10 ++-- src/usr.sbin/ntpd/ntp.h | 10 ++-- src/usr.sbin/ntpd/ntp_msg.c | 98 ++++++++++++++++++------------------- src/usr.sbin/ntpd/server.c | 4 +- src/usr.sbin/ntpd/util.c | 22 ++++----- 5 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c index 178864e1..fc71fd64 100644 --- a/src/usr.sbin/ntpd/client.c +++ b/src/usr.sbin/ntpd/client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: client.c,v 1.45 2004/11/10 11:47:28 henning Exp $ */ +/* $OpenBSD: client.c,v 1.46 2004/12/08 15:47:38 mickey Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -153,8 +153,8 @@ client_query(struct ntp_peer *p) * Save the real transmit timestamp locally. */ - p->query->msg.xmttime.int_part = arc4random(); - p->query->msg.xmttime.fraction = arc4random(); + p->query->msg.xmttime.int_partl = arc4random(); + p->query->msg.xmttime.fractionl = arc4random(); p->query->xmttime = gettime(); if (ntp_sendmsg(p->query->fd, NULL, &p->query->msg, @@ -194,8 +194,8 @@ client_dispatch(struct ntp_peer *p, u_int8_t settime) ntp_getmsg(buf, size, &msg); - if (msg.orgtime.int_part != p->query->msg.xmttime.int_part || - msg.orgtime.fraction != p->query->msg.xmttime.fraction) + if (msg.orgtime.int_partl != p->query->msg.xmttime.int_partl || + msg.orgtime.fractionl != p->query->msg.xmttime.fractionl) return (0); /* diff --git a/src/usr.sbin/ntpd/ntp.h b/src/usr.sbin/ntpd/ntp.h index b2ec6fe2..7da44fca 100644 --- a/src/usr.sbin/ntpd/ntp.h +++ b/src/usr.sbin/ntpd/ntp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.h,v 1.9 2004/10/13 13:35:19 henning Exp $ */ +/* $OpenBSD: ntp.h,v 1.10 2004/12/08 15:47:38 mickey Exp $ */ /* * Copyright (c) 2004 Henning Brauer @@ -40,13 +40,13 @@ * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ struct l_fixedpt { - u_int32_t int_part; - u_int32_t fraction; + u_int32_t int_partl; + u_int32_t fractionl; }; struct s_fixedpt { - u_int16_t int_part; - u_int16_t fraction; + u_int16_t int_parts; + u_int16_t fractions; }; /* RFC Section 4 diff --git a/src/usr.sbin/ntpd/ntp_msg.c b/src/usr.sbin/ntpd/ntp_msg.c index 00ac49e6..2d7f942d 100644 --- a/src/usr.sbin/ntpd/ntp_msg.c +++ b/src/usr.sbin/ntpd/ntp_msg.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp_msg.c,v 1.11 2004/10/22 21:24:20 henning Exp $ */ +/* $OpenBSD: ntp_msg.c,v 1.12 2004/12/08 15:47:38 mickey Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -42,32 +42,32 @@ ntp_getmsg(char *p, ssize_t len, struct ntp_msg *msg) p += sizeof(msg->ppoll); memcpy(&msg->precision, p, sizeof(msg->precision)); p += sizeof(msg->precision); - memcpy(&msg->rootdelay.int_part, p, sizeof(msg->rootdelay.int_part)); - p += sizeof(msg->rootdelay.int_part); - memcpy(&msg->rootdelay.fraction, p, sizeof(msg->rootdelay.fraction)); - p += sizeof(msg->rootdelay.fraction); - memcpy(&msg->dispersion.int_part, p, sizeof(msg->dispersion.int_part)); - p += sizeof(msg->dispersion.int_part); - memcpy(&msg->dispersion.fraction, p, sizeof(msg->dispersion.fraction)); - p += sizeof(msg->dispersion.fraction); + memcpy(&msg->rootdelay.int_parts, p, sizeof(msg->rootdelay.int_parts)); + p += sizeof(msg->rootdelay.int_parts); + memcpy(&msg->rootdelay.fractions, p, sizeof(msg->rootdelay.fractions)); + p += sizeof(msg->rootdelay.fractions); + memcpy(&msg->dispersion.int_parts, p, sizeof(msg->dispersion.int_parts)); + p += sizeof(msg->dispersion.int_parts); + memcpy(&msg->dispersion.fractions, p, sizeof(msg->dispersion.fractions)); + p += sizeof(msg->dispersion.fractions); memcpy(&msg->refid, p, sizeof(msg->refid)); p += sizeof(msg->refid); - memcpy(&msg->reftime.int_part, p, sizeof(msg->reftime.int_part)); - p += sizeof(msg->reftime.int_part); - memcpy(&msg->reftime.fraction, p, sizeof(msg->reftime.fraction)); - p += sizeof(msg->reftime.fraction); - memcpy(&msg->orgtime.int_part, p, sizeof(msg->orgtime.int_part)); - p += sizeof(msg->orgtime.int_part); - memcpy(&msg->orgtime.fraction, p, sizeof(msg->orgtime.fraction)); - p += sizeof(msg->orgtime.fraction); - memcpy(&msg->rectime.int_part, p, sizeof(msg->rectime.int_part)); - p += sizeof(msg->rectime.int_part); - memcpy(&msg->rectime.fraction, p, sizeof(msg->rectime.fraction)); - p += sizeof(msg->rectime.fraction); - memcpy(&msg->xmttime.int_part, p, sizeof(msg->xmttime.int_part)); - p += sizeof(msg->xmttime.int_part); - memcpy(&msg->xmttime.fraction, p, sizeof(msg->xmttime.fraction)); - p += sizeof(msg->xmttime.fraction); + memcpy(&msg->reftime.int_partl, p, sizeof(msg->reftime.int_partl)); + p += sizeof(msg->reftime.int_partl); + memcpy(&msg->reftime.fractionl, p, sizeof(msg->reftime.fractionl)); + p += sizeof(msg->reftime.fractionl); + memcpy(&msg->orgtime.int_partl, p, sizeof(msg->orgtime.int_partl)); + p += sizeof(msg->orgtime.int_partl); + memcpy(&msg->orgtime.fractionl, p, sizeof(msg->orgtime.fractionl)); + p += sizeof(msg->orgtime.fractionl); + memcpy(&msg->rectime.int_partl, p, sizeof(msg->rectime.int_partl)); + p += sizeof(msg->rectime.int_partl); + memcpy(&msg->rectime.fractionl, p, sizeof(msg->rectime.fractionl)); + p += sizeof(msg->rectime.fractionl); + memcpy(&msg->xmttime.int_partl, p, sizeof(msg->xmttime.int_partl)); + p += sizeof(msg->xmttime.int_partl); + memcpy(&msg->xmttime.fractionl, p, sizeof(msg->xmttime.fractionl)); + p += sizeof(msg->xmttime.fractionl); return (0); } @@ -89,32 +89,32 @@ ntp_sendmsg(int fd, struct sockaddr *sa, struct ntp_msg *msg, ssize_t len, p += sizeof(msg->ppoll); memcpy(p, &msg->precision, sizeof(msg->precision)); p += sizeof(msg->precision); - memcpy(p, &msg->rootdelay.int_part, sizeof(msg->rootdelay.int_part)); - p += sizeof(msg->rootdelay.int_part); - memcpy(p, &msg->rootdelay.fraction, sizeof(msg->rootdelay.fraction)); - p += sizeof(msg->rootdelay.fraction); - memcpy(p, &msg->dispersion.int_part, sizeof(msg->dispersion.int_part)); - p += sizeof(msg->dispersion.int_part); - memcpy(p, &msg->dispersion.fraction, sizeof(msg->dispersion.fraction)); - p += sizeof(msg->dispersion.fraction); + memcpy(p, &msg->rootdelay.int_parts, sizeof(msg->rootdelay.int_parts)); + p += sizeof(msg->rootdelay.int_parts); + memcpy(p, &msg->rootdelay.fractions, sizeof(msg->rootdelay.fractions)); + p += sizeof(msg->rootdelay.fractions); + memcpy(p, &msg->dispersion.int_parts, sizeof(msg->dispersion.int_parts)); + p += sizeof(msg->dispersion.int_parts); + memcpy(p, &msg->dispersion.fractions, sizeof(msg->dispersion.fractions)); + p += sizeof(msg->dispersion.fractions); memcpy(p, &msg->refid, sizeof(msg->refid)); p += sizeof(msg->refid); - memcpy(p, &msg->reftime.int_part, sizeof(msg->reftime.int_part)); - p += sizeof(msg->reftime.int_part); - memcpy(p, &msg->reftime.fraction, sizeof(msg->reftime.fraction)); - p += sizeof(msg->reftime.fraction); - memcpy(p, &msg->orgtime.int_part, sizeof(msg->orgtime.int_part)); - p += sizeof(msg->orgtime.int_part); - memcpy(p, &msg->orgtime.fraction, sizeof(msg->orgtime.fraction)); - p += sizeof(msg->orgtime.fraction); - memcpy(p, &msg->rectime.int_part, sizeof(msg->rectime.int_part)); - p += sizeof(msg->rectime.int_part); - memcpy(p, &msg->rectime.fraction, sizeof(msg->rectime.fraction)); - p += sizeof(msg->rectime.fraction); - memcpy(p, &msg->xmttime.int_part, sizeof(msg->xmttime.int_part)); - p += sizeof(msg->xmttime.int_part); - memcpy(p, &msg->xmttime.fraction, sizeof(msg->xmttime.fraction)); - p += sizeof(msg->xmttime.fraction); + memcpy(p, &msg->reftime.int_partl, sizeof(msg->reftime.int_partl)); + p += sizeof(msg->reftime.int_partl); + memcpy(p, &msg->reftime.fractionl, sizeof(msg->reftime.fractionl)); + p += sizeof(msg->reftime.fractionl); + memcpy(p, &msg->orgtime.int_partl, sizeof(msg->orgtime.int_partl)); + p += sizeof(msg->orgtime.int_partl); + memcpy(p, &msg->orgtime.fractionl, sizeof(msg->orgtime.fractionl)); + p += sizeof(msg->orgtime.fractionl); + memcpy(p, &msg->rectime.int_partl, sizeof(msg->rectime.int_partl)); + p += sizeof(msg->rectime.int_partl); + memcpy(p, &msg->rectime.fractionl, sizeof(msg->rectime.fractionl)); + p += sizeof(msg->rectime.fractionl); + memcpy(p, &msg->xmttime.int_partl, sizeof(msg->xmttime.int_partl)); + p += sizeof(msg->xmttime.int_partl); + memcpy(p, &msg->xmttime.fractionl, sizeof(msg->xmttime.fractionl)); + p += sizeof(msg->xmttime.fractionl); if (sa != NULL) sa_len = SA_LEN(sa); diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c index 50dbfefc..6165f756 100644 --- a/src/usr.sbin/ntpd/server.c +++ b/src/usr.sbin/ntpd/server.c @@ -1,4 +1,4 @@ -/* $OpenBSD: server.c,v 1.18 2004/10/22 21:17:37 henning Exp $ */ +/* $OpenBSD: server.c,v 1.19 2004/12/08 15:47:38 mickey Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer @@ -144,7 +144,7 @@ server_dispatch(int fd, struct ntpd_conf *conf) reply.rootdelay = d_to_sfp(conf->status.rootdelay); if (version > 3) - reply.refid = reply.xmttime.fraction; + reply.refid = reply.xmttime.fractionl; else reply.refid = conf->status.refid; diff --git a/src/usr.sbin/ntpd/util.c b/src/usr.sbin/ntpd/util.c index ac980de5..76cf52a0 100644 --- a/src/usr.sbin/ntpd/util.c +++ b/src/usr.sbin/ntpd/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.9 2004/11/12 17:24:52 henning Exp $ */ +/* $OpenBSD: util.c,v 1.10 2004/12/08 15:47:38 mickey Exp $ */ /* * Copyright (c) 2004 Alexander Guy @@ -45,10 +45,10 @@ lfp_to_d(struct l_fixedpt lfp) { double ret; - lfp.int_part = ntohl(lfp.int_part); - lfp.fraction = ntohl(lfp.fraction); + lfp.int_partl = ntohl(lfp.int_partl); + lfp.fractionl = ntohl(lfp.fractionl); - ret = (double)(lfp.int_part) + ((double)lfp.fraction / UINT_MAX); + ret = (double)(lfp.int_partl) + ((double)lfp.fractionl / UINT_MAX); return (ret); } @@ -58,8 +58,8 @@ d_to_lfp(double d) { struct l_fixedpt lfp; - lfp.int_part = htonl((u_int32_t)d); - lfp.fraction = htonl((u_int32_t)((d - (u_int32_t)d) * UINT_MAX)); + lfp.int_partl = htonl((u_int32_t)d); + lfp.fractionl = htonl((u_int32_t)((d - (u_int32_t)d) * UINT_MAX)); return (lfp); } @@ -69,10 +69,10 @@ sfp_to_d(struct s_fixedpt sfp) { double ret; - sfp.int_part = ntohs(sfp.int_part); - sfp.fraction = ntohs(sfp.fraction); + sfp.int_parts = ntohs(sfp.int_parts); + sfp.fractions = ntohs(sfp.fractions); - ret = (double)(sfp.int_part) + ((double)sfp.fraction / USHRT_MAX); + ret = (double)(sfp.int_parts) + ((double)sfp.fractions / USHRT_MAX); return (ret); } @@ -82,8 +82,8 @@ d_to_sfp(double d) { struct s_fixedpt sfp; - sfp.int_part = htons((u_int16_t)d); - sfp.fraction = htons((u_int16_t)((d - (u_int16_t)d) * USHRT_MAX)); + sfp.int_parts = htons((u_int16_t)d); + sfp.fractions = htons((u_int16_t)((d - (u_int16_t)d) * USHRT_MAX)); return (sfp); }