remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-telnet.c

diff --git a/print-telnet.c b/print-telnet.c
index f0604054f4e7b6d34d264f2be1f65142e1150475..817d4226855d4d62f9621cbc063fcbbe433d22c5 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -48,17 +48,16 @@
 /* \summary: Telnet option printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include <stdio.h>
 
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = " [|telnet]";
 
 #define TELCMDS
 #define TELOPTS
@@ -397,8 +396,8 @@ 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 = *sp++; \
+               c = GET_U_1(sp); \
+               sp++; \
                length--; \
        } while (0)
 
@@ -438,13 +437,11 @@ 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 (EXTRACT_U_1(p) == IAC && EXTRACT_U_1(p + 1) == SE)
+                       if (GET_U_1(p) == IAC && GET_U_1(p + 1) == SE)
                                break;
                        p++;
                }
-               ND_TCHECK_1(p);
-               if (EXTRACT_U_1(p) != IAC)
+               if (GET_U_1(p) != IAC)
                        goto pktend;
 
                switch (x) {
@@ -497,10 +494,8 @@ telnet_parse(netdissect_options *ndo, const u_char *sp, u_int length, int print)
        }
 
 done:
-       return sp - osp;
+       return (int)(sp - osp);
 
-trunc:
-       ND_PRINT("%s", tstr);
 pktend:
        return -1;
 #undef FETCH
@@ -513,10 +508,10 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
        const u_char *osp;
        int l;
 
+       ndo->ndo_protocol = "telnet";
        osp = sp;
 
-       ND_TCHECK_1(sp);
-       while (length > 0 && EXTRACT_U_1(sp) == IAC) {
+       while (length > 0 && GET_U_1(sp) == IAC) {
                /*
                 * Parse the Telnet command without printing it,
                 * to determine its length.
@@ -531,7 +526,7 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
                if (ndo->ndo_Xflag && 2 < ndo->ndo_vflag) {
                        if (first)
                                ND_PRINT("\nTelnet:");
-                       hex_print_with_offset(ndo, "\n", sp, l, sp - osp);
+                       hex_print_with_offset(ndo, "\n", sp, l, (u_int)(sp - osp));
                        if (l > 8)
                                ND_PRINT("\n\t\t\t\t");
                        else
@@ -554,5 +549,5 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
        }
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }