Use nd_ types, add EXTRACT_ calls.

[tcpdump] / print-timed.c

diff --git a/print-timed.c b/print-timed.c
index efbdd1969382a9b2667c8b4d155795e0907e2094..1d3f7329ea643fe26b4f89a5dddbfe70fbf87e4b 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -19,34 +19,33 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Berkeley UNIX Time Synchronization Protocol */
+
+/* specification: http://docs.freebsd.org/44doc/smm/12.timed/paper.pdf */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>
 
-#include "interface.h"
+#include "netdissect.h"
 #include "extract.h"
 
-/*
- * Time Synchronization Protocol
- */
-
 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 {
-       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;
-               int8_t tspu_hopcnt;
+               nd_int8_t tspu_hopcnt;
        } tsp_u;
-       int8_t tsp_name[256];
+       nd_byte         tsp_name[256];
 };
 
 #define        tsp_time        tsp_u.tspu_time
@@ -93,38 +92,40 @@ static const char *tsptype[TSPTYPENUMBER] =
 
 void
 timed_print(netdissect_options *ndo,
-            register const u_char *bp)
+            const u_char *bp)
 {
-       struct tsp *tsp = (struct tsp *)bp;
-       long sec, usec;
+       const struct tsp *tsp = (const struct tsp *)bp;
+       uint8_t tsp_type;
+       int sec, usec;
 
        ND_TCHECK(tsp->tsp_type);
-       if (tsp->tsp_type < TSPTYPENUMBER)
-               ND_PRINT((ndo, "TSP_%s", tsptype[tsp->tsp_type]));
+       tsp_type = EXTRACT_U_1(tsp->tsp_type);
+       if (tsp_type < TSPTYPENUMBER)
+               ND_PRINT((ndo, "TSP_%s", tsptype[tsp_type]));
        else
-               ND_PRINT((ndo, "(tsp_type %#x)", tsp->tsp_type));
+               ND_PRINT((ndo, "(tsp_type %#x)", tsp_type));
 
        ND_TCHECK(tsp->tsp_vers);
-       ND_PRINT((ndo, " vers %u", tsp->tsp_vers));
+       ND_PRINT((ndo, " vers %u", EXTRACT_U_1(tsp->tsp_vers)));
 
        ND_TCHECK(tsp->tsp_seq);
-       ND_PRINT((ndo, " seq %u", tsp->tsp_seq));
+       ND_PRINT((ndo, " seq %u", EXTRACT_BE_U_2(tsp->tsp_seq)));
 
-       switch (tsp->tsp_type) {
+       switch (tsp_type) {
        case TSP_LOOP:
                ND_TCHECK(tsp->tsp_hopcnt);
-               ND_PRINT((ndo, " hopcnt %u", tsp->tsp_hopcnt));
+               ND_PRINT((ndo, " hopcnt %u", EXTRACT_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_32BITS(&tsp->tsp_time.tv_sec);
-               usec = EXTRACT_32BITS(&tsp->tsp_time.tv_usec);
+               sec = EXTRACT_BE_S_4(tsp->tsp_time.tv_sec);
+               usec = EXTRACT_BE_S_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;
                ND_PRINT((ndo, " time "));
                if (sec < 0 && usec != 0) {
@@ -133,12 +134,11 @@ timed_print(netdissect_options *ndo,
                                ND_PRINT((ndo, "-"));
                        usec = 1000000 - usec;
                }
-               ND_PRINT((ndo, "%ld.%06ld", sec, usec));
+               ND_PRINT((ndo, "%d.%06d", sec, usec));
                break;
        }
-       ND_TCHECK(tsp->tsp_name);
        ND_PRINT((ndo, " name "));
-       if (fn_print((u_char *)tsp->tsp_name, (u_char *)tsp->tsp_name + sizeof(tsp->tsp_name)))
+       if (fn_print(ndo, (const u_char *)tsp->tsp_name, (const u_char *)tsp->tsp_name + sizeof(tsp->tsp_name)))
                goto trunc;
        return;