X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b8c56aa09228ee6c59af9bd2565bc66b69ac7943..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/util-print.c?ds=sidebyside diff --git a/util-print.c b/util-print.c index 5db042a3..58efc4b4 100644 --- a/util-print.c +++ b/util-print.c @@ -21,7 +21,7 @@ /* * txtproto_print() derived from original code by Hannes Gredler - * (hannes@juniper.net): + * (hannes@gredler.at): * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that: (1) source code @@ -53,6 +53,7 @@ #include #include "netdissect.h" +#include "extract.h" #include "ascii_strcasecmp.h" #include "timeval-operations.h" @@ -86,17 +87,17 @@ fn_print_char(netdissect_options *ndo, u_char c) } /* - * Print out a null-terminated filename (or other ascii string). + * Print out a null-terminated filename (or other ASCII string). * 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 fn_print(netdissect_options *ndo, - register const u_char *s, register const u_char *ep) + const u_char *s, const u_char *ep) { - register int ret; - register u_char c; + int ret; + u_char c; ret = 1; /* assume truncated */ while (ep == NULL || s < ep) { @@ -119,7 +120,7 @@ fn_print(netdissect_options *ndo, } /* - * Print out a null-terminated filename (or other ascii string) from + * Print out a null-terminated filename (or other ASCII string) from * a fixed-length buffer. * If ep is NULL, assume no truncation check is needed. * Return the number of bytes of string processed, including the @@ -127,10 +128,10 @@ fn_print(netdissect_options *ndo, */ u_int fn_printztn(netdissect_options *ndo, - register const u_char *s, register u_int n, register const u_char *ep) + const u_char *s, u_int n, const u_char *ep) { - register u_int bytes; - register u_char c; + u_int bytes; + u_char c; bytes = 0; for (;;) { @@ -169,16 +170,16 @@ fn_printztn(netdissect_options *ndo, } /* - * Print out a counted filename (or other ascii string). + * Print out a counted filename (or other ASCII string). * If ep is NULL, assume no truncation check is needed. * Return true if truncated. * Stop at ep (if given) or after n bytes, whichever is first. */ int fn_printn(netdissect_options *ndo, - register const u_char *s, register u_int n, register const u_char *ep) + const u_char *s, u_int n, const u_char *ep) { - register u_char c; + u_char c; while (n > 0 && (ep == NULL || s < ep)) { n--; @@ -197,7 +198,7 @@ fn_printn(netdissect_options *ndo, } /* - * Print out a null-padded filename (or other ascii string). + * Print out a null-padded filename (or other ASCII string). * 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, @@ -205,11 +206,11 @@ fn_printn(netdissect_options *ndo, */ int fn_printzp(netdissect_options *ndo, - register const u_char *s, register u_int n, - register const u_char *ep) + const u_char *s, u_int n, + const u_char *ep) { - register int ret; - register u_char c; + int ret; + u_char c; ret = 1; /* assume truncated */ while (n > 0 && (ep == NULL || s < ep)) { @@ -311,9 +312,9 @@ _U_ */ void ts_print(netdissect_options *ndo, - register const struct timeval *tvp) + const struct timeval *tvp) { - register int s; + int s; struct tm *tm; time_t Time; char buf[TS_BUF_SIZE]; @@ -479,8 +480,8 @@ print_unknown_data(netdissect_options *ndo, const u_char *cp,const char *ident,i * Convert a token value to a string; use "fmt" if not found. */ const char * -tok2strbuf(register const struct tok *lp, register const char *fmt, - register u_int v, char *buf, size_t bufsize) +tok2strbuf(const struct tok *lp, const char *fmt, + u_int v, char *buf, size_t bufsize) { if (lp != NULL) { while (lp->s != NULL) { @@ -498,10 +499,12 @@ tok2strbuf(register const struct tok *lp, register const char *fmt, /* * Convert a token value to a string; use "fmt" if not found. + * Uses tok2strbuf() on one of four local static buffers of size TOKBUFSIZE + * in round-robin fashion. */ const char * -tok2str(register const struct tok *lp, register const char *fmt, - register u_int v) +tok2str(const struct tok *lp, const char *fmt, + u_int v) { static char buf[4][TOKBUFSIZE]; static int idx = 0; @@ -518,13 +521,14 @@ tok2str(register const struct tok *lp, register const char *fmt, * if the s field is positive. */ static char * -bittok2str_internal(register const struct tok *lp, register const char *fmt, - register u_int v, const char *sep) +bittok2str_internal(const struct tok *lp, const char *fmt, + u_int v, const char *sep) { - static char buf[256]; /* our stringbuffer */ - int buflen=0; - register u_int rotbit; /* this is the bit we rotate through all bitpositions */ - register u_int tokval; + 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) { @@ -537,8 +541,20 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt, */ if (tokval == (v&rotbit)) { /* ok we have found something */ - buflen+=snprintf(buf+buflen, sizeof(buf)-buflen, "%s%s", - sepstr, lp->s); + 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; } @@ -547,7 +563,7 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt, lp++; } - if (buflen == 0) + if (bufp == buf) /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */ (void)snprintf(buf, sizeof(buf), fmt == NULL ? "#%08x" : fmt, v); return (buf); @@ -558,8 +574,8 @@ bittok2str_internal(register const struct tok *lp, register const char *fmt, * this is useful for parsing bitfields, the output strings are not seperated. */ char * -bittok2str_nosep(register const struct tok *lp, register const char *fmt, - register u_int v) +bittok2str_nosep(const struct tok *lp, const char *fmt, + u_int v) { return (bittok2str_internal(lp, fmt, v, "")); } @@ -569,8 +585,8 @@ bittok2str_nosep(register const struct tok *lp, register const char *fmt, * this is useful for parsing bitfields, the output strings are comma seperated. */ char * -bittok2str(register const struct tok *lp, register const char *fmt, - register u_int v) +bittok2str(const struct tok *lp, const char *fmt, + u_int v) { return (bittok2str_internal(lp, fmt, v, ", ")); } @@ -582,8 +598,8 @@ bittok2str(register const struct tok *lp, register const char *fmt, * correct for bounds-checking. */ const char * -tok2strary_internal(register const char **lp, int n, register const char *fmt, - register int v) +tok2strary_internal(const char **lp, int n, const char *fmt, + int v) { static char buf[TOKBUFSIZE]; @@ -675,7 +691,7 @@ fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len, size_t toklen = 0; for (; idx < len; idx++) { - if (!ND_TTEST(*(pptr + idx))) { + if (!ND_TTEST_1(pptr + idx)) { /* ran past end of captured data */ return (0); } @@ -709,7 +725,7 @@ fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len, * an end-of-line (CR or LF). */ for (; idx < len; idx++) { - if (!ND_TTEST(*(pptr + idx))) { + if (!ND_TTEST_1(pptr + idx)) { /* ran past end of captured data */ break; } @@ -744,7 +760,7 @@ print_txt_line(netdissect_options *ndo, const char *protoname, startidx = idx; while (idx < len) { - ND_TCHECK(*(pptr+idx)); + ND_TCHECK_1(pptr + idx); if (*(pptr+idx) == '\n') { /* * LF without CR; end of line. @@ -760,7 +776,7 @@ print_txt_line(netdissect_options *ndo, const char *protoname, /* not in this packet */ return (0); } - ND_TCHECK(*(pptr+idx+1)); + ND_TCHECK_1(pptr + idx + 1); if (*(pptr+idx+1) == '\n') { /* * CR-LF; end of line. @@ -812,14 +828,21 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len, u_int idx, eol; u_char token[MAX_TOKEN+1]; const char *cmd; - int is_reqresp = 0; + int print_this = 0; const char *pnp; if (cmds != NULL) { /* * This protocol has more than just request and * response lines; see whether this looks like a - * request or response. + * request or response and, if so, print it and, + * in verbose mode, print everything after it. + * + * This is for HTTP-like protocols, where we + * want to print requests and responses, but + * don't want to print continuations of request + * or response bodies in packets that don't + * contain the request or response line. */ idx = fetch_token(ndo, pptr, 0, len, token, sizeof(token)); if (idx != 0) { @@ -827,7 +850,7 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len, while ((cmd = *cmds++) != NULL) { if (ascii_strcasecmp((const char *)token, cmd) == 0) { /* Yes. */ - is_reqresp = 1; + print_this = 1; break; } } @@ -849,28 +872,36 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len, if (isdigit(token[0]) && isdigit(token[1]) && isdigit(token[2]) && token[3] == '\0') { /* Yes. */ - is_reqresp = 1; + print_this = 1; } } } } else { /* - * This protocol has only request and response lines - * (e.g., FTP, where all the data goes over a - * different connection); assume the payload is - * a request or response. + * Either: + * + * 1) This protocol has only request and response lines + * (e.g., FTP, where all the data goes over a different + * connection); assume the payload is a request or + * response. + * + * or + * + * 2) This protocol is just text, so that we should + * always, at minimum, print the first line and, + * in verbose mode, print all lines. */ - is_reqresp = 1; + print_this = 1; } /* Capitalize the protocol name */ for (pnp = protoname; *pnp != '\0'; pnp++) ND_PRINT((ndo, "%c", toupper((u_char)*pnp))); - if (is_reqresp) { + if (print_this) { /* * In non-verbose mode, just print the protocol, followed - * by the first line as the request or response info. + * by the first line. * * In verbose mode, print lines as text until we run out * of characters or see something that's not a @@ -902,7 +933,7 @@ safeputs(netdissect_options *ndo, { u_int idx = 0; - while (*s && idx < maxlen) { + while (idx < maxlen && *s) { safeputchar(ndo, *s); idx++; s++; @@ -916,11 +947,38 @@ safeputchar(netdissect_options *ndo, ND_PRINT((ndo, (c < 0x80 && ND_ISPRINT(c)) ? "%c" : "\\0x%02x", c)); } -#ifdef LBL_ALIGN +#if (defined(__i386__) || defined(_M_IX86) || defined(__X86__) || defined(__x86_64__) || defined(_M_X64)) || \ + (defined(__arm__) || defined(_M_ARM) || defined(__aarch64__)) || \ + (defined(__m68k__) && (!defined(__mc68000__) && !defined(__mc68010__))) || \ + (defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC) || defined(_ARCH_PPC) || defined(_ARCH_PPC64)) || \ + (defined(__s390__) || defined(__s390x__) || defined(__zarch__)) || \ + defined(__vax__) /* - * Some compilers try to optimize memcpy(), using the alignment constraint - * on the argument pointer type. by using this function, we try to avoid the - * optimization. + * The procesor natively handles unaligned loads, so just use memcpy() + * and memcmp(), to enable those optimizations. + * + * XXX - are those all the x86 tests we need? + * XXX - do we need to worry about ARMv1 through ARMv5, which didn't + * support unaligned loads, and, if so, do we need to worry about all + * of them, or just some of them, e.g. ARMv5? + * XXX - are those the only 68k tests we need not to generated + * unaligned accesses if the target is the 68000 or 68010? + * XXX - are there any tests we don't need, because some definitions are for + * compilers that also predefine the GCC symbols? + * XXX - do we need to test for both 32-bit and 64-bit versions of those + * architectures in all cases? + */ +#else +/* + * The processor doesn't natively handle unaligned loads, + * and the compiler might "helpfully" optimize memcpy() + * and memcmp(), when handed pointers that would normally + * be properly aligned, into sequences that assume proper + * alignment. + * + * Do copies and compares of possibly-unaligned data by + * calling routines that wrap memcpy() and memcmp(), to + * prevent that optimization. */ void unaligned_memcpy(void *p, const void *q, size_t l)