X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6f2cd8cee6372b2d3f4783ce30a603b31839d31f..refs/heads/mcr-macro-update-1:/print-timed.c

diff --git a/print-timed.c b/print-timed.c
index f9a5835a..ae8d5766 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -21,7 +21,7 @@
 
 /* \summary: Berkeley UNIX Time Synchronization Protocol */
 
-/* specification: http://docs.freebsd.org/44doc/smm/12.timed/paper.pdf */
+/* specification: https://docs.freebsd.org/44doc/smm/12.timed/paper.pdf */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -98,31 +98,26 @@ timed_print(netdissect_options *ndo,
 	int sec, usec;
 
 	ndo->ndo_protocol = "timed";
-	ND_TCHECK_1(tsp->tsp_type);
-	tsp_type = EXTRACT_U_1(tsp->tsp_type);
+	tsp_type = GET_U_1(tsp->tsp_type);
 	if (tsp_type < TSPTYPENUMBER)
 		ND_PRINT("TSP_%s", tsptype[tsp_type]);
 	else
 		ND_PRINT("(tsp_type %#x)", tsp_type);
 
-	ND_TCHECK_1(tsp->tsp_vers);
-	ND_PRINT(" vers %u", EXTRACT_U_1(tsp->tsp_vers));
+	ND_PRINT(" vers %u", GET_U_1(tsp->tsp_vers));
 
-	ND_TCHECK_2(tsp->tsp_seq);
-	ND_PRINT(" seq %u", EXTRACT_BE_U_2(tsp->tsp_seq));
+	ND_PRINT(" seq %u", GET_BE_U_2(tsp->tsp_seq));
 
 	switch (tsp_type) {
 	case TSP_LOOP:
-		ND_TCHECK_1(tsp->tsp_hopcnt);
-		ND_PRINT(" hopcnt %u", EXTRACT_U_1(tsp->tsp_hopcnt));
+		ND_PRINT(" hopcnt %u", GET_U_1(tsp->tsp_hopcnt));
 		break;
 	case TSP_SETTIME:
 	case TSP_ADJTIME:
 	case TSP_SETDATE:
 	case TSP_SETDATEREQ:
-		ND_TCHECK_8(&tsp->tsp_time);
-		sec = EXTRACT_BE_S_4(tsp->tsp_time.tv_sec);
-		usec = EXTRACT_BE_S_4(tsp->tsp_time.tv_usec);
+		sec = GET_BE_S_4(tsp->tsp_time.tv_sec);
+		usec = GET_BE_S_4(tsp->tsp_time.tv_usec);
 		/* XXX The comparison below is always false? */
 		if (usec < 0)
 			/* invalid, skip the rest of the packet */