remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / util-print.c

diff --git a/util-print.c b/util-print.c
index 5d9056a1ebe7cd369de5fb9bfe4346275b8ec876..e22e535e8d2b2d62c9ead781614180d9f0301567 100644 (file)
--- a/util-print.c
+++ b/util-print.c
@@ -46,12 +46,13 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

-#include <ctype.h>

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

+#include "netdissect-ctype.h"
+

 #include "netdissect.h"
 #include "extract.h"
 #include "ascii_strcasecmp.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-");
        }
                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("^");
        }
                c ^= 0x40;      /* DEL to ?, others to alpha */
                ND_PRINT("^");
        }


@@ -109,7 +110,7 @@ nd_print(netdissect_options *ndo,
 
        ret = 1;                        /* assume truncated */
        while (ep == NULL || s < ep) {
 
        ret = 1;                        /* assume truncated */
        while (ep == NULL || s < ep) {

-               c = EXTRACT_U_1(s);
+               c = GET_U_1(s);

                s++;
                if (c == '\0') {
                        ret = 0;
                s++;
                if (c == '\0') {
                        ret = 0;


@@ -162,7 +163,7 @@ nd_printztn(netdissect_options *ndo,
                        break;
                }
 
                        break;
                }
 

-               c = EXTRACT_U_1(s);
+               c = GET_U_1(s);

                s++;
                bytes++;
                n--;
                s++;
                bytes++;
                n--;


@@ -190,7 +191,7 @@ nd_printn(netdissect_options *ndo,
 
        while (n > 0 && (ep == NULL || s < ep)) {
                n--;
 
        while (n > 0 && (ep == NULL || s < ep)) {
                n--;

-               c = EXTRACT_U_1(s);
+               c = GET_U_1(s);

                s++;
                fn_print_char(ndo, c);
        }
                s++;
                fn_print_char(ndo, c);
        }


@@ -216,7 +217,7 @@ nd_printzp(netdissect_options *ndo,
        ret = 1;                        /* assume truncated */
        while (n > 0 && (ep == NULL || s < ep)) {
                n--;
        ret = 1;                        /* assume truncated */
        while (n > 0 && (ep == NULL || s < ep)) {
                n--;

-               c = EXTRACT_U_1(s);
+               c = GET_U_1(s);

                s++;
                if (c == '\0') {
                        ret = 0;
                s++;
                if (c == '\0') {
                        ret = 0;


@@ -231,7 +232,7 @@ nd_printzp(netdissect_options *ndo,
  * Print the timestamp .FRAC part (Microseconds/nanoseconds)
  */
 static void
  * 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) {
 {
 #ifdef HAVE_PCAP_SET_TSTAMP_PRECISION
        switch (ndo->ndo_tstamp_precision) {


@@ -259,7 +260,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
  *   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;
                      enum date_flag date_flag, enum time_flag time_flag)
 {
        time_t Time = sec;


@@ -293,7 +294,7 @@ ts_date_hmsfrac_print(netdissect_options *ndo, int sec, int usec,
  * 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, int sec, int usec)
+ts_unix_print(netdissect_options *ndo, long sec, long usec)

 {
        if ((unsigned)sec & 0x80000000) {
                ND_PRINT("[Error converting time]");
 {
        if ((unsigned)sec & 0x80000000) {
                ND_PRINT("[Error converting time]");


@@ -451,6 +452,14 @@ void nd_print_protocol(netdissect_options *ndo)
        ND_PRINT("%s", ndo->ndo_protocol);
 }
 
        ND_PRINT("%s", ndo->ndo_protocol);
 }
 

+/* Print the protocol name in caps (uppercases) */
+void nd_print_protocol_caps(netdissect_options *ndo)
+{
+       const char *p;
+        for (p = ndo->ndo_protocol; *p != '\0'; p++)
+                ND_PRINT("%c", ND_ASCII_TOUPPER(*p));
+}
+

 /* Print the invalid string */
 void nd_print_invalid(netdissect_options *ndo)
 {
 /* Print the invalid string */
 void nd_print_invalid(netdissect_options *ndo)
 {


@@ -464,21 +473,20 @@ void nd_print_invalid(netdissect_options *ndo)
  */
 
 int
  */
 
 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 *ident, 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",
+       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);
                return(0);
        }
                    ident);
                return(0);
        }

-        hex_print(ndo, ident,cp,len);
+       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);

        return(1); /* everything is ok */
 }
 
        return(1); /* everything is ok */
 }
 


@@ -499,7 +507,7 @@ tok2strbuf(const struct tok *lp, const char *fmt,
        if (fmt == NULL)
                fmt = "#%d";
 
        if (fmt == NULL)
                fmt = "#%d";
 

-       (void)nd_snprintf(buf, bufsize, fmt, v);
+       (void)snprintf(buf, bufsize, fmt, v);

        return (const char *)buf;
 }
 
        return (const char *)buf;
 }
 


@@ -571,7 +579,7 @@ bittok2str_internal(const struct tok *lp, const char *fmt,
 
         if (bufp == buf)
             /* bummer - lets print the "unknown" message as advised in the fmt string if we got one */
 
         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);
 }
 
         return (buf);
 }
 


@@ -613,7 +621,7 @@ tok2strary_internal(const char **lp, int n, const char *fmt,
                return lp[v];
        if (fmt == NULL)
                fmt = "#%d";
                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);
 }
 
        return (buf);
 }
 


@@ -695,21 +703,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 *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);
                }
 
        for (; idx < len; idx++) {
                if (!ND_TTEST_1(pptr + idx)) {
                        /* ran past end of captured data */
                        return (0);
                }

-               if (!isascii(EXTRACT_U_1(pptr + idx))) {
+               c = GET_U_1(pptr + idx);
+               if (!ND_ISASCII(c)) {

                        /* not an ASCII character */
                        return (0);
                }
                        /* not an ASCII character */
                        return (0);
                }

-               if (isspace(EXTRACT_U_1(pptr + idx))) {
+               if (c == ' ' || c == '\t' || c == '\r' || c == '\n') {

                        /* end of token */
                        break;
                }
                        /* end of token */
                        break;
                }

-               if (!isprint(EXTRACT_U_1(pptr + idx))) {
+               if (!ND_ASCII_ISPRINT(c)) {

                        /* not part of a command token or response code */
                        return (0);
                }
                        /* not part of a command token or response code */
                        return (0);
                }


@@ -717,7 +727,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);
                }
                        /* no room for this character and terminating '\0' */
                        return (0);
                }

-               tbuf[toklen] = EXTRACT_U_1(pptr + idx);
+               tbuf[toklen] = c;

                toklen++;
        }
        if (toklen == 0) {
                toklen++;
        }
        if (toklen == 0) {


@@ -735,15 +745,16 @@ fetch_token(netdissect_options *ndo, const u_char *pptr, u_int idx, u_int len,
                        /* ran past end of captured data */
                        break;
                }
                        /* ran past end of captured data */
                        break;
                }

