Fri Jan 22 23:13:20 2016 UTC ()
Erm, fix previous.
(also, as this protocol is externally defined it probably should use its
own constant and not either of these system-defined hostname lengths...)


(dholland)
diff -r1.12 -r1.13 src/include/protocols/timed.h

cvs diff -r1.12 -r1.13 src/include/protocols/timed.h (switch to unified diff)

--- src/include/protocols/timed.h 2016/01/22 23:11:50 1.12
+++ src/include/protocols/timed.h 2016/01/22 23:13:20 1.13
@@ -1,103 +1,103 @@ @@ -1,103 +1,103 @@
1/* $NetBSD: timed.h,v 1.12 2016/01/22 23:11:50 dholland Exp $ */ 1/* $NetBSD: timed.h,v 1.13 2016/01/22 23:13:20 dholland Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1983, 1993 4 * Copyright (c) 1983, 1993
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
15 * 3. Neither the name of the University nor the names of its contributors 15 * 3. Neither the name of the University nor the names of its contributors
16 * may be used to endorse or promote products derived from this software 16 * may be used to endorse or promote products derived from this software
17 * without specific prior written permission. 17 * without specific prior written permission.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 19 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
20 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 20 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 21 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
22 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 22 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 23 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 24 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 25 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 26 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 27 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 28 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
29 * SUCH DAMAGE. 29 * SUCH DAMAGE.
30 * 30 *
31 * @(#)timed.h 8.1 (Berkeley) 6/2/93 31 * @(#)timed.h 8.1 (Berkeley) 6/2/93
32 */ 32 */
33 33
34#ifndef _PROTOCOLS_TIMED_H_ 34#ifndef _PROTOCOLS_TIMED_H_
35#define _PROTOCOLS_TIMED_H_ 35#define _PROTOCOLS_TIMED_H_
36 36
37#include <stdint.h> 37#include <stdint.h>
38#include <limits.h> 38#include <limits.h>
39 39
40/* 40/*
41 * Time Synchronization Protocol 41 * Time Synchronization Protocol
42 */ 42 */
43 43
44#define TSPVERSION 1 44#define TSPVERSION 1
45#define ANYADDR NULL 45#define ANYADDR NULL
46 46
47struct tsp { 47struct tsp {
48 uint8_t tsp_type; 48 uint8_t tsp_type;
49 uint8_t tsp_vers; 49 uint8_t tsp_vers;
50 uint16_t tsp_seq; 50 uint16_t tsp_seq;
51 union { 51 union {
52 struct { 52 struct {
53 int32_t tv_sec; 53 int32_t tv_sec;
54 int32_t tv_usec; 54 int32_t tv_usec;
55 } tspu_time; 55 } tspu_time;
56 char tspu_hopcnt; 56 char tspu_hopcnt;
57 } tsp_u; 57 } tsp_u;
58 char tsp_name[_POSIX_HOST_NAME_MAX]; 58 char tsp_name[_POSIX_HOST_NAME_MAX+1];
59}; 59};
60 60
61#define tsp_time tsp_u.tspu_time 61#define tsp_time tsp_u.tspu_time
62#define tsp_hopcnt tsp_u.tspu_hopcnt 62#define tsp_hopcnt tsp_u.tspu_hopcnt
63  63
64/* 64/*
65 * Command types. 65 * Command types.
66 */ 66 */
67#define TSP_ANY 0 /* match any types */ 67#define TSP_ANY 0 /* match any types */
68#define TSP_ADJTIME 1 /* send adjtime */ 68#define TSP_ADJTIME 1 /* send adjtime */
69#define TSP_ACK 2 /* generic acknowledgement */ 69#define TSP_ACK 2 /* generic acknowledgement */
70#define TSP_MASTERREQ 3 /* ask for master's name */  70#define TSP_MASTERREQ 3 /* ask for master's name */
71#define TSP_MASTERACK 4 /* acknowledge master request */ 71#define TSP_MASTERACK 4 /* acknowledge master request */
72#define TSP_SETTIME 5 /* send network time */ 72#define TSP_SETTIME 5 /* send network time */
73#define TSP_MASTERUP 6 /* inform slaves that master is up */ 73#define TSP_MASTERUP 6 /* inform slaves that master is up */
74#define TSP_SLAVEUP 7 /* slave is up but not polled */ 74#define TSP_SLAVEUP 7 /* slave is up but not polled */
75#define TSP_ELECTION 8 /* advance candidature for master */ 75#define TSP_ELECTION 8 /* advance candidature for master */
76#define TSP_ACCEPT 9 /* support candidature of master */ 76#define TSP_ACCEPT 9 /* support candidature of master */
77#define TSP_REFUSE 10 /* reject candidature of master */ 77#define TSP_REFUSE 10 /* reject candidature of master */
78#define TSP_CONFLICT 11 /* two or more masters present */ 78#define TSP_CONFLICT 11 /* two or more masters present */
79#define TSP_RESOLVE 12 /* masters' conflict resolution */ 79#define TSP_RESOLVE 12 /* masters' conflict resolution */
80#define TSP_QUIT 13 /* reject candidature if master is up */ 80#define TSP_QUIT 13 /* reject candidature if master is up */
81#define TSP_DATE 14 /* reset the time (date command) */ 81#define TSP_DATE 14 /* reset the time (date command) */
82#define TSP_DATEREQ 15 /* remote request to reset the time */ 82#define TSP_DATEREQ 15 /* remote request to reset the time */
83#define TSP_DATEACK 16 /* acknowledge time setting */ 83#define TSP_DATEACK 16 /* acknowledge time setting */
84#define TSP_TRACEON 17 /* turn tracing on */ 84#define TSP_TRACEON 17 /* turn tracing on */
85#define TSP_TRACEOFF 18 /* turn tracing off */ 85#define TSP_TRACEOFF 18 /* turn tracing off */
86#define TSP_MSITE 19 /* find out master's site */ 86#define TSP_MSITE 19 /* find out master's site */
87#define TSP_MSITEREQ 20 /* remote master's site request */ 87#define TSP_MSITEREQ 20 /* remote master's site request */
88#define TSP_TEST 21 /* for testing election algo */ 88#define TSP_TEST 21 /* for testing election algo */
89#define TSP_SETDATE 22 /* New from date command */ 89#define TSP_SETDATE 22 /* New from date command */
90#define TSP_SETDATEREQ 23 /* New remote for above */ 90#define TSP_SETDATEREQ 23 /* New remote for above */
91#define TSP_LOOP 24 /* loop detection packet */ 91#define TSP_LOOP 24 /* loop detection packet */
92 92
93#define TSPTYPENUMBER 25 93#define TSPTYPENUMBER 25
94 94
95#ifdef TSPTYPES 95#ifdef TSPTYPES
96const char * const tsptype[TSPTYPENUMBER] = 96const char * const tsptype[TSPTYPENUMBER] =
97 { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",  97 { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
98 "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",  98 "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
99 "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ", 99 "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ",
100 "TEST", "SETDATE", "SETDATEREQ", "LOOP" }; 100 "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
101#endif 101#endif
102 102
103#endif /* !_PROTOCOLS_TIMED_H_ */ 103#endif /* !_PROTOCOLS_TIMED_H_ */