Small fix to reflect the change in the ip6_misc.h file of libpcap

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index ce1fc9aaec75b2213fa3071ecce71dd3a020941d..21d855ed72b1a38b508e73ea4d3090a8f6e34287 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,25 +21,20 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.87 2001-06-25 21:38:50 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.98 2002-08-01 08:53:31 risso Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/param.h>
-#include <sys/time.h>
+#include <tcpdump-stdinc.h>
 
 #include <rpc/rpc.h>
 
-#include <netinet/in.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ctype.h>
-#include <unistd.h>
 
 #include "interface.h"
 #include "addrtoname.h"
@@ -95,16 +90,16 @@ static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE];
 #ifndef PPTP_PORT
 #define PPTP_PORT      1723
 #endif
-#define BXXP_PORT        10288
+#define BEEP_PORT        10288
 #ifndef NFS_PORT
 #define NFS_PORT       2049
 #endif
+#define MSDP_PORT      639
 
 static int tcp_cksum(register const struct ip *ip,
                     register const struct tcphdr *tp,
                     register int len)
 {
-       int i, tlen;
        union phu {
                struct phdr {
                        u_int32_t src;
@@ -115,34 +110,21 @@ static int tcp_cksum(register const struct ip *ip,
                } ph;
                u_int16_t pa[6];
        } phu;
-       register const u_int16_t *sp;
-       u_int32_t sum;
-       tlen = ntohs(ip->ip_len) - ((const char *)tp-(const char*)ip);
+       const u_int16_t *sp;
 
        /* pseudo-header.. */
-       phu.ph.len = htons(tlen);
+       phu.ph.len = htons(len);        /* XXX */
        phu.ph.mbz = 0;
        phu.ph.proto = IPPROTO_TCP;
        memcpy(&phu.ph.src, &ip->ip_src.s_addr, sizeof(u_int32_t));
-       memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       if (IP_HL(ip) == 5)
+               memcpy(&phu.ph.dst, &ip->ip_dst.s_addr, sizeof(u_int32_t));
+       else
+               phu.ph.dst = ip_finddst(ip);
 
        sp = &phu.pa[0];
-       sum = sp[0]+sp[1]+sp[2]+sp[3]+sp[4]+sp[5];
-
-       sp = (const u_int16_t *)tp;
-
-       for (i=0; i<(tlen&~1); i+= 2)
-               sum += *sp++;
-
-       if (tlen & 1) {
-               sum += htons( (*(const u_int8_t *)sp) << 8);
-       }
-
-       while (sum > 0xffff)
-               sum = (sum & 0xffff) + (sum >> 16);
-       sum = ~sum & 0xffff;
-
-       return (sum);
+       return in_cksum((u_short *)tp, len,
+                       sp[0]+sp[1]+sp[2]+sp[3]+sp[4]+sp[5]);
 }
 
 #ifdef INET6
@@ -228,7 +210,6 @@ tcp_print(register const u_char *bp, register u_int length,
        sport = ntohs(tp->th_sport);
        dport = ntohs(tp->th_dport);
 
-
        hlen = TH_OFF(tp) * 4;
 
        /*
@@ -410,12 +391,14 @@ tcp_print(register const u_char *bp, register u_int length,
        }
 
        if (IP_V(ip) == 4 && vflag && !fragmented) {
-               int sum;
+               u_int16_t sum, tcp_sum;
                if (TTEST2(tp->th_sport, length)) {
                        sum = tcp_cksum(ip, tp, length);
-                       if (sum != 0)
-                               (void)printf(" [bad tcp cksum %x!]", sum);
-                       else
+                       if (sum != 0) {
+                               tcp_sum = ntohs(tp->th_sum);
+                               (void)printf(" [bad tcp cksum %x (->%x)!]",
+                                   tcp_sum, in_cksum_shouldbe(tcp_sum, sum));
+                       } else
                                (void)printf(" [tcp sum ok]");
                }
        }
@@ -434,7 +417,7 @@ tcp_print(register const u_char *bp, register u_int length,
 
        length -= hlen;
        if (vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST))
-               (void)printf(" %u:%u(%d)", seq, seq + length, length);
+               (void)printf(" %u:%u(%u)", seq, seq + length, length);
        if (flags & TH_ACK)
                (void)printf(" ack %u", ack);
 
@@ -616,14 +599,21 @@ tcp_print(register const u_char *bp, register u_int length,
                        bgp_print(bp, length);
                else if (sport == PPTP_PORT || dport == PPTP_PORT)
                        pptp_print(bp, length);
+#ifdef TCPDUMP_DO_SMB
                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);
+#endif
+               else if (sport == BEEP_PORT || dport == BEEP_PORT)
+                       beep_print(bp, length);
                else if (length > 2 &&
                    (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT)) {
-                       /* TCP DNS query has 2byte length at the head */
+                       /*
+                        * TCP DNS query has 2byte length at the head.
+                        * XXX packet could be unaligned, it can go strange
+                        */
                        ns_print(bp + 2, length - 2);
+               } else if (sport == MSDP_PORT || dport == MSDP_PORT) {
+                       msdp_print(bp, length);
                }
        }
        return;