X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/01017da63c1c0d4b241ea29a43e5d5bd1a3a53dd..8534f3b7bfbb81a76fc110a79bbbfedf35cc4f30:/print-ether.c diff --git a/print-ether.c b/print-ether.c index d6dd9572..0454c9a7 100644 --- a/print-ether.c +++ b/print-ether.c @@ -100,112 +100,118 @@ const struct tok ethertype_values[] = { { ETHERTYPE_GEONET, "GeoNet"}, { ETHERTYPE_CALM_FAST, "CALM FAST"}, { ETHERTYPE_AOE, "AoE" }, - { ETHERTYPE_MEDSA, "MEDSA" }, + { ETHERTYPE_ARISTA, "Arista Vendor Specific Protocol" }, { 0, NULL} }; static void -ether_hdr_print(netdissect_options *ndo, - const u_char *bp, u_int length) +ether_addresses_print(netdissect_options *ndo, const u_char *src, + const u_char *dst) { - const struct ether_header *ehp; - uint16_t length_type; - - ehp = (const struct ether_header *)bp; - - ND_PRINT("%s > %s", - etheraddr_string(ndo, ehp->ether_shost), - etheraddr_string(ndo, ehp->ether_dhost)); - - 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"); - length = length_type; - } else - ND_PRINT(", ethertype %s (0x%04x)", - tok2str(ethertype_values,"Unknown", length_type), - length_type); - } else { - if (length_type <= MAX_ETHERNET_LENGTH_VAL) { - ND_PRINT(", 802.3"); - length = length_type; - } else - ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type)); - } + ND_PRINT("%s > %s, ", + etheraddr_string(ndo, src), etheraddr_string(ndo, dst)); +} - ND_PRINT(", length %u: ", length); +static void +ether_type_print(netdissect_options *ndo, uint16_t type) +{ + if (!ndo->ndo_qflag) + ND_PRINT("ethertype %s (0x%04x)", + tok2str(ethertype_values, "Unknown", type), type); + else + ND_PRINT("%s", + tok2str(ethertype_values, "Unknown Ethertype (0x%04x)", type)); } /* - * Print an Ethernet frame. - * 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. + * Common code for printing Ethernet frames. * - * FIXME: caplen can and should be derived from ndo->ndo_snapend and p. + * It can handle Ethernet headers with extra tag information inserted + * after the destination and source addresses, as is inserted by some + * switch chips, and extra encapsulation header information before + * printing Ethernet header information (such as a LANE ID for ATM LANE). */ -u_int -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) +static u_int +ether_print_common(netdissect_options *ndo, const u_char *p, u_int length, + u_int caplen, + void (*print_switch_tag)(netdissect_options *ndo, const u_char *), + u_int switch_tag_len, + void (*print_encap_header)(netdissect_options *ndo, const u_char *), + const u_char *encap_header_arg) { const struct ether_header *ehp; u_int orig_length; - u_short length_type; u_int hdrlen; + u_short length_type; + int printed_length; int llc_hdrlen; struct lladdr_info src, dst; - ndo->ndo_protocol = "ether"; - if (caplen < ETHER_HDRLEN) { + if (caplen < ETHER_HDRLEN + switch_tag_len) { nd_print_trunc(ndo); return (caplen); } - if (length < ETHER_HDRLEN) { + if (length < ETHER_HDRLEN + switch_tag_len) { nd_print_trunc(ndo); return (length); } - if (ndo->ndo_eflag) { - if (print_encap_header != NULL) - (*print_encap_header)(ndo, encap_header_arg); - ether_hdr_print(ndo, p, length); - } + if (print_encap_header != NULL) + (*print_encap_header)(ndo, encap_header_arg); + orig_length = length; - length -= ETHER_HDRLEN; - caplen -= ETHER_HDRLEN; + /* + * Get the source and destination addresses, skip past them, + * and print them if we're printing the link-layer header. + */ ehp = (const struct ether_header *)p; - p += ETHER_HDRLEN; - hdrlen = ETHER_HDRLEN; - src.addr = ehp->ether_shost; src.addr_string = etheraddr_string; dst.addr = ehp->ether_dhost; dst.addr_string = etheraddr_string; - length_type = EXTRACT_BE_U_2(ehp->ether_length_type); + length -= 2*MAC_ADDR_LEN; + caplen -= 2*MAC_ADDR_LEN; + p += 2*MAC_ADDR_LEN; + hdrlen = 2*MAC_ADDR_LEN; + + if (ndo->ndo_eflag) + ether_addresses_print(ndo, src.addr, dst.addr); + + /* + * Print the switch tag, if we have one, and skip past it. + */ + if (print_switch_tag != NULL) + (*print_switch_tag)(ndo, p); + + length -= switch_tag_len; + caplen -= switch_tag_len; + p += switch_tag_len; + hdrlen += switch_tag_len; + + /* + * Get the length/type field, skip past it, and print it + * if we're printing the link-layer header. + */ recurse: + length_type = GET_BE_U_2(p); + + length -= 2; + caplen -= 2; + p += 2; + hdrlen += 2; + /* - * Is it (gag) an 802.3 encapsulation? + * Process VLAN tag types. */ - 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) { - /* packet type not known, print raw packet */ - if (!ndo->ndo_suppress_default_print) - ND_DEFAULTPRINT(p, caplen); - llc_hdrlen = -llc_hdrlen; - } - hdrlen += llc_hdrlen; - } else if (length_type == ETHERTYPE_8021Q || - length_type == ETHERTYPE_8021Q9100 || - length_type == ETHERTYPE_8021Q9200 || - length_type == ETHERTYPE_8021QinQ) { + printed_length = 0; + while (length_type == ETHERTYPE_8021Q || + length_type == ETHERTYPE_8021Q9100 || + length_type == ETHERTYPE_8021Q9200 || + length_type == ETHERTYPE_8021QinQ) { /* + * It has a VLAN tag. * Print VLAN information, and then go back and process * the enclosed type field. */ @@ -219,26 +225,71 @@ recurse: nd_print_trunc(ndo); return (hdrlen + length); } - if (ndo->ndo_eflag) { - uint16_t tag = EXTRACT_BE_U_2(p); - + if (ndo->ndo_eflag) { + uint16_t tag = GET_BE_U_2(p); + + ether_type_print(ndo, length_type); + if (!printed_length) { + ND_PRINT(", length %u: ", orig_length); + printed_length = 1; + } else + ND_PRINT(", "); ND_PRINT("%s, ", ieee8021q_tci_string(tag)); } - 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)); + length_type = GET_BE_U_2(p + 2); p += 4; length -= 4; caplen -= 4; hdrlen += 4; - goto recurse; + } + + /* + * We now have the final length/type field. + */ + if (length_type <= MAX_ETHERNET_LENGTH_VAL) { + /* + * It's a length field, containing the length of the + * remaining payload; use it as such, as long as + * it's not too large (bigger than the actual payload). + */ + if (length_type < length) { + length = length_type; + if (caplen > length) + caplen = length; + } + + /* + * Cut off the snapshot length to the end of the + * payload. + */ + nd_push_snapend(ndo, p + length); + + if (ndo->ndo_eflag) { + ND_PRINT("802.3"); + if (!printed_length) + ND_PRINT(", length %u: ", length); + } + + /* + * An LLC header follows the length. Print that and + * higher layers. + */ + 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) + ND_DEFAULTPRINT(p, caplen); + llc_hdrlen = -llc_hdrlen; + } + hdrlen += llc_hdrlen; + nd_pop_packet_info(ndo); } else if (length_type == ETHERTYPE_JUMBO) { /* - * Alteon jumbo frames. + * It's a type field, with the type for Alteon jumbo frames. * See * - * http://tools.ietf.org/html/draft-ietf-isis-ext-eth-01 + * https://tools.ietf.org/html/draft-ietf-isis-ext-eth-01 * * which indicates that, following the type field, * there's an LLC header and payload. @@ -252,13 +303,58 @@ recurse: llc_hdrlen = -llc_hdrlen; } hdrlen += llc_hdrlen; + } else if (length_type == ETHERTYPE_ARISTA) { + if (caplen < 2) { + ND_PRINT("[|arista]"); + return (hdrlen + caplen); + } + if (length < 2) { + ND_PRINT("[|arista]"); + return (hdrlen + length); + } + ether_type_print(ndo, length_type); + ND_PRINT(", length %u: ", orig_length); + int bytesConsumed = arista_ethertype_print(ndo, p, length); + if (bytesConsumed > 0) { + p += bytesConsumed; + length -= bytesConsumed; + caplen -= bytesConsumed; + hdrlen += bytesConsumed; + goto recurse; + } else { + /* subtype/version not known, print raw packet */ + if (!ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL) { + ether_addresses_print(ndo, src.addr, dst.addr); + ether_type_print(ndo, length_type); + ND_PRINT(", length %u: ", orig_length); + } + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, caplen); + } } else { + /* + * It's a type field with some other value. + */ + if (ndo->ndo_eflag) { + ether_type_print(ndo, length_type); + if (!printed_length) + ND_PRINT(", length %u: ", orig_length); + else + ND_PRINT(", "); + } 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) - (*print_encap_header)(ndo, encap_header_arg); - ether_hdr_print(ndo, (const u_char *)ehp, orig_length); + /* + * We didn't print the full link-layer + * header, as -e wasn't specified, so + * print only the source and destination + * MAC addresses and the final Ethernet + * type. + */ + ether_addresses_print(ndo, src.addr, dst.addr); + ether_type_print(ndo, length_type); + ND_PRINT(", length %u: ", orig_length); } if (!ndo->ndo_suppress_default_print) @@ -268,6 +364,44 @@ recurse: return (hdrlen); } +/* + * Print an Ethernet frame while specyfing a non-standard Ethernet header + * length. + * 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_switch_tag(netdissect_options *ndo, const u_char *p, u_int length, + u_int caplen, + void (*print_switch_tag)(netdissect_options *, const u_char *), + u_int switch_tag_len) +{ + return (ether_print_common(ndo, p, length, caplen, print_switch_tag, + switch_tag_len, NULL, NULL)); +} + +/* + * Print an Ethernet frame. + * 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, + 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) +{ + ndo->ndo_protocol = "ether"; + return (ether_print_common(ndo, p, length, caplen, NULL, 0, + print_encap_header, encap_header_arg)); +} + /* * This is the top level routine of the printer. 'p' points * to the ether header of the packet, 'h->len' is the length @@ -276,7 +410,7 @@ recurse: */ u_int ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, - const u_char *p) + const u_char *p) { ndo->ndo_protocol = "ether_if"; return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL)); @@ -293,7 +427,7 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, */ u_int netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, - const u_char *p) + const u_char *p) { /* * Fail if we don't have enough data for the Hilscher pseudo-header. @@ -320,8 +454,8 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, */ u_int netanalyzer_transparent_if_print(netdissect_options *ndo, - const struct pcap_pkthdr *h, - const u_char *p) + const struct pcap_pkthdr *h, + const u_char *p) { /* * Fail if we don't have enough data for the Hilscher pseudo-header, @@ -346,14 +480,14 @@ 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, - const struct lladdr_info *src, const struct lladdr_info *dst) + u_short ether_type, const u_char *p, + u_int length, u_int caplen, + const struct lladdr_info *src, const struct lladdr_info *dst) { switch (ether_type) { case ETHERTYPE_IP: - ip_print(ndo, p, length); + ip_print(ndo, p, length); return (1); case ETHERTYPE_IPV6: @@ -362,7 +496,7 @@ ethertype_print(netdissect_options *ndo, case ETHERTYPE_ARP: case ETHERTYPE_REVARP: - arp_print(ndo, p, length, caplen); + arp_print(ndo, p, length, caplen); return (1); case ETHERTYPE_DN: @@ -401,11 +535,11 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_EAPOL: - eap_print(ndo, p, length); + eap_print(ndo, p, length); return (1); case ETHERTYPE_RRCP: - rrcp_print(ndo, p, length, src, dst); + rrcp_print(ndo, p, length, src, dst); return (1); case ETHERTYPE_PPP: @@ -416,11 +550,11 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_MPCP: - mpcp_print(ndo, p, length); + mpcp_print(ndo, p, length); return (1); case ETHERTYPE_SLOW: - slow_print(ndo, p, length); + slow_print(ndo, p, length); return (1); case ETHERTYPE_CFM: @@ -432,13 +566,13 @@ ethertype_print(netdissect_options *ndo, lldp_print(ndo, p, length); return (1); - case ETHERTYPE_NSH: - nsh_print(ndo, p, length); - return (1); + case ETHERTYPE_NSH: + nsh_print(ndo, p, length); + return (1); - case ETHERTYPE_LOOPBACK: + case ETHERTYPE_LOOPBACK: loopback_print(ndo, p, length); - return (1); + return (1); case ETHERTYPE_MPLS: case ETHERTYPE_MPLS_MULTI: @@ -453,23 +587,19 @@ ethertype_print(netdissect_options *ndo, msnlb_print(ndo, p); return (1); - case ETHERTYPE_GEONET_OLD: - case ETHERTYPE_GEONET: - geonet_print(ndo, p, length, src); - return (1); + case ETHERTYPE_GEONET_OLD: + case ETHERTYPE_GEONET: + geonet_print(ndo, p, length, src); + return (1); - case ETHERTYPE_CALM_FAST: - calm_fast_print(ndo, p, length, src); - return (1); + case ETHERTYPE_CALM_FAST: + calm_fast_print(ndo, p, length, src); + return (1); case ETHERTYPE_AOE: aoe_print(ndo, p, length); return (1); - case ETHERTYPE_MEDSA: - medsa_print(ndo, p, length, caplen, src, dst); - return (1); - case ETHERTYPE_LAT: case ETHERTYPE_SCA: case ETHERTYPE_MOPRC: