Remove unneeded #includes

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 852300ce51898114c89e589a56c8ebbaff1c9435..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.80 2000-11-17 19:08:16 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
@@ -52,49 +52,12 @@ static const char rcsid[] =
 #include "ip6.h"
 #endif
 
+#include "nameser.h"
+
 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
@@ -129,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
@@ -169,7 +135,7 @@ static int tcp_cksum(register const struct ip *ip,
                sum += *sp++;
 
        if (tlen & 1) {
-               sum += htons( (*(const char *)sp) << 8);
+               sum += htons( (*(const u_int8_t *)sp) << 8);
        }
 
        while (sum > 0xffff)
@@ -217,7 +183,7 @@ static int tcp6_cksum(const struct ip6_hdr *ip6, const struct tcphdr *tp,
                sum += *sp++;
 
        if (tlen & 1)
-               sum += htons((*(const char *)sp) << 8);
+               sum += htons((*(const u_int8_t *)sp) << 8);
 
        while (sum > 0xffff)
                sum = (sum & 0xffff) + (sum >> 16);
@@ -273,7 +239,7 @@ tcp_print(register const u_char *bp, register u_int length,
        if (!qflag) {
                if ((u_char *)tp + 4 + sizeof(struct rpc_msg) <= snapend &&
                    dport == NFS_PORT) {
-                       nfsreq_print((u_char *)tp + hlen + 4, length-hlen,
+                       nfsreq_print((u_char *)tp + hlen + 4, length - hlen,
                                     (u_char *)ip);
                        return;
                } else if ((u_char *)tp + 4 + sizeof(struct rpc_msg)
@@ -353,18 +319,18 @@ tcp_print(register const u_char *bp, register u_int length,
                memset(&tha, 0, sizeof(tha));
                rev = 0;
                if (ip6) {
-                       if (sport > dport) {
+                       if (sport > dport)
                                rev = 1;
-                       } else if (sport == dport) {
-                           int i;
-
-                           for (i = 0; i < 4; i++) {
-                               if (((u_int32_t *)(&ip6->ip6_src))[i] >
-                                   ((u_int32_t *)(&ip6->ip6_dst))[i]) {
-                                       rev = 1;
-                                       break;
+                       else if (sport == dport) {
+                               int i;
+
+                               for (i = 0; i < 4; i++) {
+                                       if (((u_int32_t *)(&ip6->ip6_src))[i] >
+                                           ((u_int32_t *)(&ip6->ip6_dst))[i]) {
+                                               rev = 1;
+                                               break;
+                                       }
                                }
-                           }
                        }
                        if (rev) {
                                tha.src = ip6->ip6_dst;
@@ -425,7 +391,6 @@ tcp_print(register const u_char *bp, register u_int length,
                                th->ack = seq, th->seq = ack - 1;
                        else
                                th->seq = seq, th->ack = ack - 1;
-
                } else {
                        if (rev)
                                seq -= th->ack, ack -= th->seq;
@@ -649,10 +614,17 @@ 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)
                        bxxp_print(bp, length);
+               else if (length > 2 &&
+                   (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT)) {
+                       /* TCP DNS query has 2byte length at the head */
+                       ns_print(bp + 2, length - 2);
+               }
        }
        return;
 bad:
@@ -697,10 +669,7 @@ print_tcp_rst_data(register const u_char *sp, u_int length)
        putchar(' ');
        while (length-- && sp <= snapend) {
                c = *sp++;
-               if (isprint(c))
-                       putchar(c);
-               else
-                       putchar('.');
+               safeputchar(c);
        }
        putchar(']');
 }