CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / util-print.c

diff --git a/util-print.c b/util-print.c
index 6d408d15d4ad772a74b01712f44c10118185cdbf..594327012e8626e7b3cb04f77fdd3120be468308 100644 (file)
--- a/util-print.c
+++ b/util-print.c
@@ -35,17 +35,12 @@
  * FOR A PARTICULAR PURPOSE.
  */
 
  * FOR A PARTICULAR PURPOSE.
  */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 #include <sys/stat.h>
 
 
 #include "netdissect-stdinc.h"
 
 #include <sys/stat.h>
 

-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif

 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>


@@ -181,7 +176,7 @@ nd_printn(netdissect_options *ndo,
 void
 nd_printjn(netdissect_options *ndo, const u_char *s, u_int n)
 {
 void
 nd_printjn(netdissect_options *ndo, const u_char *s, u_int n)
 {

-       while (n > 0) {
+       while (n != 0) {

                fn_print_char(ndo, GET_U_1(s));
                n--;
                s++;
                fn_print_char(ndo, GET_U_1(s));
                n--;
                s++;


@@ -200,7 +195,7 @@ nd_printjnp(netdissect_options *ndo, const u_char *s, u_int n)
 {
        u_char c;
 
 {
        u_char c;
 

-       while (n > 0) {
+       while (n != 0) {

                c = GET_U_1(s);
                if (c == '\0')
                        break;
                c = GET_U_1(s);
                if (c == '\0')
                        break;


@@ -214,17 +209,21 @@ nd_printjnp(netdissect_options *ndo, const u_char *s, u_int n)
  * Print the timestamp .FRAC part (Microseconds/nanoseconds)
  */
 static void
  * Print the timestamp .FRAC part (Microseconds/nanoseconds)
  */
 static void

-ts_frac_print(netdissect_options *ndo, long usec)
+ts_frac_print(netdissect_options *ndo, const struct timeval *tv)

 {
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
        switch (ndo->ndo_tstamp_precision) {
 
        case PCAP_TSTAMP_PRECISION_MICRO:
 {
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
        switch (ndo->ndo_tstamp_precision) {
 
        case PCAP_TSTAMP_PRECISION_MICRO:

-               ND_PRINT(".%06u", (unsigned)usec);
+               ND_PRINT(".%06u", (unsigned)tv->tv_usec);
+               if ((unsigned)tv->tv_usec > ND_MICRO_PER_SEC - 1)
+                       ND_PRINT(" " ND_INVALID_MICRO_SEC_STR);

                break;
 
        case PCAP_TSTAMP_PRECISION_NANO:
                break;
 
        case PCAP_TSTAMP_PRECISION_NANO:

-               ND_PRINT(".%09u", (unsigned)usec);
+               ND_PRINT(".%09u", (unsigned)tv->tv_usec);
+               if ((unsigned)tv->tv_usec > ND_NANO_PER_SEC - 1)
+                       ND_PRINT(" " ND_INVALID_NANO_SEC_STR);

                break;
 
        default:
                break;
 
        default:


@@ -232,7 +231,9 @@ ts_frac_print(netdissect_options *ndo, long usec)
                break;
        }
 #else
                break;
        }
 #else

-       ND_PRINT(".%06u", (unsigned)usec);
+       ND_PRINT(".%06u", (unsigned)tv->tv_usec);
+       if ((unsigned)tv->tv_usec > ND_MICRO_PER_SEC - 1)
+               ND_PRINT(" " ND_INVALID_MICRO_SEC_STR);

 #endif
 }
 
 #endif
 }
 


@@ -242,49 +243,64 @@ ts_frac_print(netdissect_options *ndo, long usec)
  *   if date_flag == WITH_DATE print YY:MM:DD before HH:MM:SS.FRAC
  */
 static void
  *   if date_flag == WITH_DATE print YY:MM:DD before HH:MM:SS.FRAC
  */
 static void

-ts_date_hmsfrac_print(netdissect_options *ndo, long sec, long usec,
+ts_date_hmsfrac_print(netdissect_options *ndo, const struct timeval *tv,

                      enum date_flag date_flag, enum time_flag time_flag)
 {
                      enum date_flag date_flag, enum time_flag time_flag)
 {

-       time_t Time = sec;

        struct tm *tm;
        struct tm *tm;

-       char timestr[32];
+       char timebuf[32];
+       const char *timestr;
+#ifdef _WIN32
+       time_t sec;
+#endif

 
 

-       if ((unsigned)sec & 0x80000000) {
-               ND_PRINT("[Error converting time]");
+       if (tv->tv_sec < 0) {
+               ND_PRINT("[timestamp overflow]");

                return;
        }
 
                return;
        }
 

+#ifdef _WIN32
+       /* on Windows tv->tv_sec is a long not a 64-bit time_t. */
+       sec = tv->tv_sec;
+#endif
+

        if (time_flag == LOCAL_TIME)
        if (time_flag == LOCAL_TIME)

-               tm = localtime(&Time);
+#ifdef _WIN32
+               tm = localtime(&sec);
+#else
+               tm = localtime(&tv->tv_sec);
+#endif

        else
        else

-               tm = gmtime(&Time);
+#ifdef _WIN32
+               tm = gmtime(&sec);
+#else
+               tm = gmtime(&tv->tv_sec);
+#endif

 
 

-       if (!tm) {
-               ND_PRINT("[Error converting time]");
-               return;
+       if (date_flag == WITH_DATE) {
+               timestr = nd_format_time(timebuf, sizeof(timebuf),
+                   "%Y-%m-%d %H:%M:%S", tm);
+       } else {
+               timestr = nd_format_time(timebuf, sizeof(timebuf),
+                   "%H:%M:%S", tm);

        }
        }

-       if (date_flag == WITH_DATE)
-               strftime(timestr, sizeof(timestr), "%Y-%m-%d %H:%M:%S", tm);
-       else
-               strftime(timestr, sizeof(timestr), "%H:%M:%S", tm);

        ND_PRINT("%s", timestr);
 
        ND_PRINT("%s", timestr);
 

-       ts_frac_print(ndo, usec);
+       ts_frac_print(ndo, tv);

 }
 
 /*
  * Print the timestamp - Unix timeval style, as SECS.FRAC.
  */
 static void
 }
 
 /*
  * Print the timestamp - Unix timeval style, as SECS.FRAC.
  */
 static void

-ts_unix_print(netdissect_options *ndo, long sec, long usec)
+ts_unix_print(netdissect_options *ndo, const struct timeval *tv)

 {
 {

-       if ((unsigned)sec & 0x80000000) {
-               ND_PRINT("[Error converting time]");
+       if (tv->tv_sec < 0) {
+               ND_PRINT("[timestamp overflow]");

                return;
        }
 
                return;
        }
 

-       ND_PRINT("%u", (unsigned)sec);
-       ts_frac_print(ndo, usec);
+       ND_PRINT("%" PRId64, (int64_t)tv->tv_sec);
+       ts_frac_print(ndo, tv);

 }
 
 /*
 }
 
 /*


@@ -302,8 +318,7 @@ ts_print(netdissect_options *ndo,
        switch (ndo->ndo_tflag) {
 
        case 0: /* Default */
        switch (ndo->ndo_tflag) {
 
        case 0: /* Default */

-               ts_date_hmsfrac_print(ndo, tvp->tv_sec, tvp->tv_usec,
-                                     WITHOUT_DATE, LOCAL_TIME);
+               ts_date_hmsfrac_print(ndo, tvp, WITHOUT_DATE, LOCAL_TIME);

                ND_PRINT(" ");
                break;
 
                ND_PRINT(" ");
                break;
 


@@ -311,7 +326,7 @@ ts_print(netdissect_options *ndo,
                break;
 
        case 2: /* Unix timeval style */
                break;
 
        case 2: /* Unix timeval style */

-               ts_unix_print(ndo, tvp->tv_sec, tvp->tv_usec);
+               ts_unix_print(ndo, tvp);

                ND_PRINT(" ");
                break;
 
                ND_PRINT(" ");
                break;
 


@@ -342,8 +357,7 @@ ts_print(netdissect_options *ndo,
                        netdissect_timevalsub(tvp, &tv_ref, &tv_result, nano_prec);
 
                ND_PRINT((negative_offset ? "-" : " "));
                        netdissect_timevalsub(tvp, &tv_ref, &tv_result, nano_prec);
 
                ND_PRINT((negative_offset ? "-" : " "));

-               ts_date_hmsfrac_print(ndo, tv_result.tv_sec, tv_result.tv_usec,
-                                     WITHOUT_DATE, UTC_TIME);
+               ts_date_hmsfrac_print(ndo, &tv_result, WITHOUT_DATE, UTC_TIME);

                ND_PRINT(" ");
 
                 if (ndo->ndo_tflag == 3)
                ND_PRINT(" ");
 
                 if (ndo->ndo_tflag == 3)


@@ -351,8 +365,7 @@ ts_print(netdissect_options *ndo,
                break;
 
        case 4: /* Date + Default */
                break;
 
        case 4: /* Date + Default */

-               ts_date_hmsfrac_print(ndo, tvp->tv_sec, tvp->tv_usec,
-                                     WITH_DATE, LOCAL_TIME);
+               ts_date_hmsfrac_print(ndo, tvp, WITH_DATE, LOCAL_TIME);

                ND_PRINT(" ");
                break;
        }
                ND_PRINT(" ");
                break;
        }


@@ -376,7 +389,7 @@ unsigned_relts_print(netdissect_options *ndo,
                ND_PRINT("0s");
                return;
        }
                ND_PRINT("0s");
                return;
        }

-       while (secs > 0) {
+       while (secs != 0) {

                if (secs >= *s) {
                        ND_PRINT("%u%s", secs / *s, *l);
                        secs -= (secs / *s) * *s;
                if (secs >= *s) {
                        ND_PRINT("%u%s", secs / *s, *l);
                        secs -= (secs / *s) * *s;


@@ -422,6 +435,26 @@ signed_relts_print(netdissect_options *ndo,
        unsigned_relts_print(ndo, secs);
 }
 
        unsigned_relts_print(ndo, secs);
 }
 

+/*
+ * Format a struct tm with strftime().
+ * If the pointer to the struct tm is null, that means that the
+ * routine to convert a time_t to a struct tm failed; the localtime()
+ * and gmtime() in the Microsoft Visual Studio C library will fail,
+ * returning null, if the value is before the UNIX Epoch.
+ */
+const char *
+nd_format_time(char *buf, size_t bufsize, const char *format,
+         const struct tm *timeptr)
+{
+       if (timeptr != NULL) {
+               if (strftime(buf, bufsize, format, timeptr) != 0)
+                       return (buf);
+               else
+                       return ("[nd_format_time() buffer is too small]");
+       } else
+               return ("[localtime() or gmtime() couldn't convert the date and time]");
+}
+

 /* Print the truncated string */
 void nd_print_trunc(netdissect_options *ndo)
 {
 /* Print the truncated string */
 void nd_print_trunc(netdissect_options *ndo)
 {


@@ -448,6 +481,23 @@ void nd_print_invalid(netdissect_options *ndo)
        ND_PRINT(" (invalid)");
 }
 
        ND_PRINT(" (invalid)");
 }
 

+/*
+ * Print a sequence of bytes, separated by a single space.
+ * Stop if truncated (via GET_U_1/longjmp) or after n bytes,
+ * whichever is first.
+ */
+void
+nd_print_bytes_hex(netdissect_options *ndo, const u_char *cp, u_int n)
+{
+       while (n > 0) {
+               ND_PRINT("%02x", GET_U_1(cp));
+               n--;
+               cp++;
+               if (n > 0)
+                       ND_PRINT(" ");
+       }
+}
+

 /*
  *  this is a generic routine for printing unknown data;
  *  we pass on the linefeed plus indentation string to
 /*
  *  this is a generic routine for printing unknown data;
  *  we pass on the linefeed plus indentation string to


@@ -676,7 +726,7 @@ mask62plen(const u_char *mask)
  * either a space character at the beginning of the line (this
  * includes a blank line) or no more tokens remaining on the line.
  */
  * either a space character at the beginning of the line (this
  * includes a blank line) or no more tokens remaining on the line.
  */

-static int
+static u_int

 fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len,
            u_char *tbuf, size_t tbuflen)
 {
 fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len,
            u_char *tbuf, size_t tbuflen)
 {


@@ -802,11 +852,10 @@ print_txt_line(netdissect_options *ndo, const char *prefix,
 
        /*
         * All printable ASCII, but no line ending after that point
 
        /*
         * All printable ASCII, but no line ending after that point

-        * in the buffer; treat this as if it were truncated.
+        * in the buffer.

         */
        linelen = idx - startidx;
        ND_PRINT("%s%.*s", prefix, (int)linelen, pptr + startidx);
         */
        linelen = idx - startidx;
        ND_PRINT("%s%.*s", prefix, (int)linelen, pptr + startidx);

-       nd_print_trunc(ndo);

        return (0);
 
 print:
        return (0);
 
 print: