remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-telnet.c

diff --git a/print-telnet.c b/print-telnet.c
index 8dd5f2d62ca7b053863879467388a2da6ec6524d..817d4226855d4d62f9621cbc063fcbbe433d22c5 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -396,7 +396,6 @@ telnet_parse(netdissect_options *ndo, const u_char *sp, u_int length, int print)
        do { \
                if (length < 1) \
                        goto pktend; \
-               ND_TCHECK_1(sp); \
                c = GET_U_1(sp); \
                sp++; \
                length--; \
@@ -438,12 +437,10 @@ telnet_parse(netdissect_options *ndo, const u_char *sp, u_int length, int print)
                /* IAC SB .... IAC SE */
                p = sp;
                while (length > (u_int)(p + 1 - sp)) {
-                       ND_TCHECK_2(p);
                        if (GET_U_1(p) == IAC && GET_U_1(p + 1) == SE)
                                break;
                        p++;
                }
-               ND_TCHECK_1(p);
                if (GET_U_1(p) != IAC)
                        goto pktend;
 
@@ -499,8 +496,6 @@ telnet_parse(netdissect_options *ndo, const u_char *sp, u_int length, int print)
 done:
        return (int)(sp - osp);
 
-trunc:
-       nd_print_trunc(ndo);
 pktend:
        return -1;
 #undef FETCH
@@ -516,7 +511,6 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
        ndo->ndo_protocol = "telnet";
        osp = sp;
 
-       ND_TCHECK_1(sp);
        while (length > 0 && GET_U_1(sp) == IAC) {
                /*
                 * Parse the Telnet command without printing it,