More nd_ification of structures.

[tcpdump] / print-timed.c

diff --git a/print-timed.c b/print-timed.c
index 40908dd0f40a30750d29e53ae982eb32a54459e5..33397c0d20de9ac8e5d6e07c8da6d41458d7cba7 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -19,36 +19,32 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.9 2003-11-16 09:36:40 guy Exp $";
-#endif
+/* \summary: BSD time daemon protocol printer */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
 /*
  * Time Synchronization Protocol
+ *
+ * http://docs.freebsd.org/44doc/smm/12.timed/paper.pdf
  */
 
 struct tsp_timeval {
-       u_int32_t       tv_sec;
-       u_int32_t       tv_usec;
+       uint32_t        tv_sec;
+       uint32_t        tv_usec;
 };
 
 struct tsp {
-       u_int8_t        tsp_type;
-       u_int8_t        tsp_vers;
-       u_int16_t       tsp_seq;
+       uint8_t         tsp_type;
+       uint8_t         tsp_vers;
+       uint16_t        tsp_seq;
        union {
                struct tsp_timeval tspu_time;
                int8_t tspu_hopcnt;
@@ -99,68 +95,56 @@ static const char *tsptype[TSPTYPENUMBER] =
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
 
 void
-timed_print(register const u_char *bp)
+timed_print(netdissect_options *ndo,
+            register const u_char *bp)
 {
-#define endof(x) ((u_char *)&(x) + sizeof (x))
-       struct tsp *tsp = (struct tsp *)bp;
+       const struct tsp *tsp = (const struct tsp *)bp;
        long sec, usec;
-       const u_char *end;
 
-       if (endof(tsp->tsp_type) > snapend) {
-               printf("%s", tstr);
-               return;
-       }
+       ND_TCHECK(tsp->tsp_type);
        if (tsp->tsp_type < TSPTYPENUMBER)
-               printf("TSP_%s", tsptype[tsp->tsp_type]);
+               ND_PRINT((ndo, "TSP_%s", tsptype[tsp->tsp_type]));
        else
-               printf("(tsp_type %#x)", tsp->tsp_type);
-
-       if (endof(tsp->tsp_vers) > snapend) {
-               printf(" %s", tstr);
-               return;
-       }
-       printf(" vers %d", tsp->tsp_vers);
-
-       if (endof(tsp->tsp_seq) > snapend) {
-               printf(" %s", tstr);
-               return;
-       }
-       printf(" seq %d", tsp->tsp_seq);
-
-       if (tsp->tsp_type == TSP_LOOP) {
-               if (endof(tsp->tsp_hopcnt) > snapend) {
-                       printf(" %s", tstr);
-                       return;
-               }
-               printf(" hopcnt %d", tsp->tsp_hopcnt);
-       } else if (tsp->tsp_type == TSP_SETTIME ||
-         tsp->tsp_type == TSP_ADJTIME ||
-         tsp->tsp_type == TSP_SETDATE ||
-         tsp->tsp_type == TSP_SETDATEREQ) {
-               if (endof(tsp->tsp_time) > snapend) {
-                       printf(" %s", tstr);
-                       return;
-               }
-               sec = EXTRACT_32BITS(&tsp->tsp_time.tv_sec);
-               usec = EXTRACT_32BITS(&tsp->tsp_time.tv_usec);
+               ND_PRINT((ndo, "(tsp_type %#x)", tsp->tsp_type));
+
+       ND_TCHECK(tsp->tsp_vers);
+       ND_PRINT((ndo, " vers %u", tsp->tsp_vers));
+
+       ND_TCHECK(tsp->tsp_seq);
+       ND_PRINT((ndo, " seq %u", tsp->tsp_seq));
+
+       switch (tsp->tsp_type) {
+       case TSP_LOOP:
+               ND_TCHECK(tsp->tsp_hopcnt);
+               ND_PRINT((ndo, " hopcnt %u", tsp->tsp_hopcnt));
+               break;
+       case TSP_SETTIME:
+       case TSP_ADJTIME:
+       case TSP_SETDATE:
+       case TSP_SETDATEREQ:
+               ND_TCHECK(tsp->tsp_time);
+               sec = EXTRACT_BE_U_4(&tsp->tsp_time.tv_sec);
+               usec = EXTRACT_BE_U_4(&tsp->tsp_time.tv_usec);
+               /* XXX The comparison below is always false? */
                if (usec < 0)
-                       /* corrupt, skip the rest of the packet */
+                       /* invalid, skip the rest of the packet */
                        return;
-               fputs(" time ", stdout);
+               ND_PRINT((ndo, " time "));
                if (sec < 0 && usec != 0) {
                        sec++;
                        if (sec == 0)
-                               fputc('-', stdout);
+                               ND_PRINT((ndo, "-"));
                        usec = 1000000 - usec;
                }
-               printf("%ld.%06ld", sec, usec);
-       }
-
-       end = memchr(tsp->tsp_name, '\0', snapend - (u_char *)tsp->tsp_name);
-       if (end == NULL)
-               printf(" %s", tstr);
-       else {
-               fputs(" name ", stdout);
-               fwrite(tsp->tsp_name, end - (u_char *)tsp->tsp_name, 1, stdout);
+               ND_PRINT((ndo, "%ld.%06ld", sec, usec));
+               break;
        }
+       ND_TCHECK(tsp->tsp_name);
+       ND_PRINT((ndo, " 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((ndo, " %s", tstr));
 }