From Motonori Shindo <[email protected]>: squelch warnings from some

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index cd1299d9947e8a70775b4af4dcbef79fed2484ad..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.95 2001-12-10 08:21:24 guy 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"
@@ -122,7 +117,10 @@ static int tcp_cksum(register const struct ip *ip,
        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];
        return in_cksum((u_short *)tp, len,
@@ -393,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]");
                }
        }