-               if (EXTRACT_U_1(pptr + idx) == '\r' || EXTRACT_U_1(pptr + idx) == '\n') {
+               c = GET_U_1(pptr + idx);
+               if (c == '\r' || c == '\n') {

                        /* end of line */
                        break;
                }
                        /* end of line */
                        break;
                }

-               if (!isascii(EXTRACT_U_1(pptr + idx)) || !isprint(EXTRACT_U_1(pptr + idx))) {
+               if (!ND_ASCII_ISPRINT(c)) {

                        /* not a printable ASCII character */
                        break;
                }
                        /* not a printable ASCII character */
                        break;
                }

-               if (!isspace(EXTRACT_U_1(pptr + idx))) {
+               if (c != ' ' && c != '\t' && c != '\r' && c != '\n') {

                        /* beginning of next token */
                        break;
                }
                        /* beginning of next token */
                        break;
                }


@@ -763,11 +774,12 @@ print_txt_line(netdissect_options *ndo, const char *prefix,
 {
        u_int startidx;
        u_int linelen;
 {
        u_int startidx;
        u_int linelen;

+       u_char c;

 
        startidx = idx;
        while (idx < len) {
 
        startidx = idx;
        while (idx < len) {

-               ND_TCHECK_1(pptr + idx);
-               if (EXTRACT_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
                        /*
                         * LF without CR; end of line.
                         * Skip the LF and print the line, with the


@@ -776,14 +788,13 @@ print_txt_line(netdissect_options *ndo, const char *prefix,
                        linelen = idx - startidx;
                        idx++;
                        goto print;
                        linelen = idx - startidx;
                        idx++;
                        goto print;

-               } else if (EXTRACT_U_1(pptr + idx) == '\r') {
+               } else if (c == '\r') {

                        /* CR - any LF? */
                        if ((idx+1) >= len) {
                                /* not in this packet */
                                return (0);
                        }
                        /* CR - any LF? */
                        if ((idx+1) >= len) {
                                /* not in this packet */
                                return (0);
                        }

-                       ND_TCHECK_1(pptr + idx + 1);
-                       if (EXTRACT_U_1(pptr + idx + 1) == '\n') {
+                       if (GET_U_1(pptr + idx + 1) == '\n') {

                                /*
                                 * CR-LF; end of line.
                                 * Skip the CR-LF and print the line, with
                                /*
                                 * CR-LF; end of line.
                                 * Skip the CR-LF and print the line, with


@@ -800,9 +811,7 @@ print_txt_line(netdissect_options *ndo, const char *prefix,
                         * it.
                         */
                        return (0);
                         * it.
                         */
                        return (0);

-               } else if (!isascii(EXTRACT_U_1(pptr + idx)) ||
-                          (!isprint(EXTRACT_U_1(pptr + idx)) &&
-                           EXTRACT_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
                        /*
                         * Not a printable ASCII character and not a tab;
                         * treat this as if it were binary data, and


@@ -817,7 +826,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.
         */
         * 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);
        linelen = idx - startidx;
        ND_PRINT("%s%.*s", prefix, (int)linelen, pptr + startidx);
        nd_print_trunc(ndo);


@@ -837,7 +845,6 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len,
        u_char token[MAX_TOKEN+1];
        const char *cmd;
        int print_this = 0;
        u_char token[MAX_TOKEN+1];
        const char *cmd;
        int print_this = 0;

-       const char *pnp;

 
        if (cmds != NULL) {
                /*
 
        if (cmds != NULL) {
                /*


@@ -877,8 +884,8 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len,
                                    sizeof(token));
                        }
                        if (idx != 0) {
                                    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;
                                }
                                        /* Yes. */
                                        print_this = 1;
                                }


@@ -902,9 +909,7 @@ txtproto_print(netdissect_options *ndo, const u_char *pptr, u_int len,
                print_this = 1;
        }
 
                print_this = 1;
        }
 

-       /* Capitalize the protocol name */
-       for (pnp = ndo->ndo_protocol; *pnp != '\0'; pnp++)
-               ND_PRINT("%c", ND_TOUPPER((u_char)*pnp));
+       nd_print_protocol_caps(ndo);

 
        if (print_this) {
                /*
 
        if (print_this) {
                /*