CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-telnet.c

diff --git a/print-telnet.c b/print-telnet.c
index b0283f2047f7a38b305194a3066ab70ea69b8a60..97be4b916071f6a95102ef715949ec58b2216b08 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-telnet.c,v 1.2 1999/10/11 12:40:12 sjg Exp $     */
+/*     $NetBSD: print-telnet.c,v 1.2 1999/10/11 12:40:12 sjg Exp $     */

 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.


@@ -47,9 +47,7 @@
 
 /* \summary: Telnet option printer */
 
 
 /* \summary: Telnet option printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 


@@ -59,7 +57,7 @@
 #include "extract.h"
 
 
 #include "extract.h"
 
 

-/*     NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp      */
+/*     NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp      */

 
 /*
  * Definitions for the TELNET protocol.
 
 /*
  * Definitions for the TELNET protocol.


@@ -108,8 +106,8 @@ static const char *telcmds[] = {
 #define        TELOPT_STATUS   5       /* give status */
 #define        TELOPT_TM       6       /* timing mark */
 #define        TELOPT_RCTE     7       /* remote controlled transmission and echo */
 #define        TELOPT_STATUS   5       /* give status */
 #define        TELOPT_TM       6       /* timing mark */
 #define        TELOPT_RCTE     7       /* remote controlled transmission and echo */

-#define TELOPT_NAOL    8       /* negotiate about output line width */
-#define TELOPT_NAOP    9       /* negotiate about output page size */
+#define TELOPT_NAOL    8       /* negotiate about output line width */
+#define TELOPT_NAOP    9       /* negotiate about output page size */

 #define TELOPT_NAOCRD  10      /* negotiate about CR disposition */
 #define TELOPT_NAOHTS  11      /* negotiate about horizontal tabstops */
 #define TELOPT_NAOHTD  12      /* negotiate about horizontal tab disposition */
 #define TELOPT_NAOCRD  10      /* negotiate about CR disposition */
 #define TELOPT_NAOHTS  11      /* negotiate about horizontal tabstops */
 #define TELOPT_NAOHTD  12      /* negotiate about horizontal tab disposition */


@@ -117,7 +115,7 @@ static const char *telcmds[] = {
 #define TELOPT_NAOVTS  14      /* negotiate about vertical tab stops */
 #define TELOPT_NAOVTD  15      /* negotiate about vertical tab disposition */
 #define TELOPT_NAOLFD  16      /* negotiate about output LF disposition */
 #define TELOPT_NAOVTS  14      /* negotiate about vertical tab stops */
 #define TELOPT_NAOVTD  15      /* negotiate about vertical tab disposition */
 #define TELOPT_NAOLFD  16      /* negotiate about output LF disposition */

-#define TELOPT_XASCII  17      /* extended ascic character set */
+#define TELOPT_XASCII  17      /* extended ascii character set */

 #define        TELOPT_LOGOUT   18      /* force logout */
 #define        TELOPT_BM       19      /* byte macro */
 #define        TELOPT_DET      20      /* data entry terminal */
 #define        TELOPT_LOGOUT   18      /* force logout */
 #define        TELOPT_BM       19      /* byte macro */
 #define        TELOPT_DET      20      /* data entry terminal */