X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/40ae3ad744d9f71079b410a810acbc33ef39f8ba..refs/heads/mcr-macro-update-1:/print-enc.c

diff --git a/print-enc.c b/print-enc.c
index 630f6b31..60733190 100644
--- a/print-enc.c
+++ b/print-enc.c
@@ -94,7 +94,7 @@ struct enchdr {
 #define	SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
-u_int
+void
 enc_if_print(netdissect_options *ndo,
              const struct pcap_pkthdr *h, const u_char *p)
 {
@@ -103,11 +103,13 @@ enc_if_print(netdissect_options *ndo,
 	u_int af, flags;
 	const struct enchdr *hdr;
 
-	ndo->ndo_protocol = "enc_if";
+	ndo->ndo_protocol = "enc";
 	if (caplen < ENC_HDRLEN) {
+		ndo->ndo_ll_hdr_len += caplen;
 		nd_print_trunc(ndo);
-		goto out;
+		return;
 	}
+	ndo->ndo_ll_hdr_len += ENC_HDRLEN;
 
 	hdr = (const struct enchdr *)p;
 	/*
@@ -142,7 +144,7 @@ enc_if_print(netdissect_options *ndo,
 	ENC_PRINT_TYPE(flags, M_AUTH, "authentic");
 	ENC_PRINT_TYPE(flags, M_CONF, "confidential");
 	/* ENC_PRINT_TYPE(flags, M_TUNNEL, "tunnel"); */
-	ND_PRINT("SPI 0x%08x: ", EXTRACT_BE_U_4(hdr->spi));
+	ND_PRINT("SPI 0x%08x: ", GET_BE_U_4(hdr->spi));
 
 	length -= ENC_HDRLEN;
 	caplen -= ENC_HDRLEN;
@@ -159,6 +161,5 @@ enc_if_print(netdissect_options *ndo,
 		break;
 	}
 
-out:
-	return (ENC_HDRLEN);
+	return;
 }