Have all Internet-checksum computing routines return a uint16_t.

[tcpdump] / print-ip.c

diff --git a/print-ip.c b/print-ip.c
index 07c9c0fe95d9aeb680a99f35aa55b6bf98ba2e3e..e1085e96af8ec759c0e37dfda2206120233d29a0 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -99,7 +99,7 @@ ip_finddst(netdissect_options *ndo,
        const u_char *cp;
 
        cp = (const u_char *)(ip + 1);
-       length = (IP_HL(ip) << 2);
+       length = IP_HL(ip) * 4;
        if (length < sizeof(struct ip))
                goto trunc;
        length -= sizeof(struct ip);
@@ -138,7 +138,7 @@ trunc:
 /*
  * Compute a V4-style checksum by building a pseudoheader.
  */
-int
+uint16_t
 nextproto4_cksum(netdissect_options *ndo,
                  const struct ip *ip, const uint8_t *data,
                  u_int len, u_int covlen, u_int next_proto)