X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/08e40fdbd6c00085516802a49db62dff0f288e8b..aeb105bfbf67730c83bd85900dba07bba050a047:/print-ether.c?ds=inline diff --git a/print-ether.c b/print-ether.c index 3b74581b..ce96e62e 100644 --- a/print-ether.c +++ b/print-ether.c @@ -19,6 +19,8 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ +/* \summary: Ethernet printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -29,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" }, @@ -70,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" }, @@ -90,7 +108,7 @@ 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; @@ -99,9 +117,9 @@ ether_hdr_print(netdissect_options *ndo, etheraddr_string(ndo, ESRC(ep)), etheraddr_string(ndo, EDST(ep)))); - 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 @@ -109,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 @@ -124,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, @@ -135,6 +155,7 @@ ether_print(netdissect_options *ndo, u_short length_type; u_int hdrlen; int llc_hdrlen; + struct lladdr_info src, dst; if (caplen < ETHER_HDRLEN) { ND_PRINT((ndo, "[|ether]")); @@ -158,15 +179,19 @@ ether_print(netdissect_options *ndo, p += ETHER_HDRLEN; hdrlen = ETHER_HDRLEN; - length_type = EXTRACT_16BITS(&ep->ether_length_type); + src.addr = ESRC(ep); + src.addr_string = etheraddr_string; + dst.addr = EDST(ep); + dst.addr_string = etheraddr_string; + 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, ESRC(ep), EDST(ep)); + llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst); if (llc_hdrlen < 0) { /* packet type not known, print raw packet */ if (!ndo->ndo_suppress_default_print) @@ -191,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; @@ -215,7 +240,7 @@ recurse: * there's an LLC header and payload. */ /* Try to print the LLC-layer header & higher layers */ - llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(ep), EDST(ep)); + llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst); if (llc_hdrlen < 0) { /* packet type not known, print raw packet */ if (!ndo->ndo_suppress_default_print) @@ -224,7 +249,7 @@ recurse: } hdrlen += llc_hdrlen; } else { - if (ethertype_print(ndo, length_type, p, length, caplen) == 0) { + if (ethertype_print(ndo, length_type, p, length, caplen, &src, &dst) == 0) { /* type not known, print raw packet */ if (!ndo->ndo_eflag) { if (print_encap_header != NULL) @@ -315,7 +340,8 @@ netanalyzer_transparent_if_print(netdissect_options *ndo, int ethertype_print(netdissect_options *ndo, u_short ether_type, const u_char *p, - u_int length, u_int caplen) + u_int length, u_int caplen, + const struct lladdr_info *src, const struct lladdr_info *dst) { switch (ether_type) { @@ -352,7 +378,11 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_ISO: - isoclns_print(ndo, p + 1, length - 1, length - 1); + if (length == 0 || caplen == 0) { + ND_PRINT((ndo, " [|osi]")); + return (1); + } + isoclns_print(ndo, p + 1, length - 1); return(1); case ETHERTYPE_PPPOED: @@ -367,7 +397,7 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_RRCP: - rrcp_print(ndo, p - 14 , length + 14); + rrcp_print(ndo, p, length, src, dst); return (1); case ETHERTYPE_PPP: @@ -394,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); @@ -413,11 +447,11 @@ ethertype_print(netdissect_options *ndo, case ETHERTYPE_GEONET_OLD: case ETHERTYPE_GEONET: - geonet_print(ndo, p-14, p, length); + geonet_print(ndo, p, length, src); return (1); case ETHERTYPE_CALM_FAST: - calm_fast_print(ndo, p-14, p, length); + calm_fast_print(ndo, p, length, src); return (1); case ETHERTYPE_AOE: @@ -425,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: