]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-ntp.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add changes in 4.2.1.
[tcpdump] / print-ntp.c
diff --git a/print-ntp.c b/print-ntp.c
index 1d32fda80d14340e4e615b1c2a75f7bec14feeff..d56f02a2624f9482d43d401185f27e6b6be6f231 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -24,8 +24,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint
-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.36 2002-12-28 17:15:06 hannes Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ntp.c,v 1.43 2007-11-30 13:45:10 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -36,6 +36,9 @@ static const char rcsid[] =
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_STRFTIME
+#include <time.h>
+#endif
 
 #include "interface.h"
 #include "addrtoname.h"
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -49,6 +52,32 @@ static void p_sfix(const struct s_fixedpt *);
 static void p_ntp_time(const struct l_fixedpt *);
 static void p_ntp_delta(const struct l_fixedpt *, const struct l_fixedpt *);
 
 static void p_ntp_time(const struct l_fixedpt *);
 static void p_ntp_delta(const struct l_fixedpt *, const struct l_fixedpt *);
 
+static struct tok ntp_mode_values[] = {
+    { MODE_UNSPEC,    "unspecified" },
+    { MODE_SYM_ACT,   "symmetric active" },
+    { MODE_SYM_PAS,   "symmetric passive" },
+    { MODE_CLIENT,    "Client" },
+    { MODE_SERVER,    "Server" },
+    { MODE_BROADCAST, "Broadcast" },
+    { MODE_RES1,      "Reserved" },
+    { MODE_RES2,      "Reserved" },
+    { 0, NULL }
+};
+
+static struct tok ntp_leapind_values[] = {
+    { NO_WARNING,     "" },
+    { PLUS_SEC,       "+1s" },
+    { MINUS_SEC,      "-1s" },
+    { ALARM,          "clock unsynchronized" },
+    { 0, NULL }
+};
+
+static struct tok ntp_stratum_values[] = {
+       { UNSPECIFIED,  "unspecified" },
+       { PRIM_REF,     "primary reference" },
+       { 0, NULL }
+};
+
 /*
  * Print ntp requests
  */
 /*
  * Print ntp requests
  */
@@ -59,90 +88,51 @@ ntp_print(register const u_char *cp, u_int length)
        int mode, version, leapind;
 
        bp = (struct ntpdata *)cp;
        int mode, version, leapind;
 
        bp = (struct ntpdata *)cp;
-       /* Note funny sized packets */
-       if (length != sizeof(struct ntpdata))
-               (void)printf(" [len=%d]", length);
 
        TCHECK(bp->status);
 
        version = (int)(bp->status & VERSIONMASK) >> 3;
        printf("NTPv%d", version);
 
 
        TCHECK(bp->status);
 
        version = (int)(bp->status & VERSIONMASK) >> 3;
        printf("NTPv%d", version);
 
-       leapind = bp->status & LEAPMASK;
-       switch (leapind) {
-
-       case NO_WARNING:
-               break;
-
-       case PLUS_SEC:
-               fputs(" +1s", stdout);
-               break;
-
-       case MINUS_SEC:
-               fputs(" -1s", stdout);
-               break;
-       }
-
        mode = bp->status & MODEMASK;
        mode = bp->status & MODEMASK;
-       switch (mode) {
+        if (!vflag) {
+            printf (", %s, length %u",
+                    tok2str(ntp_mode_values, "Unknown mode", mode),
+                    length);
+            return;
+        }
+        
+        printf (", length %u\n\t%s",
+                length,
+                tok2str(ntp_mode_values, "Unknown mode", mode));        
 
 
-       case MODE_UNSPEC:       /* unspecified */
-               fputs(" unspec", stdout);
-               break;
-
-       case MODE_SYM_ACT:      /* symmetric active */
-               fputs(" sym_act", stdout);
-               break;
-
-       case MODE_SYM_PAS:      /* symmetric passive */
-               fputs(" sym_pas", stdout);
-               break;
-
-       case MODE_CLIENT:       /* client */
-               fputs(" client", stdout);
-               break;
-
-       case MODE_SERVER:       /* server */
-               fputs(" server", stdout);
-               break;
-
-       case MODE_BROADCAST:    /* broadcast */
-               fputs(" bcast", stdout);
-               break;
-
-       case MODE_RES1:         /* reserved */
-               fputs(" res1", stdout);
-               break;
-
-       case MODE_RES2:         /* reserved */
-               fputs(" res2", stdout);
-               break;
-
-       }
+       leapind = bp->status & LEAPMASK;
+        printf (", Leap indicator: %s (%u)",
+                tok2str(ntp_leapind_values, "Unknown", leapind),
+                leapind);
 
        TCHECK(bp->stratum);
 
        TCHECK(bp->stratum);
