Merge pull request #703 from nmap/update-gitignore

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index 53815402bfd97b1228cd00a9400d52a21721ac14..faffb4a2703402b67a6cc349589517d78de58d33 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -59,7 +59,7 @@ ip6_finddst(netdissect_options *ndo, struct in6_addr *dst,
        cp = (const u_char *)ip6;
        advance = sizeof(struct ip6_hdr);
        nh = EXTRACT_U_1(ip6->ip6_nxt);
-       dst_addr = (const void *)&ip6->ip6_dst;
+       dst_addr = (const void *)ip6->ip6_dst;
 
        while (cp < ndo->ndo_snapend) {
                cp += advance;
@@ -157,7 +157,7 @@ trunc:
 /*
  * Compute a V6-style checksum by building a pseudoheader.
  */
-int
+uint16_t
 nextproto6_cksum(netdissect_options *ndo,
                  const struct ip6_hdr *ip6, const uint8_t *data,
                 u_int len, u_int covlen, u_int next_proto)
@@ -174,7 +174,7 @@ nextproto6_cksum(netdissect_options *ndo,
 
         /* pseudo-header */
         memset(&ph, 0, sizeof(ph));
-        UNALIGNED_MEMCPY(&ph.ph_src, &ip6->ip6_src, sizeof (struct in6_addr));
+        UNALIGNED_MEMCPY(&ph.ph_src, ip6->ip6_src, sizeof (struct in6_addr));
         nh = EXTRACT_U_1(ip6->ip6_nxt);
         switch (nh) {
 
@@ -193,7 +193,8 @@ nextproto6_cksum(netdissect_options *ndo,
                 break;
 
         default:
-                UNALIGNED_MEMCPY(&ph.ph_dst, &ip6->ip6_dst, sizeof (struct in6_addr));
+                UNALIGNED_MEMCPY(&ph.ph_dst, ip6->ip6_dst,
+                                 sizeof (struct in6_addr));
                 break;
         }
         ph.ph_len = htonl(len);
@@ -223,6 +224,7 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
        int fragmented = 0;
        u_int flow;
 
+       ndo->ndo_protocol = "ip6";
        ip6 = (const struct ip6_hdr *)bp;
 
        ND_TCHECK_SIZE(ip6);
@@ -288,8 +290,8 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                if (cp == (const u_char *)(ip6 + 1) &&
                    nh != IPPROTO_TCP && nh != IPPROTO_UDP &&
                    nh != IPPROTO_DCCP && nh != IPPROTO_SCTP) {
-                       ND_PRINT("%s > %s: ", ip6addr_string(ndo, &ip6->ip6_src),
-                                    ip6addr_string(ndo, &ip6->ip6_dst));
+                       ND_PRINT("%s > %s: ", ip6addr_string(ndo, ip6->ip6_src),
+                                    ip6addr_string(ndo, ip6->ip6_dst));
                }
 
                switch (nh) {
@@ -419,9 +421,12 @@ ip6_print(netdissect_options *ndo, const u_char *bp, u_int length)
                        ND_PRINT("ip-proto-%u %u", nh, len);
                        return;
                }
+
+               /* ndo_protocol reassignment after xxx_print() calls */
+               ndo->ndo_protocol = "ip6";
        }
 
        return;
 trunc:
-       ND_PRINT("[|ip6]");
+       nd_print_trunc(ndo);
 }