X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6bc44295cfbe1f7b6633c755841518f4b159aa8a..ff2bbd6ffe2ba25884e36f2bcc97fb156cf280e6:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 59d15c24..73947a05 100644 --- a/print-ether.c +++ b/print-ether.c @@ -22,16 +22,31 @@ /* \summary: Ethernet printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include "netdissect.h" #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,33 +108,33 @@ 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)))); + ND_PRINT("%s > %s", + 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) { - ND_PRINT((ndo, ", 802.3")); + if (length_type <= MAX_ETHERNET_LENGTH_VAL) { + ND_PRINT(", 802.3"); length = length_type; } else - ND_PRINT((ndo, ", ethertype %s (0x%04x)", + ND_PRINT(", ethertype %s (0x%04x)", tok2str(ethertype_values,"Unknown", length_type), - length_type)); + length_type); } else { - if (length_type <= ETHERMTU) { - ND_PRINT((ndo, ", 802.3")); + if (length_type <= MAX_ETHERNET_LENGTH_VAL) { + ND_PRINT(", 802.3"); length = length_type; } else - ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type))); + ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type)); } - ND_PRINT((ndo, ", length %u: ", length)); + ND_PRINT(", length %u: ", length); } /* @@ -126,6 +142,8 @@ ether_hdr_print(netdissect_options *ndo, * This might be encapsulated within another frame; we might be passed * a pointer to a function that can print header information for that * frame's protocol, and an argument to pass to that function. + * + * FIXME: caplen can and should be derived from ndo->ndo_snapend and p. */ u_int ether_print(netdissect_options *ndo, @@ -140,11 +158,11 @@ ether_print(netdissect_options *ndo, struct lladdr_info src, dst; if (caplen < ETHER_HDRLEN) { - ND_PRINT((ndo, "[|ether]")); + ND_PRINT("[|ether]"); return (caplen); } if (length < ETHER_HDRLEN) { - ND_PRINT((ndo, "[|ether]")); + ND_PRINT("[|ether]"); return (length); } @@ -161,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) { @@ -190,22 +208,22 @@ recurse: * the enclosed type field. */ if (caplen < 4) { - ND_PRINT((ndo, "[|vlan]")); + ND_PRINT("[|vlan]"); return (hdrlen + caplen); } if (length < 4) { - ND_PRINT((ndo, "[|vlan]")); + ND_PRINT("[|vlan]"); 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))); + ND_PRINT("%s, ", ieee8021q_tci_string(tag)); } - length_type = EXTRACT_16BITS(p + 2); - if (ndo->ndo_eflag && length_type > ETHERMTU) - ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type))); + length_type = EXTRACT_BE_U_2(p + 2); + if (ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL) + ND_PRINT("ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type)); p += 4; length -= 4; caplen -= 4; @@ -276,7 +294,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, * Fail if we don't have enough data for the Hilscher pseudo-header. */ if (h->len < 4 || h->caplen < 4) { - ND_PRINT((ndo, "[|netanalyzer]")); + ND_PRINT("[|netanalyzer]"); return (h->caplen); } @@ -304,7 +322,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo, * preamble, and SOF. */ if (h->len < 12 || h->caplen < 12) { - ND_PRINT((ndo, "[|netanalyzer-transparent]")); + ND_PRINT("[|netanalyzer-transparent]"); return (h->caplen); } @@ -346,7 +364,7 @@ ethertype_print(netdissect_options *ndo, case ETHERTYPE_ATALK: if (ndo->ndo_vflag) - ND_PRINT((ndo, "et1 ")); + ND_PRINT("et1 "); atalk_print(ndo, p, length); return (1); @@ -355,12 +373,16 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_IPX: - ND_PRINT((ndo, "(NOV-ETHII) ")); + ND_PRINT("(NOV-ETHII) "); ipx_print(ndo, p, length); return (1); case ETHERTYPE_ISO: - isoclns_print(ndo, p + 1, length - 1, length - 1); + if (length == 0 || caplen == 0) { + ND_PRINT(" [|osi]"); + return (1); + } + isoclns_print(ndo, p + 1, length - 1); return(1); case ETHERTYPE_PPPOED: @@ -380,7 +402,7 @@ ethertype_print(netdissect_options *ndo, case ETHERTYPE_PPP: if (length) { - ND_PRINT((ndo, ": ")); + ND_PRINT(": "); ppp_print(ndo, p, length); } return (1); @@ -402,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); @@ -433,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: