X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/24d62664fd1a9d9beeeab59ccf0d3ead1e6058f2..41ef9cfe38f86553ffd8f61b6f87e9c00baf5f07:/print-timed.c

diff --git a/print-timed.c b/print-timed.c
index ecc4c388..819f0161 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -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,31 +97,32 @@ timed_print(netdissect_options *ndo,
 	uint8_t tsp_type;
 	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 */
@@ -138,10 +138,11 @@ timed_print(netdissect_options *ndo,
 		break;
 	}
 	ND_PRINT(" name ");
-	if (fn_print(ndo, (const u_char *)tsp->tsp_name, (const u_char *)tsp->tsp_name + sizeof(tsp->tsp_name)))
+	if (nd_printzp(ndo, tsp->tsp_name, sizeof(tsp->tsp_name),
+		       ndo->ndo_snapend))
 		goto trunc;
 	return;
 
 trunc:
-	ND_PRINT(" %s", tstr);
+	nd_print_trunc(ndo);
 }