X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/94366a69b0ea80c2e85aa89f7b7f30d7f335bd76..0023eaa78f123676bfa9c5fba72ea4b8a59aaa70:/util-print.c diff --git a/util-print.c b/util-print.c index 7a6bd099..a1269a52 100644 --- a/util-print.c +++ b/util-print.c @@ -35,17 +35,12 @@ * FOR A PARTICULAR PURPOSE. */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" #include -#ifdef HAVE_FCNTL_H -#include -#endif #include #include #include @@ -221,10 +216,14 @@ ts_frac_print(netdissect_options *ndo, const struct timeval *tv) case PCAP_TSTAMP_PRECISION_MICRO: 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: 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: @@ -233,6 +232,8 @@ ts_frac_print(netdissect_options *ndo, const struct timeval *tv) } #else 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 } @@ -248,16 +249,32 @@ ts_date_hmsfrac_print(netdissect_options *ndo, const struct timeval *tv, struct tm *tm; char timebuf[32]; const char *timestr; +#ifdef _WIN32 + time_t sec; +#endif - if ((unsigned)tv->tv_sec & 0x80000000) { - ND_PRINT("[Error converting time]"); + if (tv->tv_sec < 0) { + ND_PRINT("[timestamp overflow]"); 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) +#ifdef _WIN32 + tm = localtime(&sec); +#else tm = localtime(&tv->tv_sec); +#endif else +#ifdef _WIN32 + tm = gmtime(&sec); +#else tm = gmtime(&tv->tv_sec); +#endif if (date_flag == WITH_DATE) { timestr = nd_format_time(timebuf, sizeof(timebuf), @@ -277,12 +294,12 @@ ts_date_hmsfrac_print(netdissect_options *ndo, const struct timeval *tv, static void ts_unix_print(netdissect_options *ndo, const struct timeval *tv) { - if ((unsigned)tv->tv_sec & 0x80000000) { - ND_PRINT("[Error converting time]"); + if (tv->tv_sec < 0) { + ND_PRINT("[timestamp overflow]"); return; } - ND_PRINT("%u", (unsigned)tv->tv_sec); + ND_PRINT("%" PRId64, (int64_t)tv->tv_sec); ts_frac_print(ndo, tv); } @@ -472,19 +489,14 @@ void nd_print_invalid(netdissect_options *ndo) int print_unknown_data(netdissect_options *ndo, const u_char *cp, - const char *ident, u_int len) + const char *indent, u_int len) { - u_int len_to_print; - - len_to_print = len; if (!ND_TTEST_LEN(cp, 0)) { - ND_PRINT("%sDissector error: print_unknown_data called with pointer past end of packet", - ident); + ND_PRINT("%sDissector error: %s() called with pointer past end of packet", + indent, __func__); return(0); } - if (ND_BYTES_AVAILABLE_AFTER(cp) < len_to_print) - len_to_print = ND_BYTES_AVAILABLE_AFTER(cp); - hex_print(ndo, ident, cp, len_to_print); + hex_print(ndo, indent, cp, ND_MIN(len, ND_BYTES_AVAILABLE_AFTER(cp))); return(1); /* everything is ok */ } @@ -493,7 +505,7 @@ print_unknown_data(netdissect_options *ndo, const u_char *cp, */ static const char * tok2strbuf(const struct tok *lp, const char *fmt, - u_int v, char *buf, size_t bufsize) + const u_int v, char *buf, const size_t bufsize) { if (lp != NULL) { while (lp->s != NULL) { @@ -515,8 +527,7 @@ tok2strbuf(const struct tok *lp, const char *fmt, * in round-robin fashion. */ const char * -tok2str(const struct tok *lp, const char *fmt, - u_int v) +tok2str(const struct tok *lp, const char *fmt, const u_int v) { static char buf[4][TOKBUFSIZE]; static int idx = 0; @@ -537,7 +548,7 @@ tok2str(const struct tok *lp, const char *fmt, */ static char * bittok2str_internal(const struct tok *lp, const char *fmt, - u_int v, const char *sep) + const u_int v, const char *sep) { static char buf[1024+1]; /* our string buffer */ char *bufp = buf; @@ -577,8 +588,7 @@ bittok2str_internal(const struct tok *lp, const char *fmt, * this is useful for parsing bitfields, the output strings are not separated. */ char * -bittok2str_nosep(const struct tok *lp, const char *fmt, - u_int v) +bittok2str_nosep(const struct tok *lp, const char *fmt, const u_int v) { return (bittok2str_internal(lp, fmt, v, "")); } @@ -588,8 +598,7 @@ bittok2str_nosep(const struct tok *lp, const char *fmt, * this is useful for parsing bitfields, the output strings are comma separated. */ char * -bittok2str(const struct tok *lp, const char *fmt, - u_int v) +bittok2str(const struct tok *lp, const char *fmt, const u_int v) { return (bittok2str_internal(lp, fmt, v, ", ")); } @@ -601,8 +610,7 @@ bittok2str(const struct tok *lp, const char *fmt, * correct for bounds-checking. */ const char * -tok2strary_internal(const char **lp, int n, const char *fmt, - int v) +tok2strary_internal(const char **lp, int n, const char *fmt, const int v) { static char buf[TOKBUFSIZE]; @@ -635,7 +643,7 @@ uint2tokary_internal(const struct uint_tokary dict[], const size_t size, */ int -mask2plen(uint32_t mask) +mask2plen(const uint32_t mask) { const uint32_t bitmasks[33] = { 0x00000000, @@ -701,9 +709,9 @@ 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. */ -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) + u_char *tbuf, size_t tbuflen) { size_t toklen = 0; u_char c;