Remove unneeded #includes

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index a7d9c57e1b06e856b38e32dd65b93842a8387a3b..eecf0b48bdf8cd2ffd7acbbbd373653eff508600 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.84 2001-02-03 05:04:49 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.86 2001-05-09 01:16:57 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -58,45 +58,6 @@ static void print_tcp_rst_data(register const u_char *sp, u_int length);
 
 #define MAX_RST_DATA_LEN       30
 
-/* Compatibility */
-#ifndef TCPOPT_WSCALE
-#define        TCPOPT_WSCALE           3       /* window scale factor (rfc1072) */
-#endif
-#ifndef TCPOPT_SACKOK
-#define        TCPOPT_SACKOK           4       /* selective ack ok (rfc1072) */
-#endif
-#ifndef TCPOPT_SACK
-#define        TCPOPT_SACK             5       /* selective ack (rfc1072) */
-#endif
-#ifndef TCPOPT_ECHO
-#define        TCPOPT_ECHO             6       /* echo (rfc1072) */
-#endif
-#ifndef TCPOPT_ECHOREPLY
-#define        TCPOPT_ECHOREPLY        7       /* echo (rfc1072) */
-#endif
-#ifndef TCPOPT_TIMESTAMP
-#define TCPOPT_TIMESTAMP       8       /* timestamps (rfc1323) */
-#endif
-#ifndef TCPOPT_CC
-#define TCPOPT_CC              11      /* T/TCP CC options (rfc1644) */
-#endif
-#ifndef TCPOPT_CCNEW
-#define TCPOPT_CCNEW           12      /* T/TCP CC options (rfc1644) */
-#endif
-#ifndef TCPOPT_CCECHO
-#define TCPOPT_CCECHO          13      /* T/TCP CC options (rfc1644) */
-#endif
-
-/*
- * Definitions required for ECN
- * for use if the OS running tcpdump does not have ECN
- */
-#ifndef TH_ECNECHO
-#define TH_ECNECHO             0x40    /* ECN Echo in tcp header */
-#endif
-#ifndef TH_CWR
-#define TH_CWR                 0x80    /* ECN Cwnd Reduced in tcp header*/
-#endif
 
 struct tha {
 #ifndef INET6
@@ -131,6 +92,9 @@ static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE];
 #define BGP_PORT       179
 #endif
 #define NETBIOS_SSN_PORT 139
+#ifndef PPTP_PORT
+#define PPTP_PORT      1723
+#endif
 #define BXXP_PORT        10288
 #ifndef NFS_PORT
 #define NFS_PORT       2049
@@ -650,6 +614,8 @@ tcp_print(register const u_char *bp, register u_int length,
                                telnet_print(bp, length);
                } else if (sport == BGP_PORT || dport == BGP_PORT)
                        bgp_print(bp, length);
+               else if (sport == PPTP_PORT || dport == PPTP_PORT)
+                       pptp_print(bp, length);
                else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
                        nbt_tcp_print(bp, length);
                else if (sport == BXXP_PORT || dport == BXXP_PORT)