Use more the EXTRACT_U_1() macro (40/n)

[tcpdump] / print-telnet.c

diff --git a/print-telnet.c b/print-telnet.c
index a66403468be78646498ca38e4099111cb500e046..e3782177a9f4c0534bb3759030479cf37ec51e74 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -56,6 +56,7 @@
 #include <stdio.h>
 
 #include "netdissect.h"
+#include "extract.h"
 
 static const char tstr[] = " [|telnet]";
 
@@ -437,11 +438,12 @@ 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_TCHECK2(*p, 2);
+                       ND_TCHECK_2(p);
                        if (p[0] == IAC && p[1] == SE)
                                break;
                        p++;
                }
+               ND_TCHECK(*p);
                if (*p != IAC)
                        goto pktend;
 
@@ -514,7 +516,7 @@ telnet_print(netdissect_options *ndo, const u_char *sp, u_int length)
        osp = sp;
 
        ND_TCHECK(*sp);
-       while (length > 0 && *sp == IAC) {
+       while (length > 0 && EXTRACT_U_1(sp) == IAC) {
                /*
                 * Parse the Telnet command without printing it,
                 * to determine its length.