Improve printout of DHCPv6 options.

[tcpdump] / print-timed.c

diff --git a/print-timed.c b/print-timed.c
index b8fec6d85ce7bb5acbb085f751e131c731e94d28..55fbb39eaed74d164172b8ccefad458ab8948222 100644 (file)
--- a/print-timed.c
+++ b/print-timed.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.4 2002-08-01 08:53:32 risso Exp $";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-timed.c,v 1.9 2003-11-16 09:36:40 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -35,15 +35,16 @@ static const char rcsid[] =
 
 #include "timed.h"
 #include "interface.h"
+#include "extract.h"
 
-static char *tsptype[TSPTYPENUMBER] =
+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" };
 
 void
-timed_print(register const u_char *bp, u_int length)
+timed_print(register const u_char *bp)
 {
 #define endof(x) ((u_char *)&(x) + sizeof (x))
        struct tsp *tsp = (struct tsp *)bp;
@@ -85,8 +86,8 @@ timed_print(register const u_char *bp, u_int length)
                        fputs(" [|timed]", stdout);
                        return;
                }
-               sec = ntohl((long)tsp->tsp_time.tv_sec);
-               usec = ntohl((long)tsp->tsp_time.tv_usec);
+               sec = EXTRACT_32BITS(&tsp->tsp_time.tv_sec);
+               usec = EXTRACT_32BITS(&tsp->tsp_time.tv_usec);
                if (usec < 0)
                        /* corrupt, skip the rest of the packet */
                        return;