Deleted Added
sdiff udiff text old ( 111729 ) new ( 127675 )
full compact
print-ntp.c (111729) print-ntp.c (127675)
1/*
2 * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 8 unchanged lines hidden (view full) ---

17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * Format and print ntp packets.
22 * By Jeffrey Mogul/DECWRL
23 * loosely based on print-bootp.c
24 *
1/*
2 * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that: (1) source code distributions
7 * retain the above copyright notice and this paragraph in its entirety, (2)
8 * distributions including binary code include the above copyright notice and

--- 8 unchanged lines hidden (view full) ---

17 * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
19 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
20 *
21 * Format and print ntp packets.
22 * By Jeffrey Mogul/DECWRL
23 * loosely based on print-bootp.c
24 *
25 * $FreeBSD: head/contrib/tcpdump/print-ntp.c 111729 2003-03-02 08:25:48Z fenner $
25 * $FreeBSD: head/contrib/tcpdump/print-ntp.c 127675 2004-03-31 14:57:24Z bms $
26 */
27
28#ifndef lint
26 */
27
28#ifndef lint
29static const char rcsid[] =
30 "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.32.4.1 2002/07/10 07:13:37 guy Exp $ (LBL)";
29static const char rcsid[] _U_ =
30 "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.37.2.2 2003/11/16 08:51:36 guy Exp $ (LBL)";
31#endif
32
33#ifdef HAVE_CONFIG_H
34#include "config.h"
35#endif
36
31#endif
32
33#ifdef HAVE_CONFIG_H
34#include "config.h"
35#endif
36
37#include <sys/param.h>
38#include <sys/time.h>
39#include <sys/socket.h>
37#include <tcpdump-stdinc.h>
40
38
41#include <netinet/in.h>
42
43#include <ctype.h>
44#include <stdio.h>
45#include <string.h>
39#include <stdio.h>
40#include <string.h>
41#ifdef HAVE_STRFTIME
42#include <time.h>
43#endif
46
47#include "interface.h"
48#include "addrtoname.h"
44
45#include "interface.h"
46#include "addrtoname.h"
47#include "extract.h"
49#ifdef MODEMASK
50#undef MODEMASK /* Solaris sucks */
51#endif
52#include "ntp.h"
53
54static void p_sfix(const struct s_fixedpt *);
55static void p_ntp_time(const struct l_fixedpt *);
56static void p_ntp_delta(const struct l_fixedpt *, const struct l_fixedpt *);

--- 10 unchanged lines hidden (view full) ---

67 bp = (struct ntpdata *)cp;
68 /* Note funny sized packets */
69 if (length != sizeof(struct ntpdata))
70 (void)printf(" [len=%d]", length);
71
72 TCHECK(bp->status);
73
74 version = (int)(bp->status & VERSIONMASK) >> 3;
48#ifdef MODEMASK
49#undef MODEMASK /* Solaris sucks */
50#endif
51#include "ntp.h"
52
53static void p_sfix(const struct s_fixedpt *);
54static void p_ntp_time(const struct l_fixedpt *);
55static void p_ntp_delta(const struct l_fixedpt *, const struct l_fixedpt *);

--- 10 unchanged lines hidden (view full) ---

