From f2f9840c04f41ada99f6a290677d7c3deaac849e Mon Sep 17 00:00:00 2001
From: mickey <>
Date: Mon, 6 Dec 2004 16:52:33 +0000
Subject: [PATCH] ensure the most excellent alignment in the structs; henning@
 ok

---
 src/usr.sbin/ntpd/ntpd.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index 34f15511..995341bc 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ntpd.h,v 1.44 2004/11/12 17:24:52 henning Exp $ */
+/*	$OpenBSD: ntpd.h,v 1.45 2004/12/06 16:52:33 mickey Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -72,41 +72,41 @@ struct ntp_addr {
 
 struct ntp_addr_wrap {
 	char			*name;
-	u_int8_t		 pool;
 	struct ntp_addr		*a;
+	u_int8_t		 pool;
 };
 
 struct ntp_status {
-	u_int8_t	leap;
-	int8_t		precision;
 	double		rootdelay;
 	double		rootdispersion;
-	u_int32_t	refid;
 	double		reftime;
+	u_int32_t	refid;
+	u_int8_t	leap;
+	int8_t		precision;
 	u_int8_t	poll;
 	u_int8_t	stratum;
 };
 
 struct ntp_offset {
-	u_int8_t		good;
+	struct ntp_status	status;
 	double			offset;
 	double			delay;
 	double			error;
 	time_t			rcvd;
-	struct ntp_status	status;
+	u_int8_t		good;
 };
 
 struct ntp_peer {
 	TAILQ_ENTRY(ntp_peer)		 entry;
-	u_int32_t			 id;
 	struct ntp_addr_wrap		 addr_head;
 	struct ntp_addr			*addr;
 	struct ntp_query		*query;
+	struct ntp_offset		 reply[OFFSET_ARRAY_SIZE];
+	struct ntp_offset		 update;
 	enum client_state		 state;
 	time_t				 next;
 	time_t				 deadline;
-	struct ntp_offset		 reply[OFFSET_ARRAY_SIZE];
-	struct ntp_offset		 update;
+	u_int32_t			 id;
 	u_int8_t			 shift;
 	u_int8_t			 trustlevel;
 };
@@ -114,10 +114,10 @@ struct ntp_peer {
 struct ntpd_conf {
 	TAILQ_HEAD(listen_addrs, listen_addr)	listen_addrs;
 	TAILQ_HEAD(ntp_peers, ntp_peer)		ntp_peers;
+	struct ntp_status			status;
 	u_int8_t				listen_all;
 	u_int8_t				settime;
 	u_int8_t				debug;
-	struct ntp_status			status;
 };
 
 struct buf {
@@ -129,15 +129,15 @@ struct buf {
 };
 
 struct msgbuf {
+	TAILQ_HEAD(bufs, buf)	 bufs;
 	u_int32_t		 queued;
 	int			 fd;
-	TAILQ_HEAD(bufs, buf)	 bufs;
 };
 
 struct buf_read {
+	ssize_t			 wpos;
 	u_char			 buf[READ_BUF_SIZE];
 	u_char			*rptr;
-	ssize_t			 wpos;
 };
 
 /* ipc messages */
@@ -161,9 +161,9 @@ enum imsg_type {
 
 struct imsg_hdr {
 	enum imsg_type	type;
-	u_int16_t	len;
 	u_int32_t	peerid;
 	pid_t		pid;
+	u_int16_t	len;
 };
 
 struct imsg {