X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/cfd61cde4d58434e254950486716ebf400563ab4..05ec05a87b3a7c6983a16b5ae62d0f1512c4ce89:/print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index 6fc1dd0d..b814cb57 100644
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -117,7 +117,7 @@ ntp_print(register const u_char *cp, u_int length)
 		tok2str(ntp_stratum_values, (bp->stratum >=2 && bp->stratum<=15) ? "secondary reference" : "reserved", bp->stratum));
 
 	TCHECK(bp->ppoll);
-	printf(", poll %us", bp->ppoll);
+	printf(", poll %u (%us)", bp->ppoll, 1 << bp->ppoll);
 
 	/* Can't TCHECK bp->precision bitfield so bp->distance + 0 instead */
 	TCHECK2(bp->root_delay, 0);
@@ -183,9 +183,12 @@ ntp_print(register const u_char *cp, u_int length)
 	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),