Merge pull request #703 from nmap/update-gitignore

[tcpdump] / print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index f22d2c05f52e9bad7447dacb5442ca318a8f3eb7..faffb4a2703402b67a6cc349589517d78de58d33 100644 (file)
--- a/print-ip6.c
+++ b/print-ip6.c
@@ -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)
@@ -224,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);
@@ -420,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);
 }