X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d6f19f48f503fbbe02723c84546c7ed57a4577a2..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-timed.c

diff --git a/print-timed.c b/print-timed.c
index 1d3f7329..ae8d5766 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -21,13 +21,13 @@
 
 /* \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"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -45,7 +45,7 @@ struct tsp {
 		struct tsp_timeval tspu_time;
 		nd_int8_t tspu_hopcnt;
 	} tsp_u;
-	nd_byte		tsp_name[256];
+	nd_byte		tsp_name[256];	/* null-terminated string up to 256 */
 };
 
 #define	tsp_time	tsp_u.tspu_time
@@ -82,7 +82,6 @@ struct tsp {
 
 #define	TSPTYPENUMBER		25
 
-static const char tstr[] = "[|timed]";
 
 static const char *tsptype[TSPTYPENUMBER] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
@@ -98,50 +97,47 @@ timed_print(netdissect_options *ndo,
 	uint8_t tsp_type;
 	int sec, usec;
 
-	ND_TCHECK(tsp->tsp_type);
-	tsp_type = EXTRACT_U_1(tsp->tsp_type);
+	ndo->ndo_protocol = "timed";
+	tsp_type = GET_U_1(tsp->tsp_type);
 	if (tsp_type < TSPTYPENUMBER)
-		ND_PRINT((ndo, "TSP_%s", tsptype[tsp_type]));
+		ND_PRINT("TSP_%s", tsptype[tsp_type]);
 	else
-		ND_PRINT((ndo, "(tsp_type %#x)", tsp_type));
+		ND_PRINT("(tsp_type %#x)", tsp_type);
 
-	ND_TCHECK(tsp->tsp_vers);
-	ND_PRINT((ndo, " vers %u", EXTRACT_U_1(tsp->tsp_vers)));
+	ND_PRINT(" vers %u", GET_U_1(tsp->tsp_vers));
 
-	ND_TCHECK(tsp->tsp_seq);
-	ND_PRINT((ndo, " 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(tsp->tsp_hopcnt);
-		ND_PRINT((ndo, " 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(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 */
 			return;
-		ND_PRINT((ndo, " time "));
+		ND_PRINT(" time ");
 		if (sec < 0 && usec != 0) {
 			sec++;
 			if (sec == 0)
-				ND_PRINT((ndo, "-"));
+				ND_PRINT("-");
 			usec = 1000000 - usec;
 		}
-		ND_PRINT((ndo, "%d.%06d", sec, usec));
+		ND_PRINT("%d.%06d", sec, usec);
 		break;
 	}
-	ND_PRINT((ndo, " name "));
-	if (fn_print(ndo, (const u_char *)tsp->tsp_name, (const u_char *)tsp->tsp_name + sizeof(tsp->tsp_name)))
+	ND_PRINT(" name ");
+	if (nd_printzp(ndo, tsp->tsp_name, sizeof(tsp->tsp_name),
+		       ndo->ndo_snapend))
 		goto trunc;
 	return;
 
 trunc:
-	ND_PRINT((ndo, " %s", tstr));
+	nd_print_trunc(ndo);
 }