-       printf(", strat %d", bp->stratum);
+       printf(", Stratum %u (%s)",     
+               bp->stratum,
+               tok2str(ntp_stratum_values, (bp->stratum >=2 && bp->stratum<=15) ? "secondary reference" : "reserved", bp->stratum));
 
        TCHECK(bp->ppoll);
 
        TCHECK(bp->ppoll);
-       printf(", poll %d", bp->ppoll);
+       printf(", poll %us", bp->ppoll);
 
        /* Can't TCHECK bp->precision bitfield so bp->distance + 0 instead */
 
        /* Can't TCHECK bp->precision bitfield so bp->distance + 0 instead */
-       TCHECK2(bp->distance, 0);
-       printf(", prec %d", bp->precision);
-
-       if (!vflag)
-               return;
+       TCHECK2(bp->root_delay, 0);
+       printf(", precision %d", bp->precision);
 
 
-       TCHECK(bp->distance);
-       fputs(" dist ", stdout);
-       p_sfix(&bp->distance);
+       TCHECK(bp->root_delay);
+       fputs("\n\tRoot Delay: ", stdout);
+       p_sfix(&bp->root_delay);
 
 
-       TCHECK(bp->dispersion);
-       fputs(", disp ", stdout);
-       p_sfix(&bp->dispersion);
+       TCHECK(bp->root_dispersion);
+       fputs(", Root dispersion: ", stdout);
+       p_sfix(&bp->root_dispersion);
 
        TCHECK(bp->refid);
 
        TCHECK(bp->refid);
-       fputs(", ref ", stdout);
+       fputs(", Reference-ID: ", stdout);
        /* Interpretation depends on stratum */
        switch (bp->stratum) {
 
        /* Interpretation depends on stratum */
        switch (bp->stratum) {
 
@@ -151,7 +141,8 @@ ntp_print(register const u_char *cp, u_int length)
                break;
 
        case PRIM_REF:
                break;
 
        case PRIM_REF:
-               fn_printn((u_char *)&(bp->refid), 4, NULL);
+               if (fn_printn((u_char *)&(bp->refid), 4, snapend))
+                       goto trunc;
                break;
 
        case INFO_QUERY:
                break;
 
        case INFO_QUERY:
@@ -169,22 +160,41 @@ ntp_print(register const u_char *cp, u_int length)
                break;
        }
 
                break;
        }
 
