Revert partially the commit 21b1273

[tcpdump] / print-timed.c

diff --git a/print-timed.c b/print-timed.c
index cbeaf00dff6e7b4e2bb3e6e6df9fc571f310df74..ae8d576634fd6f7560adb806745280d359937f93 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -19,36 +19,33 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

+/* \summary: Berkeley UNIX Time Synchronization Protocol */
+
+/* specification: https://docs.freebsd.org/44doc/smm/12.timed/paper.pdf */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 

-#include "interface.h"
+#include "netdissect.h"

 #include "extract.h"
 
 #include "extract.h"
 

-/*
- * Time Synchronization Protocol
- */
-

 struct tsp_timeval {
 struct tsp_timeval {

-       u_int32_t       tv_sec;
-       u_int32_t       tv_usec;
+       nd_int32_t      tv_sec;
+       nd_int32_t      tv_usec;

 };
 
 struct tsp {
 };
 
 struct tsp {

-       u_int8_t        tsp_type;
-       u_int8_t        tsp_vers;
-       u_int16_t       tsp_seq;
+       nd_uint8_t      tsp_type;
+       nd_uint8_t      tsp_vers;
+       nd_uint16_t     tsp_seq;

        union {
                struct tsp_timeval tspu_time;
        union {
                struct tsp_timeval tspu_time;

-               int8_t tspu_hopcnt;
+               nd_int8_t tspu_hopcnt;

        } tsp_u;
        } tsp_u;

-       int8_t tsp_name[256];
+       nd_byte         tsp_name[256];  /* null-terminated string up to 256 */

 };
 
 #define        tsp_time        tsp_u.tspu_time
 };
 
 #define        tsp_time        tsp_u.tspu_time


@@ -85,7 +82,6 @@ struct tsp {
 
 #define        TSPTYPENUMBER           25
 
 
 #define        TSPTYPENUMBER           25
 

-static const char tstr[] = "[|timed]";

 
 static const char *tsptype[TSPTYPENUMBER] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",
 
 static const char *tsptype[TSPTYPENUMBER] =
   { "ANY", "ADJTIME", "ACK", "MASTERREQ", "MASTERACK", "SETTIME", "MASTERUP",


@@ -94,68 +90,54 @@ static const char *tsptype[TSPTYPENUMBER] =
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
 
 void
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
 
 void

-timed_print(register const u_char *bp)
+timed_print(netdissect_options *ndo,
+            const u_char *bp)

 {
 {

-#define endof(x) ((u_char *)&(x) + sizeof (x))
-       struct tsp *tsp = (struct tsp *)bp;
-       long sec, usec;
-       const u_char *end;
-
-       if (endof(tsp->tsp_type) > snapend) {
-               printf("%s", tstr);
-               return;
-       }
-       if (tsp->tsp_type < TSPTYPENUMBER)
-               printf("TSP_%s", tsptype[tsp->tsp_type]);
+       const struct tsp *tsp = (const struct tsp *)bp;
+       uint8_t tsp_type;
+       int sec, usec;
+
+       ndo->ndo_protocol = "timed";
+       tsp_type = GET_U_1(tsp->tsp_type);
+       if (tsp_type < TSPTYPENUMBER)
+               ND_PRINT("TSP_%s", tsptype[tsp_type]);

        else
        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("(tsp_type %#x)", tsp_type);
+
+       ND_PRINT(" vers %u", GET_U_1(tsp->tsp_vers));
+
+       ND_PRINT(" seq %u", GET_BE_U_2(tsp->tsp_seq));
+
+       switch (tsp_type) {
+       case TSP_LOOP:
+               ND_PRINT(" hopcnt %u", GET_U_1(tsp->tsp_hopcnt));
+               break;
+       case TSP_SETTIME:
+       case TSP_ADJTIME:
+       case TSP_SETDATE:
+       case TSP_SETDATEREQ:
+               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)
                if (usec < 0)

-                       /* corrupt, skip the rest of the packet */
+                       /* invalid, skip the rest of the packet */

                        return;
                        return;

-               fputs(" time ", stdout);
+               ND_PRINT(" time ");

                if (sec < 0 && usec != 0) {
                        sec++;
                        if (sec == 0)
                if (sec < 0 && usec != 0) {
                        sec++;
                        if (sec == 0)

-                               fputc('-', stdout);
+                               ND_PRINT("-");

                        usec = 1000000 - usec;
                }
                        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("%d.%06d", sec, usec);
+               break;

        }
        }

+       ND_PRINT(" name ");
+       if (nd_printzp(ndo, tsp->tsp_name, sizeof(tsp->tsp_name),
+                      ndo->ndo_snapend))
+               goto trunc;
+       return;
+
+trunc:
+       nd_print_trunc(ndo);

 }
 }