X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8d96f1b9fa56cf7c64e9a4d97feedbf060cfd9c1..47fc89d711eec0a073d9b3b293a1af901b5bd791:/print-ntp.c diff --git a/print-ntp.c b/print-ntp.c index 1d32fda8..21bb7374 100644 --- a/print-ntp.c +++ b/print-ntp.c @@ -23,11 +23,6 @@ * loosely based on print-bootp.c */ -#ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.36 2002-12-28 17:15:06 hannes Exp $ (LBL)"; -#endif - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -36,19 +31,173 @@ static const char rcsid[] = #include #include +#ifdef HAVE_STRFTIME +#include +#endif #include "interface.h" #include "addrtoname.h" #include "extract.h" + +/* + * Based on ntp.h from the U of MD implementation + * This file is based on Version 2 of the NTP spec (RFC1119). + */ + +/* + * Definitions for the masses + */ +#define JAN_1970 2208988800U /* 1970 - 1900 in seconds */ + +/* + * Structure definitions for NTP fixed point values + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Integer Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Fraction Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Integer Part | Fraction Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +*/ +struct l_fixedpt { + u_int32_t int_part; + u_int32_t fraction; +}; + +struct s_fixedpt { + u_int16_t int_part; + u_int16_t fraction; +}; + +/* rfc2030 + * 1 2 3 + * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * |LI | VN |Mode | Stratum | Poll | Precision | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Root Delay | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Root Dispersion | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Reference Identifier | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | | + * | Reference Timestamp (64) | + * | | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | | + * | Originate Timestamp (64) | + * | | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | | + * | Receive Timestamp (64) | + * | | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | | + * | Transmit Timestamp (64) | + * | | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Key Identifier (optional) (32) | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | | + * | | + * | Message Digest (optional) (128) | + * | | + * | | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + +struct ntpdata { + u_char status; /* status of local clock and leap info */ + u_char stratum; /* Stratum level */ + u_char ppoll; /* poll value */ + int precision:8; + struct s_fixedpt root_delay; + struct s_fixedpt root_dispersion; + u_int32_t refid; + struct l_fixedpt ref_timestamp; + struct l_fixedpt org_timestamp; + struct l_fixedpt rec_timestamp; + struct l_fixedpt xmt_timestamp; + u_int32_t key_id; + u_int8_t message_digest[16]; +}; +/* + * Leap Second Codes (high order two bits) + */ +#define NO_WARNING 0x00 /* no warning */ +#define PLUS_SEC 0x40 /* add a second (61 seconds) */ +#define MINUS_SEC 0x80 /* minus a second (59 seconds) */ +#define ALARM 0xc0 /* alarm condition (clock unsynchronized) */ + +/* + * Clock Status Bits that Encode Version + */ +#define NTPVERSION_1 0x08 +#define VERSIONMASK 0x38 +#define LEAPMASK 0xc0 #ifdef MODEMASK #undef MODEMASK /* Solaris sucks */ #endif -#include "ntp.h" +#define MODEMASK 0x07 + +/* + * Code values + */ +#define MODE_UNSPEC 0 /* unspecified */ +#define MODE_SYM_ACT 1 /* symmetric active */ +#define MODE_SYM_PAS 2 /* symmetric passive */ +#define MODE_CLIENT 3 /* client */ +#define MODE_SERVER 4 /* server */ +#define MODE_BROADCAST 5 /* broadcast */ +#define MODE_RES1 6 /* reserved */ +#define MODE_RES2 7 /* reserved */ + +/* + * Stratum Definitions + */ +#define UNSPECIFIED 0 +#define PRIM_REF 1 /* radio clock */ +#define INFO_QUERY 62 /* **** THIS implementation dependent **** */ +#define INFO_REPLY 63 /* **** THIS implementation dependent **** */ static void p_sfix(const struct s_fixedpt *); static void p_ntp_time(const struct l_fixedpt *); static void p_ntp_delta(const struct l_fixedpt *, const struct l_fixedpt *); +static const struct tok ntp_mode_values[] = { + { MODE_UNSPEC, "unspecified" }, + { MODE_SYM_ACT, "symmetric active" }, + { MODE_SYM_PAS, "symmetric passive" }, + { MODE_CLIENT, "Client" }, + { MODE_SERVER, "Server" }, + { MODE_BROADCAST, "Broadcast" }, + { MODE_RES1, "Reserved" }, + { MODE_RES2, "Reserved" }, + { 0, NULL } +}; + +static const struct tok ntp_leapind_values[] = { + { NO_WARNING, "" }, + { PLUS_SEC, "+1s" }, + { MINUS_SEC, "-1s" }, + { ALARM, "clock unsynchronized" }, + { 0, NULL } +}; + +static const struct tok ntp_stratum_values[] = { + { UNSPECIFIED, "unspecified" }, + { PRIM_REF, "primary reference" }, + { 0, NULL } +}; + /* * Print ntp requests */ @@ -59,90 +208,51 @@ ntp_print(register const u_char *cp, u_int length) int mode, version, leapind; bp = (struct ntpdata *)cp; - /* Note funny sized packets */ - if (length != sizeof(struct ntpdata)) - (void)printf(" [len=%d]", length); TCHECK(bp->status); version = (int)(bp->status & VERSIONMASK) >> 3; printf("NTPv%d", version); - leapind = bp->status & LEAPMASK; - switch (leapind) { - - case NO_WARNING: - break; - - case PLUS_SEC: - fputs(" +1s", stdout); - break; - - case MINUS_SEC: - fputs(" -1s", stdout); - break; - } - mode = bp->status & MODEMASK; - switch (mode) { + if (!vflag) { + printf (", %s, length %u", + tok2str(ntp_mode_values, "Unknown mode", mode), + length); + return; + } - case MODE_UNSPEC: /* unspecified */ - fputs(" unspec", stdout); - break; - - case MODE_SYM_ACT: /* symmetric active */ - fputs(" sym_act", stdout); - break; - - case MODE_SYM_PAS: /* symmetric passive */ - fputs(" sym_pas", stdout); - break; - - case MODE_CLIENT: /* client */ - fputs(" client", stdout); - break; - - case MODE_SERVER: /* server */ - fputs(" server", stdout); - break; - - case MODE_BROADCAST: /* broadcast */ - fputs(" bcast", stdout); - break; - - case MODE_RES1: /* reserved */ - fputs(" res1", stdout); - break; - - case MODE_RES2: /* reserved */ - fputs(" res2", stdout); - break; + printf (", length %u\n\t%s", + length, + tok2str(ntp_mode_values, "Unknown mode", mode)); - } + leapind = bp->status & LEAPMASK; + printf (", Leap indicator: %s (%u)", + tok2str(ntp_leapind_values, "Unknown", leapind), + leapind); TCHECK(bp->stratum); - printf(", strat %d", bp->stratum); + printf(", Stratum %u (%s)", + bp->stratum, + tok2str(ntp_stratum_values, (bp->stratum >=2 && bp->stratum<=15) ? "secondary reference" : "reserved", bp->stratum)); TCHECK(bp->ppoll); - printf(", poll %d", bp->ppoll); + printf(", poll %u (%us)", bp->ppoll, 1 << bp->ppoll); /* Can't TCHECK bp->precision bitfield so bp->distance + 0 instead */ - TCHECK2(bp->distance, 0); - printf(", prec %d", bp->precision); - - if (!vflag) - return; + TCHECK2(bp->root_delay, 0); + printf(", precision %d", bp->precision); - TCHECK(bp->distance); - fputs(" dist ", stdout); - p_sfix(&bp->distance); + TCHECK(bp->root_delay); + fputs("\n\tRoot Delay: ", stdout); + p_sfix(&bp->root_delay); - TCHECK(bp->dispersion); - fputs(", disp ", stdout); - p_sfix(&bp->dispersion); + TCHECK(bp->root_dispersion); + fputs(", Root dispersion: ", stdout); + p_sfix(&bp->root_dispersion); TCHECK(bp->refid); - fputs(", ref ", stdout); + fputs(", Reference-ID: ", stdout); /* Interpretation depends on stratum */ switch (bp->stratum) { @@ -151,7 +261,8 @@ ntp_print(register const u_char *cp, u_int length) break; case PRIM_REF: - fn_printn((u_char *)&(bp->refid), 4, NULL); + if (fn_printn((u_char *)&(bp->refid), 4, snapend)) + goto trunc; break; case INFO_QUERY: @@ -169,22 +280,41 @@ ntp_print(register const u_char *cp, u_int length) break; } - TCHECK(bp->reftime); - putchar('@'); - p_ntp_time(&(bp->reftime)); - - TCHECK(bp->org); - fputs(" orig ", stdout); - p_ntp_time(&(bp->org)); - - TCHECK(bp->rec); - fputs(" rec ", stdout); - p_ntp_delta(&(bp->org), &(bp->rec)); - - TCHECK(bp->xmt); - fputs(" xmt ", stdout); - p_ntp_delta(&(bp->org), &(bp->xmt)); - + TCHECK(bp->ref_timestamp); + fputs("\n\t Reference Timestamp: ", stdout); + p_ntp_time(&(bp->ref_timestamp)); + + TCHECK(bp->org_timestamp); + fputs("\n\t Originator Timestamp: ", stdout); + p_ntp_time(&(bp->org_timestamp)); + + TCHECK(bp->rec_timestamp); + fputs("\n\t Receive Timestamp: ", stdout); + p_ntp_time(&(bp->rec_timestamp)); + + TCHECK(bp->xmt_timestamp); + fputs("\n\t Transmit Timestamp: ", stdout); + p_ntp_time(&(bp->xmt_timestamp)); + + fputs("\n\t Originator - Receive Timestamp: ", stdout); + p_ntp_delta(&(bp->org_timestamp), &(bp->rec_timestamp)); + + fputs("\n\t Originator - Transmit Timestamp: ", stdout); + p_ntp_delta(&(bp->org_timestamp), &(bp->xmt_timestamp)); + + if ( (sizeof(struct ntpdata) - length) == 16) { /* Optional: key-id */ + TCHECK(bp->key_id); + printf("\n\tKey id: %u", bp->key_id); + } else if ( (sizeof(struct ntpdata) - length) == 0) { /* Optional: key-id + authentication */ + TCHECK(bp->key_id); + printf("\n\tKey id: %u", bp->key_id); + TCHECK2(bp->message_digest, sizeof (bp->message_digest)); + printf("\n\tAuthentication: %08x%08x%08x%08x", + EXTRACT_32BITS(bp->message_digest), + EXTRACT_32BITS(bp->message_digest + 4), + EXTRACT_32BITS(bp->message_digest + 8), + EXTRACT_32BITS(bp->message_digest + 12)); + } return; trunc: @@ -223,6 +353,21 @@ p_ntp_time(register const struct l_fixedpt *lfp) ff = ff / FMAXINT; /* shift radix point by 32 bits */ f = ff * 1000000000.0; /* treat fraction as parts per billion */ printf("%u.%09d", i, f); + +#ifdef HAVE_STRFTIME + /* + * print the time in human-readable format. + */ + if (i) { + time_t seconds = i - JAN_1970; + struct tm *tm; + char time_buf[128]; + + tm = localtime(&seconds); + strftime(time_buf, sizeof (time_buf), "%Y/%m/%d %H:%M:%S", tm); + printf (" (%s)", time_buf); + } +#endif } /* Prints time difference between *lfp and *olfp */ @@ -231,16 +376,22 @@ p_ntp_delta(register const struct l_fixedpt *olfp, register const struct l_fixedpt *lfp) { register int32_t i; - register u_int32_t uf; - register u_int32_t ouf; + register u_int32_t u, uf; + register u_int32_t ou, ouf; register u_int32_t f; register float ff; int signbit; - i = EXTRACT_32BITS(&lfp->int_part) - EXTRACT_32BITS(&olfp->int_part); - + u = EXTRACT_32BITS(&lfp->int_part); + ou = EXTRACT_32BITS(&olfp->int_part); uf = EXTRACT_32BITS(&lfp->fraction); ouf = EXTRACT_32BITS(&olfp->fraction); + if (ou == 0 && ouf == 0) { + p_ntp_time(lfp); + return; + } + + i = u - ou; if (i > 0) { /* new is definitely greater than old */ signbit = 0;