Browse Source

ensure the most excellent alignment in the structs; henning@ ok

OPENBSD_3_7
mickey 19 years ago
parent
commit
f2f9840c04
1 changed files with 14 additions and 14 deletions
  1. +14
    -14
      src/usr.sbin/ntpd/ntpd.h

+ 14
- 14
src/usr.sbin/ntpd/ntpd.h View File

@ -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> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -72,41 +72,41 @@ struct ntp_addr {
struct ntp_addr_wrap { struct ntp_addr_wrap {
char *name; char *name;
u_int8_t pool;
struct ntp_addr *a; struct ntp_addr *a;
u_int8_t pool;
}; };
struct ntp_status { struct ntp_status {
u_int8_t leap;
int8_t precision;
double rootdelay; double rootdelay;
double rootdispersion; double rootdispersion;
u_int32_t refid;
double reftime; double reftime;
u_int32_t refid;
u_int8_t leap;
int8_t precision;
u_int8_t poll; u_int8_t poll;
u_int8_t stratum; u_int8_t stratum;
}; };
struct ntp_offset { struct ntp_offset {
u_int8_t good;
struct ntp_status status;
double offset; double offset;
double delay; double delay;
double error; double error;
time_t rcvd; time_t rcvd;
struct ntp_status status;
u_int8_t good;
}; };
struct ntp_peer { struct ntp_peer {
TAILQ_ENTRY(ntp_peer) entry; TAILQ_ENTRY(ntp_peer) entry;
u_int32_t id;
struct ntp_addr_wrap addr_head; struct ntp_addr_wrap addr_head;
struct ntp_addr *addr; struct ntp_addr *addr;
struct ntp_query *query; struct ntp_query *query;
struct ntp_offset reply[OFFSET_ARRAY_SIZE];
struct ntp_offset update;
enum client_state state; enum client_state state;
time_t next; time_t next;
time_t deadline; 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 shift;
u_int8_t trustlevel; u_int8_t trustlevel;
}; };
@ -114,10 +114,10 @@ struct ntp_peer {
struct ntpd_conf { struct ntpd_conf {
TAILQ_HEAD(listen_addrs, listen_addr) listen_addrs; TAILQ_HEAD(listen_addrs, listen_addr) listen_addrs;
TAILQ_HEAD(ntp_peers, ntp_peer) ntp_peers; TAILQ_HEAD(ntp_peers, ntp_peer) ntp_peers;
struct ntp_status status;
u_int8_t listen_all; u_int8_t listen_all;
u_int8_t settime; u_int8_t settime;
u_int8_t debug; u_int8_t debug;
struct ntp_status status;
}; };
struct buf { struct buf {
@ -129,15 +129,15 @@ struct buf {
}; };
struct msgbuf { struct msgbuf {
TAILQ_HEAD(bufs, buf) bufs;
u_int32_t queued; u_int32_t queued;
int fd; int fd;
TAILQ_HEAD(bufs, buf) bufs;
}; };
struct buf_read { struct buf_read {
ssize_t wpos;
u_char buf[READ_BUF_SIZE]; u_char buf[READ_BUF_SIZE];
u_char *rptr; u_char *rptr;
ssize_t wpos;
}; };
/* ipc messages */ /* ipc messages */
@ -161,9 +161,9 @@ enum imsg_type {
struct imsg_hdr { struct imsg_hdr {
enum imsg_type type; enum imsg_type type;
u_int16_t len;
u_int32_t peerid; u_int32_t peerid;
pid_t pid; pid_t pid;
u_int16_t len;
}; };
struct imsg { struct imsg {


Loading…
Cancel
Save