X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0db4dcafe5ae38201d3869c96a96cb714d82ff35..96afbce6fc40e89e4f215db5838ae00979185e11:/print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 241c5070..7143830f 100644
--- a/print-ether.c
+++ b/print-ether.c
@@ -31,7 +31,22 @@
 #include "extract.h"
 #include "addrtoname.h"
 #include "ethertype.h"
-#include "ether.h"
+
+/*
+ * Structure of an Ethernet header.
+ */
+struct	ether_header {
+	nd_mac_addr	ether_dhost;
+	nd_mac_addr	ether_shost;
+	nd_uint16_t	ether_length_type;
+};
+
+/*
+ * Length of an Ethernet header; note that some compilers may pad
+ * "struct ether_header" to a multiple of 4 bytes, for example, so
+ * "sizeof (struct ether_header)" may not give the right answer.
+ */
+#define ETHER_HDRLEN		14
 
 const struct tok ethertype_values[] = {
     { ETHERTYPE_IP,		"IPv4" },
@@ -72,6 +87,7 @@ const struct tok ethertype_values[] = {
     { ETHERTYPE_RRCP,           "RRCP" },
     { ETHERTYPE_MS_NLB_HB,      "MS NLB heartbeat" },
     { ETHERTYPE_JUMBO,          "Jumbo" },
+    { ETHERTYPE_NSH,            "NSH" },
     { ETHERTYPE_LOOPBACK,       "Loopback" },
     { ETHERTYPE_ISO,            "OSI" },
     { ETHERTYPE_GRE_ISO,        "GRE-OSI" },
@@ -92,18 +108,18 @@ static inline void
 ether_hdr_print(netdissect_options *ndo,
                 const u_char *bp, u_int length)
 {
-	register const struct ether_header *ep;
+	const struct ether_header *ep;
 	uint16_t length_type;
 
 	ep = (const struct ether_header *)bp;
 
 	ND_PRINT((ndo, "%s > %s",
-		     etheraddr_string(ndo, ESRC(ep)),
-		     etheraddr_string(ndo, EDST(ep))));
+		     etheraddr_string(ndo, ep->ether_shost),
+		     etheraddr_string(ndo, ep->ether_dhost)));
 
-	length_type = EXTRACT_16BITS(&ep->ether_length_type);
+	length_type = EXTRACT_BE_U_2(ep->ether_length_type);
 	if (!ndo->ndo_qflag) {
-	        if (length_type <= ETHERMTU) {
+	        if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
 		        ND_PRINT((ndo, ", 802.3"));
 			length = length_type;
 		} else
@@ -111,7 +127,7 @@ ether_hdr_print(netdissect_options *ndo,
 				       tok2str(ethertype_values,"Unknown", length_type),
                                        length_type));
         } else {
-                if (length_type <= ETHERMTU) {
+                if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
                         ND_PRINT((ndo, ", 802.3"));
 			length = length_type;
 		} else
@@ -163,17 +179,17 @@ ether_print(netdissect_options *ndo,
 	p += ETHER_HDRLEN;
 	hdrlen = ETHER_HDRLEN;
 
-	src.addr = ESRC(ep);
+	src.addr = ep->ether_shost;
 	src.addr_string = etheraddr_string;
-	dst.addr = EDST(ep);
+	dst.addr = ep->ether_dhost;
 	dst.addr_string = etheraddr_string;
-	length_type = EXTRACT_16BITS(&ep->ether_length_type);
+	length_type = EXTRACT_BE_U_2(ep->ether_length_type);
 
 recurse:
 	/*
 	 * Is it (gag) an 802.3 encapsulation?
 	 */
-	if (length_type <= ETHERMTU) {
+	if (length_type <= MAX_ETHERNET_LENGTH_VAL) {
 		/* Try to print the LLC-layer header & higher layers */
 		llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
 		if (llc_hdrlen < 0) {
@@ -200,13 +216,13 @@ recurse:
 			return (hdrlen + length);
 		}
 	        if (ndo->ndo_eflag) {
-			uint16_t tag = EXTRACT_16BITS(p);
+			uint16_t tag = EXTRACT_BE_U_2(p);
 
 			ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
 		}
 
-		length_type = EXTRACT_16BITS(p + 2);
-		if (ndo->ndo_eflag && length_type > ETHERMTU)
+		length_type = EXTRACT_BE_U_2(p + 2);
+		if (ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL)
 			ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type)));
 		p += 4;
 		length -= 4;
@@ -366,7 +382,7 @@ ethertype_print(netdissect_options *ndo,
 			ND_PRINT((ndo, " [|osi]"));
 			return (1);
 		}
-		isoclns_print(ndo, p + 1, length - 1, caplen - 1);
+		isoclns_print(ndo, p + 1, length - 1);
 		return(1);
 
 	case ETHERTYPE_PPPOED:
@@ -408,6 +424,10 @@ ethertype_print(netdissect_options *ndo,
 		lldp_print(ndo, p, length);
 		return (1);
 
+        case ETHERTYPE_NSH:
+                nsh_print(ndo, p, length);
+                return (1);
+
         case ETHERTYPE_LOOPBACK:
 		loopback_print(ndo, p, length);
                 return (1);
@@ -439,7 +459,7 @@ ethertype_print(netdissect_options *ndo,
 		return (1);
 
 	case ETHERTYPE_MEDSA:
-		medsa_print(ndo, p, length, caplen);
+		medsa_print(ndo, p, length, caplen, src, dst);
 		return (1);
 
 	case ETHERTYPE_LAT: