X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/513f782ae18791f0c925b9235da749b38159b607..b51a0dafc7861eb31d21524ec067d7c529a664b8:/print-timed.c

diff --git a/print-timed.c b/print-timed.c
index a6dca86f..ebd0ac8a 100644
--- a/print-timed.c
+++ b/print-timed.c
@@ -21,10 +21,10 @@
 
 /* \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"
@@ -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
@@ -79,16 +79,34 @@ struct tsp {
 #define	TSP_SETDATE		22	/* New from date command */
 #define	TSP_SETDATEREQ		23	/* New remote for above */
 #define	TSP_LOOP		24	/* loop detection packet */
-
-#define	TSPTYPENUMBER		25
-
-static const char tstr[] = "[|timed]";
-
-static const char *tsptype[TSPTYPENUMBER] =
-  { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
-  "SLAVEUP", "ELECTION", "ACCEPT", "REFUSE", "CONFLICT", "RESOLVE", "QUIT",
-  "DATE", "DATEREQ", "DATEACK", "TRACEON", "TRACEOFF", "MSITE", "MSITEREQ",
-  "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
+static const struct tok tsptype_str[] = {
+	{ TSP_ANY,        "TSP_ANY"        },
+	{ TSP_ADJTIME,    "TSP_ADJTIME"    },
+	{ TSP_ACK,        "TSP_ACK"        },
+	{ TSP_MASTERREQ,  "TSP_MASTERREQ"  },
+	{ TSP_MASTERACK,  "TSP_MASTERACK"  },
+	{ TSP_SETTIME,    "TSP_SETTIME"    },
+	{ TSP_MASTERUP,   "TSP_MASTERUP"   },
+	{ TSP_SLAVEUP,    "TSP_SLAVEUP"    },
+	{ TSP_ELECTION,   "TSP_ELECTION"   },
+	{ TSP_ACCEPT,     "TSP_ACCEPT"     },
+	{ TSP_REFUSE,     "TSP_REFUSE"     },
+	{ TSP_CONFLICT,   "TSP_CONFLICT"   },
+	{ TSP_RESOLVE,    "TSP_RESOLVE"    },
+	{ TSP_QUIT,       "TSP_QUIT"       },
+	{ TSP_DATE,       "TSP_DATE"       },
+	{ TSP_DATEREQ,    "TSP_DATEREQ"    },
+	{ TSP_DATEACK,    "TSP_DATEACK"    },
+	{ TSP_TRACEON,    "TSP_TRACEON"    },
+	{ TSP_TRACEOFF,   "TSP_TRACEOFF"   },
+	{ TSP_MSITE,      "TSP_MSITE"      },
+	{ TSP_MSITEREQ,   "TSP_MSITEREQ"   },
+	{ TSP_TEST,       "TSP_TEST"       },
+	{ TSP_SETDATE,    "TSP_SETDATE"    },
+	{ TSP_SETDATEREQ, "TSP_SETDATEREQ" },
+	{ TSP_LOOP,       "TSP_LOOP"       },
+	{ 0, NULL }
+};
 
 void
 timed_print(netdissect_options *ndo,
@@ -98,31 +116,24 @@ timed_print(netdissect_options *ndo,
 	uint8_t tsp_type;
 	int sec, usec;
 
-	ND_TCHECK_1(tsp->tsp_type);
-	tsp_type = EXTRACT_U_1(tsp->tsp_type);
-	if (tsp_type < TSPTYPENUMBER)
-		ND_PRINT("TSP_%s", tsptype[tsp_type]);
-	else
-		ND_PRINT("(tsp_type %#x)", tsp_type);
+	ndo->ndo_protocol = "timed";
+	tsp_type = GET_U_1(tsp->tsp_type);
+	ND_PRINT("%s", tok2str(tsptype_str, "(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(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 +149,5 @@ 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)))
-		goto trunc;
-	return;
-
-trunc:
-	ND_PRINT(" %s", tstr);
+	nd_printjnp(ndo, tsp->tsp_name, sizeof(tsp->tsp_name));
 }