-       TCHECK(bp->reftime);
-       putchar('@');
-       p_ntp_time(&(bp->reftime));
-
-       TCHECK(bp->org);
-       fputs(" orig ", stdout);
-       p_ntp_time(&(bp->org));
-
-       TCHECK(bp->rec);
-       fputs(" rec ", stdout);
-       p_ntp_delta(&(bp->org), &(bp->rec));
-
-       TCHECK(bp->xmt);
-       fputs(" xmt ", stdout);
-       p_ntp_delta(&(bp->org), &(bp->xmt));
-
+       TCHECK(bp->ref_timestamp);
+       fputs("\n\t  Reference Timestamp:  ", stdout);
+       p_ntp_time(&(bp->ref_timestamp));
+
+       TCHECK(bp->org_timestamp);
+       fputs("\n\t  Originator Timestamp: ", stdout);
+       p_ntp_time(&(bp->org_timestamp));
+
+       TCHECK(bp->rec_timestamp);
+       fputs("\n\t  Receive Timestamp:    ", stdout);
+       p_ntp_time(&(bp->rec_timestamp));
+
+       TCHECK(bp->xmt_timestamp);
+       fputs("\n\t  Transmit Timestamp:   ", stdout);
+       p_ntp_time(&(bp->xmt_timestamp));
+
+       fputs("\n\t    Originator - Receive Timestamp:  ", stdout);
+       p_ntp_delta(&(bp->org_timestamp), &(bp->rec_timestamp));
+
+       fputs("\n\t    Originator - Transmit Timestamp: ", stdout);
+       p_ntp_delta(&(bp->org_timestamp), &(bp->xmt_timestamp));
+
+       if ( (sizeof(struct ntpdata) - length) == 16) {         /* Optional: key-id */
+               TCHECK(bp->key_id);
+               printf("\n\tKey id: %u", bp->key_id);
+       } else if ( (sizeof(struct ntpdata) - length) == 0) {   /* Optional: key-id + authentication */
+               TCHECK(bp->key_id);
+               printf("\n\tKey id: %u", bp->key_id);
+               TCHECK2(bp->message_digest, sizeof (bp->message_digest));
+                printf("\n\tAuthentication: %08x%08x%08x%08x",
+                              EXTRACT_32BITS(bp->message_digest),
+                              EXTRACT_32BITS(bp->message_digest + 4),
+                              EXTRACT_32BITS(bp->message_digest + 8),
+                              EXTRACT_32BITS(bp->message_digest + 12));
+        }
        return;
 
 trunc:
        return;
 
 trunc:
@@ -223,6 +233,21 @@ p_ntp_time(register const struct l_fixedpt *lfp)
        ff = ff / FMAXINT;      /* shift radix point by 32 bits */
        f = ff * 1000000000.0;  /* treat fraction as parts per billion */
        printf("%u.%09d", i, f);
        ff = ff / FMAXINT;      /* shift radix point by 32 bits */
        f = ff * 1000000000.0;  /* treat fraction as parts per billion */
        printf("%u.%09d", i, f);
+
+#ifdef HAVE_STRFTIME
+       /*
+        * print the time in human-readable format.
+        */
+       if (i) {
+           time_t seconds = i - JAN_1970;
+           struct tm *tm;
+           char time_buf[128];
+
+           tm = localtime(&seconds);
+           strftime(time_buf, sizeof (time_buf), "%Y/%m/%d %H:%M:%S", tm);
+           printf (" (%s)", time_buf);
+       }
+#endif
 }
 
 /* Prints time difference between *lfp and *olfp */
 }
 
 /* Prints time difference between *lfp and *olfp */
@@ -231,16 +256,22 @@ p_ntp_delta(register const struct l_fixedpt *olfp,
            register const struct l_fixedpt *lfp)
 {
        register int32_t i;
            register const struct l_fixedpt *lfp)
 {
        register int32_t i;
-       register u_int32_t uf;
-       register u_int32_t ouf;
+       register u_int32_t u, uf;
+       register u_int32_t ou, ouf;
        register u_int32_t f;
        register float ff;
        int signbit;
 
        register u_int32_t f;
        register float ff;
        int signbit;
 
-       i = EXTRACT_32BITS(&lfp->int_part) - EXTRACT_32BITS(&olfp->int_part);
-
+       u = EXTRACT_32BITS(&lfp->int_part);
+       ou = EXTRACT_32BITS(&olfp->int_part);
        uf = EXTRACT_32BITS(&lfp->fraction);
        ouf = EXTRACT_32BITS(&olfp->fraction);
        uf = EXTRACT_32BITS(&lfp->fraction);
        ouf = EXTRACT_32BITS(&olfp->fraction);
+       if (ou == 0 && ouf == 0) {
+               p_ntp_time(lfp);
+               return;
+       }
+
+       i = u - ou;
 
        if (i > 0) {            /* new is definitely greater than old */
                signbit = 0;
 
        if (i > 0) {            /* new is definitely greater than old */
                signbit = 0;
[mirror] the TCPdump network dissector