X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/7217abf41a060c9e9b5cdde30a759e79329a1b00..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/util-print.c diff --git a/util-print.c b/util-print.c index fd3e654d..d65f0266 100644 --- a/util-print.c +++ b/util-print.c @@ -46,12 +46,13 @@ #ifdef HAVE_FCNTL_H #include #endif -#include #include #include #include #include +#include "netdissect-ctype.h" + #include "netdissect.h" #include "extract.h" #include "ascii_strcasecmp.h" @@ -72,7 +73,7 @@ fn_print_char(netdissect_options *ndo, u_char c) c = ND_TOASCII(c); ND_PRINT("M-"); } - if (!ND_ISPRINT(c)) { + if (!ND_ASCII_ISPRINT(c)) { c ^= 0x40; /* DEL to ?, others to alpha */ ND_PRINT("^"); } @@ -93,33 +94,6 @@ fn_print_str(netdissect_options *ndo, const u_char *s) } } -/* - * Print out a null-terminated filename (or other ASCII string), part of - * the packet buffer. - * If ep is NULL, assume no truncation check is needed. - * Return true if truncated. - * Stop at ep (if given) or before the null char, whichever is first. - */ -int -nd_print(netdissect_options *ndo, - const u_char *s, const u_char *ep) -{ - int ret; - u_char c; - - ret = 1; /* assume truncated */ - while (ep == NULL || s < ep) { - c = GET_U_1(s); - s++; - if (c == '\0') { - ret = 0; - break; - } - fn_print_char(ndo, c); - } - return(ret); -} - /* * Print out a null-terminated filename (or other ASCII string) from * a fixed-length field in the packet buffer, or from what remains of @@ -198,40 +172,49 @@ nd_printn(netdissect_options *ndo, } /* - * Print out a null-padded filename (or other ASCII string), part of - * the packet buffer. - * If ep is NULL, assume no truncation check is needed. - * Return true if truncated. - * Stop at ep (if given) or after n bytes or before the null char, + * Print a counted filename (or other ASCII string), part of + * the packet buffer, filtering out non-printable characters. + * Stop if truncated (via GET_U_1/longjmp) or after n bytes, * whichever is first. + * The suffix comes from: j:longJmp, n:after N bytes. */ -int -nd_printzp(netdissect_options *ndo, - const u_char *s, u_int n, - const u_char *ep) +void +nd_printjn(netdissect_options *ndo, const u_char *s, u_int n) +{ + while (n > 0) { + fn_print_char(ndo, GET_U_1(s)); + n--; + s++; + } +} + +/* + * Print a null-padded filename (or other ASCII string), part of + * the packet buffer, filtering out non-printable characters. + * Stop if truncated (via GET_U_1/longjmp) or after n bytes or before + * the null char, whichever occurs first. + * The suffix comes from: j:longJmp, n:after N bytes, p:null-Padded. + */ +void +nd_printjnp(netdissect_options *ndo, const u_char *s, u_int n) { - int ret; u_char c; - ret = 1; /* assume truncated */ - while (n > 0 && (ep == NULL || s < ep)) { - n--; + while (n > 0) { c = GET_U_1(s); - s++; - if (c == '\0') { - ret = 0; + if (c == '\0') break; - } fn_print_char(ndo, c); + n--; + s++; } - return (n == 0) ? 0 : ret; } /* * Print the timestamp .FRAC part (Microseconds/nanoseconds) */ static void -ts_frac_print(netdissect_options *ndo, int usec) +ts_frac_print(netdissect_options *ndo, long usec) { #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION switch (ndo->ndo_tstamp_precision) { @@ -259,7 +242,7 @@ ts_frac_print(netdissect_options *ndo, int usec) * if date_flag == WITH_DATE print YY:MM:DD before HH:MM:SS.FRAC */ static void -ts_date_hmsfrac_print(netdissect_options *ndo, int sec, int usec, +ts_date_hmsfrac_print(netdissect_options *ndo, long sec, long usec, enum date_flag date_flag, enum time_flag time_flag) { time_t Time = sec; @@ -293,7 +276,7 @@ ts_date_hmsfrac_print(netdissect_options *ndo, int sec, int usec, * Print the timestamp - Unix timeval style, as SECS.FRAC. */ static void -ts_unix_print(netdissect_options *ndo, int sec, int usec) +ts_unix_print(netdissect_options *ndo, long sec, long usec) { if ((unsigned)sec & 0x80000000) { ND_PRINT("[Error converting time]"); @@ -456,7 +439,7 @@ void nd_print_protocol_caps(netdissect_options *ndo) { const char *p; for (p = ndo->ndo_protocol; *p != '\0'; p++) - ND_PRINT("%c", ND_TOUPPER((u_char)*p)); + ND_PRINT("%c", ND_ASCII_TOUPPER(*p)); } /* Print the invalid string */ @@ -472,21 +455,15 @@ void nd_print_invalid(netdissect_options *ndo) */ int -print_unknown_data(netdissect_options *ndo, const u_char *cp,const char *ident,int len) +print_unknown_data(netdissect_options *ndo, const u_char *cp, + const char *indent, u_int len) { - if (len < 0) { - ND_PRINT("%sDissector error: print_unknown_data called with negative length", - ident); + if (!ND_TTEST_LEN(cp, 0)) { + ND_PRINT("%sDissector error: %s() called with pointer past end of packet", + indent, __func__); return(0); } - if (ndo->ndo_snapend - cp < len) - len = ndo->ndo_snapend - cp; - if (len < 0) { - ND_PRINT("%sDissector error: print_unknown_data called with pointer past end of packet", - ident); - return(0); - } - hex_print(ndo, ident,cp,len); + hex_print(ndo, indent, cp, ND_MIN(len, ND_BYTES_AVAILABLE_AFTER(cp))); return(1); /* everything is ok */ } @@ -507,7 +484,7 @@ tok2strbuf(const struct tok *lp, const char *fmt, if (fmt == NULL) fmt = "#%d"; - (void)nd_snprintf(buf, bufsize, fmt, v); + (void)snprintf(buf, bufsize, fmt, v); return (const char *)buf; } @@ -533,6 +510,9 @@ tok2str(const struct tok *lp, const char *fmt, * Convert a bit token value to a string; use "fmt" if not found. * this is useful for parsing bitfields, the output strings are separated * if the s field is positive. + * + * A token matches iff it has one or more bits set and every bit that is set + * in the token is set in v. Consequently, a 0 token never matches. */ static char * bittok2str_internal(const struct tok *lp, const char *fmt, @@ -541,45 +521,33 @@ bittok2str_internal(const struct tok *lp, const char *fmt, static char buf[1024+1]; /* our string buffer */ char *bufp = buf; size_t space_left = sizeof(buf), string_size; - u_int rotbit; /* this is the bit we rotate through all bitpositions */ - u_int tokval; const char * sepstr = ""; - while (lp != NULL && lp->s != NULL) { - tokval=lp->v; /* load our first value */ - rotbit=1; - while (rotbit != 0) { - /* - * lets AND the rotating bit with our token value - * and see if we have got a match - */ - if (tokval == (v&rotbit)) { - /* ok we have found something */ - if (space_left <= 1) - return (buf); /* only enough room left for NUL, if that */ - string_size = strlcpy(bufp, sepstr, space_left); - if (string_size >= space_left) - return (buf); /* we ran out of room */ - bufp += string_size; - space_left -= string_size; - if (space_left <= 1) - return (buf); /* only enough room left for NUL, if that */ - string_size = strlcpy(bufp, lp->s, space_left); - if (string_size >= space_left) - return (buf); /* we ran out of room */ - bufp += string_size; - space_left -= string_size; - sepstr = sep; - break; - } - rotbit=rotbit<<1; /* no match - lets shift and try again */ + while (lp != NULL && lp->s != NULL) { + if (lp->v && (v & lp->v) == lp->v) { + /* ok we have found something */ + if (space_left <= 1) + return (buf); /* only enough room left for NUL, if that */ + string_size = strlcpy(bufp, sepstr, space_left); + if (string_size >= space_left) + return (buf); /* we ran out of room */ + bufp += string_size; + space_left -= string_size; + if (space_left <= 1) + return (buf); /* only enough room left for NUL, if that */ + string_size = strlcpy(bufp, lp->s, space_left); + if (string_size >= space_left) + return (buf); /* we ran out of room */ + bufp += string_size; + space_left -= string_size; + sepstr = sep; } lp++; - } + } if (bufp == buf) /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */ - (void)nd_snprintf(buf, sizeof(buf), fmt == NULL ? "#%08x" : fmt, v); + (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%08x" : fmt, v); return (buf); } @@ -621,10 +589,24 @@ tok2strary_internal(const char **lp, int n, const char *fmt, return lp[v]; if (fmt == NULL) fmt = "#%d"; - (void)nd_snprintf(buf, sizeof(buf), fmt, v); + (void)snprintf(buf, sizeof(buf), fmt, v); return (buf); } +const struct tok * +uint2tokary_internal(const struct uint_tokary dict[], const size_t size, + const u_int val) +{ + size_t i; + /* Try a direct lookup before the full scan. */ + if (val < size && dict[val].uintval == val) + return dict[val].tokary; /* OK if NULL */ + for (i = 0; i < size; i++) + if (dict[i].uintval == val) + return dict[i].tokary; /* OK if NULL */ + return NULL; +} + /* * Convert a 32-bit netmask to prefixlen if possible * the function returns the prefix-len; if plen == -1 @@ -703,21 +685,23 @@ fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len, u_char *tbuf, size_t tbuflen) { size_t toklen = 0; + u_char c; for (; idx < len; idx++) { if (!ND_TTEST_1(pptr + idx)) { /* ran past end of captured data */ return (0); } - if (!isascii(GET_U_1(pptr + idx))) { + c = GET_U_1(pptr + idx); + if (!ND_ISASCII(c)) { /* not an ASCII character */ return (0); } - if (isspace(GET_U_1(pptr + idx))) { + if (c == ' ' || c == '\t' || c == '\r' || c == '\n') { /* end of token */ break; } - if (!isprint(GET_U_1(pptr + idx))) { + if (!ND_ASCII_ISPRINT(c)) { /* not part of a command token or response code */ return (0); } @@ -725,7 +709,7 @@ fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len, /* no room for this character and terminating '\0' */ return (0); } - tbuf[toklen] = GET_U_1(pptr + idx); + tbuf[toklen] = c; toklen++; } if (toklen == 0) { @@ -743,15 +727,16 @@ fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len, /* ran past end of captured data */ break; } - if (GET_U_1(pptr + idx) == '\r' || GET_U_1(pptr + idx) == '\n') { + c = GET_U_1(pptr + idx); + if (c == '\r' || c == '\n') { /* end of line */ break; } - if (!isascii(GET_U_1(pptr + idx)) || !isprint(GET_U_1(pptr + idx))) { + if (!ND_ASCII_ISPRINT(c)) { /* not a printable ASCII character */ break; } - if (!isspace(GET_U_1(pptr + idx))) { + if (c != ' ' && c != '\t' && c != '\r' && c != '\n') { /* beginning of next token */ break; } @@ -771,11 +756,12 @@ print_txt_line(netdissect_options *ndo, const char *prefix, { u_int startidx; u_int linelen; + u_char c; startidx = idx; while (idx < len) { - ND_TCHECK_1(pptr + idx); - if (GET_U_1(pptr + idx) == '\n') { + c = GET_U_1(pptr + idx); + if (c == '\n') { /* * LF without CR; end of line. * Skip the LF and print the line, with the @@ -784,13 +770,12 @@ print_txt_line(netdissect_options *ndo, const char *prefix, linelen = idx - startidx; idx++; goto print; - } else if (GET_U_1(pptr + idx) == '\r') { + } else if (c == '\r') { /* CR - any LF? */ if ((idx+1) >= len) { /* not in this packet */ return (0); } - ND_TCHECK_1(pptr + idx + 1); if (GET_U_1(pptr + idx + 1) == '\n') { /* * CR-LF; end of line. @@ -808,9 +793,7 @@ print_txt_line(netdissect_options *ndo, const char *prefix, * it. */ return (0); - } else if (!isascii(GET_U_1(pptr + idx)) || - (!isprint(GET_U_1(pptr + idx)) && - GET_U_1(pptr + idx) != '\t')) { + } else if (!ND_ASCII_ISPRINT(c) && c != '\t') { /* * Not a printable ASCII character and not a tab; * treat this as if it were binary data, and @@ -825,7 +808,6 @@ print_txt_line(netdissect_options *ndo, const char *prefix, * All printable ASCII, but no line ending after that point * in the buffer; treat this as if it were truncated. */ -trunc: linelen = idx - startidx; ND_PRINT("%s%.*s", prefix, (int)linelen, pptr + startidx); nd_print_trunc(ndo); @@ -884,8 +866,8 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len, sizeof(token)); } if (idx != 0) { - if (isdigit(token[0]) && isdigit(token[1]) && - isdigit(token[2]) && token[3] == '\0') { + if (ND_ASCII_ISDIGIT(token[0]) && ND_ASCII_ISDIGIT(token[1]) && + ND_ASCII_ISDIGIT(token[2]) && token[3] == '\0') { /* Yes. */ print_this = 1; }