66 bp = (struct ntpdata *)cp;
67 /* Note funny sized packets */
68 if (length != sizeof(struct ntpdata))
69 (void)printf(" [len=%d]", length);
70
71 TCHECK(bp->status);
72
73 version = (int)(bp->status & VERSIONMASK) >> 3;
75 printf(" v%d", version);
74 printf("NTPv%d", version);
76
77 leapind = bp->status & LEAPMASK;
78 switch (leapind) {
79
80 case NO_WARNING:
81 break;
82
83 case PLUS_SEC:

--- 38 unchanged lines hidden (view full) ---

122
123 case MODE_RES2: /* reserved */
124 fputs(" res2", stdout);
125 break;
126
127 }
128
129 TCHECK(bp->stratum);
75
76 leapind = bp->status & LEAPMASK;
77 switch (leapind) {
78
79 case NO_WARNING:
80 break;
81
82 case PLUS_SEC:

--- 38 unchanged lines hidden (view full) ---

121
122 case MODE_RES2: /* reserved */
123 fputs(" res2", stdout);
124 break;
125
126 }
127
128 TCHECK(bp->stratum);
130 printf(" strat %d", bp->stratum);
129 printf(", strat %d", bp->stratum);
131
132 TCHECK(bp->ppoll);
130
131 TCHECK(bp->ppoll);
133 printf(" poll %d", bp->ppoll);
132 printf(", poll %d", bp->ppoll);
134
135 /* Can't TCHECK bp->precision bitfield so bp->distance + 0 instead */
136 TCHECK2(bp->distance, 0);
133
134 /* Can't TCHECK bp->precision bitfield so bp->distance + 0 instead */
135 TCHECK2(bp->distance, 0);
137 printf(" prec %d", bp->precision);
136 printf(", prec %d", bp->precision);
138
139 if (!vflag)
140 return;
141
142 TCHECK(bp->distance);
143 fputs(" dist ", stdout);
144 p_sfix(&bp->distance);
145
146 TCHECK(bp->dispersion);
137
138 if (!vflag)
139 return;
140
141 TCHECK(bp->distance);
142 fputs(" dist ", stdout);
143 p_sfix(&bp->distance);
144
145 TCHECK(bp->dispersion);
147 fputs(" disp ", stdout);
146 fputs(", disp ", stdout);
148 p_sfix(&bp->dispersion);
149
150 TCHECK(bp->refid);
147 p_sfix(&bp->dispersion);
148
149 TCHECK(bp->refid);
151 fputs(" ref ", stdout);
150 fputs(", ref ", stdout);
152 /* Interpretation depends on stratum */
153 switch (bp->stratum) {
154
155 case UNSPECIFIED:
156 printf("(unspec)");
157 break;
158
159 case PRIM_REF:

--- 39 unchanged lines hidden (view full) ---

199
200static void
201p_sfix(register const struct s_fixedpt *sfp)
202{
203 register int i;
204 register int f;
205 register float ff;
206
151 /* Interpretation depends on stratum */
152 switch (bp->stratum) {
153
154 case UNSPECIFIED:
155 printf("(unspec)");
156 break;
157
158 case PRIM_REF:

--- 39 unchanged lines hidden (view full) ---

198
199static void
200p_sfix(register const struct s_fixedpt *sfp)
201{
202 register int i;
203 register int f;
204 register float ff;
205
207 i = ntohs(sfp->int_part);
208 f = ntohs(sfp->fraction);
206 i = EXTRACT_16BITS(&sfp->int_part);
207 f = EXTRACT_16BITS(&sfp->fraction);
209 ff = f / 65536.0; /* shift radix point by 16 bits */
210 f = ff * 1000000.0; /* Treat fraction as parts per million */
211 printf("%d.%06d", i, f);
212}
213
214#define FMAXINT (4294967296.0) /* floating point rep. of MAXINT */
215
216static void
217p_ntp_time(register const struct l_fixedpt *lfp)
218{
219 register int32_t i;
220 register u_int32_t uf;
221 register u_int32_t f;
222 register float ff;
223
208 ff = f / 65536.0; /* shift radix point by 16 bits */
209 f = ff * 1000000.0; /* Treat fraction as parts per million */
210 printf("%d.%06d", i, f);
211}
212
213#define FMAXINT (4294967296.0) /* floating point rep. of MAXINT */
214
215static void
216p_ntp_time(register const struct l_fixedpt *lfp)
217{
218 register int32_t i;
219 register u_int32_t uf;
220 register u_int32_t f;
221 register float ff;
222
224 i = ntohl(lfp->int_part);
225 uf = ntohl(lfp->fraction);
223 i = EXTRACT_32BITS(&lfp->int_part);
224 uf = EXTRACT_32BITS(&lfp->fraction);
226 ff = uf;
227 if (ff < 0.0) /* some compilers are buggy */
228 ff += FMAXINT;
229 ff = ff / FMAXINT; /* shift radix point by 32 bits */
230 f = ff * 1000000000.0; /* treat fraction as parts per billion */
231 printf("%u.%09d", i, f);
225 ff = uf;
226 if (ff < 0.0) /* some compilers are buggy */
227 ff += FMAXINT;
228 ff = ff / FMAXINT; /* shift radix point by 32 bits */
229 f = ff * 1000000000.0; /* treat fraction as parts per billion */
230 printf("%u.%09d", i, f);
231
232#ifdef HAVE_STRFTIME
233 /*
234 * For extra verbosity, print the time in human-readable format.
235 */
236 if (vflag > 1 && i) {
237 time_t seconds = i - JAN_1970;
238 struct tm *tm;
239 char time_buf[128];
240
241 tm = localtime(&seconds);
242 strftime(time_buf, sizeof (time_buf), "%Y/%m/%d %H:%M:%S", tm);
243 printf (" (%s)", time_buf);
244 }
245#endif
232}
233
234/* Prints time difference between *lfp and *olfp */
235static void
236p_ntp_delta(register const struct l_fixedpt *olfp,
237 register const struct l_fixedpt *lfp)
238{
239 register int32_t i;
246}
247
248/* Prints time difference between *lfp and *olfp */
249static void
250p_ntp_delta(register const struct l_fixedpt *olfp,
251 register const struct l_fixedpt *lfp)
252{
253 register int32_t i;
240 register u_int32_t uf;
241 register u_int32_t ouf;
254 register u_int32_t u, uf;
255 register u_int32_t ou, ouf;
242 register u_int32_t f;
243 register float ff;
244 int signbit;
245
256 register u_int32_t f;
257 register float ff;
258 int signbit;
259
246 i = ntohl(lfp->int_part) - ntohl(olfp->int_part);
260 u = EXTRACT_32BITS(&lfp->int_part);
261 ou = EXTRACT_32BITS(&olfp->int_part);
262 uf = EXTRACT_32BITS(&lfp->fraction);
263 ouf = EXTRACT_32BITS(&olfp->fraction);
264 if (ou == 0 && ouf == 0) {
265 p_ntp_time(lfp);
266 return;
267 }
247
268
248 uf = ntohl(lfp->fraction);
249 ouf = ntohl(olfp->fraction);
269 i = u - ou;
250
251 if (i > 0) { /* new is definitely greater than old */
252 signbit = 0;
253 f = uf - ouf;
254 if (ouf > uf) /* must borrow from high-order bits */
255 i -= 1;
256 } else if (i < 0) { /* new is definitely less than old */
257 signbit = 1;

--- 17 unchanged lines hidden (view full) ---

275 ff = ff / FMAXINT; /* shift radix point by 32 bits */
276 f = ff * 1000000000.0; /* treat fraction as parts per billion */
277 if (signbit)
278 putchar('-');
279 else
280 putchar('+');
281 printf("%d.%09d", i, f);
282}
270
271 if (i > 0) { /* new is definitely greater than old */
272 signbit = 0;
273 f = uf - ouf;
274 if (ouf > uf) /* must borrow from high-order bits */
275 i -= 1;
276 } else if (i < 0) { /* new is definitely less than old */
277 signbit = 1;

--- 17 unchanged lines hidden (view full) ---

295 ff = ff / FMAXINT; /* shift radix point by 32 bits */
296 f = ff * 1000000000.0; /* treat fraction as parts per billion */
297 if (signbit)
298 putchar('-');
299 else
300 putchar('+');
301 printf("%d.%09d", i, f);
302}
303