X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/944e93fa4c29c4e5cdecd858ead5a37430a418af..10ac80fdecfa9b9b7d259d8f50d0b72ef1b18f12:/print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 9777909b..0f745d70 100644
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -9,7 +9,6 @@
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ipnet]";
 
 typedef struct ipnet_hdr {
 	nd_uint8_t	iph_version;
@@ -40,25 +39,25 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 	hdr = (const ipnet_hdr_t *)bp;
 
 	ND_TCHECK_SIZE(hdr);
-	ND_PRINT("%u > %u", EXTRACT_BE_U_4(hdr->iph_zsrc),
-		  EXTRACT_BE_U_4(hdr->iph_zdst));
+	ND_PRINT("%u > %u", GET_BE_U_4(hdr->iph_zsrc),
+		  GET_BE_U_4(hdr->iph_zdst));
 
 	if (!ndo->ndo_qflag) {
 		ND_PRINT(", family %s (%u)",
                           tok2str(ipnet_values, "Unknown",
-                                  EXTRACT_U_1(hdr->iph_family)),
-                          EXTRACT_U_1(hdr->iph_family));
+                                  GET_U_1(hdr->iph_family)),
+                          GET_U_1(hdr->iph_family));
         } else {
 		ND_PRINT(", %s",
                           tok2str(ipnet_values,
                                   "Unknown Ethertype (0x%04x)",
-				  EXTRACT_U_1(hdr->iph_family)));
+				  GET_U_1(hdr->iph_family)));
         }
 
 	ND_PRINT(", length %u: ", length);
 	return;
 trunc:
-	ND_PRINT(" %s", tstr);
+	nd_print_trunc(ndo);
 }
 
 static void
@@ -66,8 +65,12 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 {
 	const ipnet_hdr_t *hdr;
 
-	if (caplen < sizeof(ipnet_hdr_t))
-		goto trunc;
+	if (caplen < sizeof(ipnet_hdr_t)) {
+		ndo->ndo_ll_hdr_len += caplen;
+		nd_print_trunc(ndo);
+		return;
+	}
+	ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);
 
 	if (ndo->ndo_eflag)
 		ipnet_hdr_print(ndo, p, length);
@@ -77,8 +80,7 @@ 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 (EXTRACT_U_1(hdr->iph_family)) {
+	switch (GET_U_1(hdr->iph_family)) {
 
 	case IPH_AF_INET:
 	        ip_print(ndo, p, length);
@@ -97,9 +99,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(" %s", tstr);
 }
 
 /*
@@ -108,20 +107,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";
 	ipnet_print(ndo, p, h->len, h->caplen);
-
-	return (sizeof(ipnet_hdr_t));
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-
 #endif /* DLT_IPNET */