X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb2479d733dbe8a991d11909b319341f7db62ab1..4dee61760d291060f08e68eed2e7a1b98ce7e4a4:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 73947a05..373103dc 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -104,20 +104,20 @@ const struct tok ethertype_values[] = {
     { 0, NULL}
 };
 
-static inline void
+static void
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {
-	const struct ether_header *ep;
+	const struct ether_header *ehp;
 	uint16_t length_type;
 
-	ep = (const struct ether_header *)bp;
+	ehp = (const struct ether_header *)bp;
 
 	ND_PRINT("%s > %s",
-		     etheraddr_string(ndo, ep->ether_shost),
-		     etheraddr_string(ndo, ep->ether_dhost));
+		     etheraddr_string(ndo, ehp->ether_shost),
+		     etheraddr_string(ndo, ehp->ether_dhost));
 
-	length_type = EXTRACT_BE_U_2(ep->ether_length_type);
+	length_type = EXTRACT_BE_U_2(ehp->ether_length_type);
 	if (!ndo->ndo_qflag) {
 	        if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
 		        ND_PRINT(", 802.3");
@@ -150,19 +150,20 @@ ether_print(netdissect_options *ndo,
             const u_char *p, u_int length, u_int caplen,
             void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
 {
-	const struct ether_header *ep;
+	const struct ether_header *ehp;
 	u_int orig_length;
 	u_short length_type;
 	u_int hdrlen;
 	int llc_hdrlen;
 	struct lladdr_info src, dst;
 
+	ndo->ndo_protocol = "ether";
 	if (caplen < ETHER_HDRLEN) {
-		ND_PRINT("[|ether]");
+		nd_print_trunc(ndo);
 		return (caplen);
 	}
 	if (length < ETHER_HDRLEN) {
-		ND_PRINT("[|ether]");
+		nd_print_trunc(ndo);
 		return (length);
 	}
 
@@ -175,15 +176,15 @@ ether_print(netdissect_options *ndo,
 
 	length -= ETHER_HDRLEN;
 	caplen -= ETHER_HDRLEN;
-	ep = (const struct ether_header *)p;
+	ehp = (const struct ether_header *)p;
 	p += ETHER_HDRLEN;
 	hdrlen = ETHER_HDRLEN;
 
-	src.addr = ep->ether_shost;
+	src.addr = ehp->ether_shost;
 	src.addr_string = etheraddr_string;
-	dst.addr = ep->ether_dhost;
+	dst.addr = ehp->ether_dhost;
 	dst.addr_string = etheraddr_string;
-	length_type = EXTRACT_BE_U_2(ep->ether_length_type);
+	length_type = EXTRACT_BE_U_2(ehp->ether_length_type);
 
 recurse:
 	/*
@@ -254,7 +255,7 @@ recurse:
 			if (!ndo->ndo_eflag) {
 				if (print_encap_header != NULL)
 					(*print_encap_header)(ndo, encap_header_arg);
-				ether_hdr_print(ndo, (const u_char *)ep, orig_length);
+				ether_hdr_print(ndo, (const u_char *)ehp, orig_length);
 			}
 
 			if (!ndo->ndo_suppress_default_print)
@@ -274,6 +275,7 @@ u_int
 ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
                const u_char *p)
 {
+	ndo->ndo_protocol = "ether_if";
 	return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));
 }
 
@@ -293,8 +295,9 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 	/*
 	 * Fail if we don't have enough data for the Hilscher pseudo-header.
 	 */
+	ndo->ndo_protocol = "netanalyzer_if";
 	if (h->len < 4 || h->caplen < 4) {
-		ND_PRINT("[|netanalyzer]");
+		nd_print_trunc(ndo);
 		return (h->caplen);
 	}
 
@@ -321,8 +324,9 @@ netanalyzer_transparent_if_print(netdissect_options *ndo,
 	 * Fail if we don't have enough data for the Hilscher pseudo-header,
 	 * preamble, and SOF.
 	 */
+	ndo->ndo_protocol = "netanalyzer_transparent_if";
 	if (h->len < 12 || h->caplen < 12) {
-		ND_PRINT("[|netanalyzer-transparent]");
+		nd_print_trunc(ndo);
 		return (h->caplen);
 	}
 
@@ -472,12 +476,3 @@ ethertype_print(netdissect_options *ndo,
 		return (0);
 	}
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-