Use "len", not "payload_len", as we step through the packet; use

[tcpdump] / print-telnet.c

diff --git a/print-telnet.c b/print-telnet.c
index 308e924897135390ea58da17b32cc0391cf68962..bf2f1719d76040a24ea27d8f1c168f7ed01e550e 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -50,20 +50,14 @@
 #endif
 
 #ifndef lint
 #endif
 
 #ifndef lint

-static const char rcsid[] =
-     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.19 2002-06-11 17:08:57 itojun Exp $";
+static const char rcsid[] _U_ =
+     "@(#) $Header: /tcpdump/master/tcpdump/print-telnet.c,v 1.23 2003-11-16 09:36:39 guy Exp $";

 #endif
 
 #endif
 

-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <ctype.h>
-
-#include <netinet/in.h>
+#include <tcpdump-stdinc.h>

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

-#include <unistd.h>

 #include <string.h>
 
 #include "interface.h"
 #include <string.h>
 
 #include "interface.h"


@@ -115,7 +109,8 @@ numstr(int x)
 static int
 telnet_parse(const u_char *sp, u_int length, int print)
 {
 static int
 telnet_parse(const u_char *sp, u_int length, int print)
 {

-       int i, c, x;
+       int i, x;
+       u_int c;

        const u_char *osp, *p;
 #define FETCH(c, sp, length) \
        do { \
        const u_char *osp, *p;
 #define FETCH(c, sp, length) \
        do { \


@@ -161,7 +156,7 @@ telnet_parse(const u_char *sp, u_int length, int print)
                        break;
                /* IAC SB .... IAC SE */
                p = sp;
                        break;
                /* IAC SB .... IAC SE */
                p = sp;

-               while (length > p + 1 - sp) {
+               while (length > (u_int)(p + 1 - sp)) {

                        if (p[0] == IAC && p[1] == SE)
                                break;
                        p++;
                        if (p[0] == IAC && p[1] == SE)
                                break;
                        p++;