X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/9d046ee0503d4c8cbfcb200c88986de876f6cae7..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/util-print.c diff --git a/util-print.c b/util-print.c index 8806b475..d65f0266 100644 --- a/util-print.c +++ b/util-print.c @@ -94,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 @@ -199,33 +172,42 @@ 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; } /* @@ -473,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); - 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); + if (!ND_TTEST_LEN(cp, 0)) { + ND_PRINT("%sDissector error: %s() called with pointer past end of packet", + indent, __func__); 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 */ } @@ -534,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, @@ -542,41 +521,29 @@ 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 */ @@ -626,6 +593,20 @@ tok2strary_internal(const char **lp, int n, const char *fmt, 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 @@ -779,7 +760,6 @@ print_txt_line(netdissect_options *ndo, const char *prefix, startidx = idx; while (idx < len) { - ND_TCHECK_1(pptr + idx); c = GET_U_1(pptr + idx); if (c == '\n') { /* @@ -796,7 +776,6 @@ print_txt_line(netdissect_options *ndo, const char *prefix, /* 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. @@ -829,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);