X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0ee15606e2bd246fdffc40099c98b716dbe69578..c0af6af3011d4c55bdadf3dd76cd5fc1115c50d0:/print-ip6.c

diff --git a/print-ip6.c b/print-ip6.c
index f22d2c05..faffb4a2 100644
--- 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);
 }