X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ee68aa36460d7efeca48747f33b7f2adc0900bfb..6f245276a2a24d673f2919e33476191781e20499:/print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 7c6a301b..eddcc1d7 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -6,6 +6,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -38,7 +39,6 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	const ipnet_hdr_t *hdr;
 	hdr = (const ipnet_hdr_t *)bp;
 
-	ND_TCHECK_SIZE(hdr);
 	ND_PRINT("%u > %u", GET_BE_U_4(hdr->iph_zsrc),
 		  GET_BE_U_4(hdr->iph_zdst));
 
@@ -55,9 +55,6 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
         }
 
 	ND_PRINT(", length %u: ", length);
-	return;
-trunc:
-	nd_print_trunc(ndo);
 }
 
 static void
@@ -65,9 +62,8 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 {
 	const ipnet_hdr_t *hdr;
 
-	ndo->ndo_protocol = "ipnet";
-	if (caplen < sizeof(ipnet_hdr_t))
-		goto trunc;
+	ND_TCHECK_LEN(p, sizeof(ipnet_hdr_t));
+	ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);
 
 	if (ndo->ndo_eflag)
 		ipnet_hdr_print(ndo, p, length);
@@ -77,7 +73,6 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 	hdr = (const ipnet_hdr_t *)p;
 	p += sizeof(ipnet_hdr_t);
 
-	ND_TCHECK_1(hdr->iph_family);
 	switch (GET_U_1(hdr->iph_family)) {
 
 	case IPH_AF_INET:
@@ -97,9 +92,6 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 			ND_DEFAULTPRINT(p, caplen);
 		break;
 	}
-	return;
-trunc:
-	nd_print_trunc(ndo);
 }
 
 /*
@@ -108,13 +100,11 @@ trunc:
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ipnet_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
-	ndo->ndo_protocol = "ipnet_if";
+	ndo->ndo_protocol = "ipnet";
 	ipnet_print(ndo, p, h->len, h->caplen);
-
-	return (sizeof(ipnet_hdr_t));
 }
 #endif /* DLT_IPNET */