X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d29f3dab95d8b28a62848fcb043b8ba40348bc3d..ff2bbd6ffe2ba25884e36f2bcc97fb156cf280e6:/print-ether.c diff --git a/print-ether.c b/print-ether.c index b2ca0d13..73947a05 100644 --- a/print-ether.c +++ b/print-ether.c @@ -19,20 +19,34 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \summary: Ethernet printer */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include - -#include +#include "netdissect-stdinc.h" -#include "interface.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" }, @@ -73,16 +87,20 @@ 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" }, { ETHERTYPE_CFM_OLD, "CFM (old)" }, { ETHERTYPE_CFM, "CFM" }, + { ETHERTYPE_IEEE1905_1, "IEEE1905.1" }, { ETHERTYPE_LLDP, "LLDP" }, { ETHERTYPE_TIPC, "TIPC"}, { ETHERTYPE_GEONET_OLD, "GeoNet (old)"}, { ETHERTYPE_GEONET, "GeoNet"}, { ETHERTYPE_CALM_FAST, "CALM FAST"}, + { ETHERTYPE_AOE, "AoE" }, + { ETHERTYPE_MEDSA, "MEDSA" }, { 0, NULL} }; @@ -90,31 +108,33 @@ static inline void ether_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) { - register const struct ether_header *ep; - u_int16_t ether_type; + const struct ether_header *ep; + uint16_t length_type; ep = (const struct ether_header *)bp; - (void)ND_PRINT((ndo, "%s > %s", - etheraddr_string(ESRC(ep)), - etheraddr_string(EDST(ep)))); + ND_PRINT("%s > %s", + etheraddr_string(ndo, ep->ether_shost), + etheraddr_string(ndo, ep->ether_dhost)); - ether_type = EXTRACT_16BITS(&ep->ether_type); + length_type = EXTRACT_BE_U_2(ep->ether_length_type); if (!ndo->ndo_qflag) { - if (ether_type <= ETHERMTU) - (void)ND_PRINT((ndo, ", 802.3")); - else - (void)ND_PRINT((ndo, ", ethertype %s (0x%04x)", - tok2str(ethertype_values,"Unknown", ether_type), - ether_type)); + 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 (ether_type <= ETHERMTU) - (void)ND_PRINT((ndo, ", 802.3")); - else - (void)ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type))); + 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)); } - (void)ND_PRINT((ndo, ", length %u: ", length)); + ND_PRINT(", length %u: ", length); } /* @@ -122,20 +142,28 @@ 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. */ -void +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) { - struct ether_header *ep; + const struct ether_header *ep; u_int orig_length; - u_short ether_type; - u_short extracted_ether_type; - - if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) { - ND_PRINT((ndo, "[|ether]")); - return; + u_short length_type; + u_int hdrlen; + int llc_hdrlen; + struct lladdr_info src, dst; + + if (caplen < ETHER_HDRLEN) { + ND_PRINT("[|ether]"); + return (caplen); + } + if (length < ETHER_HDRLEN) { + ND_PRINT("[|ether]"); + return (length); } if (ndo->ndo_eflag) { @@ -147,58 +175,61 @@ ether_print(netdissect_options *ndo, length -= ETHER_HDRLEN; caplen -= ETHER_HDRLEN; - ep = (struct ether_header *)p; + ep = (const struct ether_header *)p; p += ETHER_HDRLEN; + hdrlen = ETHER_HDRLEN; - ether_type = EXTRACT_16BITS(&ep->ether_type); + src.addr = ep->ether_shost; + src.addr_string = etheraddr_string; + dst.addr = ep->ether_dhost; + dst.addr_string = etheraddr_string; + length_type = EXTRACT_BE_U_2(ep->ether_length_type); recurse: /* * Is it (gag) an 802.3 encapsulation? */ - if (ether_type <= ETHERMTU) { + if (length_type <= MAX_ETHERNET_LENGTH_VAL) { /* Try to print the LLC-layer header & higher layers */ - if (llc_print(p, length, caplen, ESRC(ep), EDST(ep), - &extracted_ether_type) == 0) { - /* ether_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, (u_char *)ep, orig_length); - } - + 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) - ndo->ndo_default_print(ndo, p, caplen); + ND_DEFAULTPRINT(p, caplen); + llc_hdrlen = -llc_hdrlen; } - } else if (ether_type == ETHERTYPE_8021Q || - ether_type == ETHERTYPE_8021Q9100 || - ether_type == ETHERTYPE_8021Q9200 || - ether_type == ETHERTYPE_8021QinQ) { + hdrlen += llc_hdrlen; + } else if (length_type == ETHERTYPE_8021Q || + length_type == ETHERTYPE_8021Q9100 || + length_type == ETHERTYPE_8021Q9200 || + length_type == ETHERTYPE_8021QinQ) { /* * Print VLAN information, and then go back and process * the enclosed type field. */ - if (caplen < 4 || length < 4) { - ND_PRINT((ndo, "[|vlan]")); - return; + if (caplen < 4) { + ND_PRINT("[|vlan]"); + return (hdrlen + caplen); + } + if (length < 4) { + ND_PRINT("[|vlan]"); + return (hdrlen + length); } if (ndo->ndo_eflag) { - u_int16_t tag = EXTRACT_16BITS(p); + uint16_t tag = EXTRACT_BE_U_2(p); - ND_PRINT((ndo, "vlan %u, p %u%s, ", - tag & 0xfff, - tag >> 13, - (tag & 0x1000) ? ", CFI" : "")); + ND_PRINT("%s, ", ieee8021q_tci_string(tag)); } - ether_type = EXTRACT_16BITS(p + 2); - if (ndo->ndo_eflag && ether_type > ETHERMTU) - ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", ether_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; + hdrlen += 4; goto recurse; - } else if (ether_type == ETHERTYPE_JUMBO) { + } else if (length_type == ETHERTYPE_JUMBO) { /* * Alteon jumbo frames. * See @@ -209,53 +240,48 @@ recurse: * there's an LLC header and payload. */ /* Try to print the LLC-layer header & higher layers */ - if (llc_print(p, length, caplen, ESRC(ep), EDST(ep), - &extracted_ether_type) == 0) { - /* ether_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, (u_char *)ep, orig_length); - } - + 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) - ndo->ndo_default_print(ndo, p, caplen); + ND_DEFAULTPRINT(p, caplen); + llc_hdrlen = -llc_hdrlen; } + hdrlen += llc_hdrlen; } else { - if (ethertype_print(ndo, ether_type, p, length, caplen) == 0) { - /* ether_type not known, print raw packet */ + 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, (u_char *)ep, orig_length); + ether_hdr_print(ndo, (const u_char *)ep, orig_length); } if (!ndo->ndo_suppress_default_print) - ndo->ndo_default_print(ndo, p, caplen); + ND_DEFAULTPRINT(p, caplen); } } + return (hdrlen); } /* * This is the top level routine of the printer. 'p' points - * to the ether header of the packet, 'h->ts' is the timestamp, - * 'h->len' is the length of the packet off the wire, and 'h->caplen' - * is the number of bytes actually captured. + * to the ether header of the packet, 'h->len' is the length + * of the packet off the wire, and 'h->caplen' is the number + * of bytes actually captured. */ u_int ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - ether_print(ndo, p, h->len, h->caplen, NULL, NULL); - - return (ETHER_HDRLEN); + return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL)); } /* * This is the top level routine of the printer. 'p' points - * to the ether header of the packet, 'h->ts' is the timestamp, - * 'h->len' is the length of the packet off the wire, and 'h->caplen' - * is the number of bytes actually captured. + * to the ether header of the packet, 'h->len' is the length + * of the packet off the wire, and 'h->caplen' is the number + * of bytes actually captured. * * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header * before the Ethernet header. @@ -268,21 +294,19 @@ 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) { - printf("[|netanalyzer]"); + ND_PRINT("[|netanalyzer]"); return (h->caplen); } /* Skip the pseudo-header. */ - ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL); - - return (4 + ETHER_HDRLEN); + return (4 + ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL)); } /* * This is the top level routine of the printer. 'p' points - * to the ether header of the packet, 'h->ts' is the timestamp, - * 'h->len' is the length of the packet off the wire, and 'h->caplen' - * is the number of bytes actually captured. + * to the ether header of the packet, 'h->len' is the length + * of the packet off the wire, and 'h->caplen' is the number + * of bytes actually captured. * * This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF @@ -298,14 +322,12 @@ netanalyzer_transparent_if_print(netdissect_options *ndo, * preamble, and SOF. */ if (h->len < 12 || h->caplen < 12) { - printf("[|netanalyzer-transparent]"); + ND_PRINT("[|netanalyzer-transparent]"); return (h->caplen); } /* Skip the pseudo-header, preamble, and SOF. */ - ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL); - - return (12 + ETHER_HDRLEN); + return (12 + ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL)); } /* @@ -318,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) { @@ -326,39 +349,41 @@ ethertype_print(netdissect_options *ndo, ip_print(ndo, p, length); return (1); -#ifdef INET6 case ETHERTYPE_IPV6: ip6_print(ndo, p, length); return (1); -#endif /*INET6*/ case ETHERTYPE_ARP: case ETHERTYPE_REVARP: - arp_print(ndo, p, length, caplen); + arp_print(ndo, p, length, caplen); return (1); case ETHERTYPE_DN: - decnet_print(/*ndo,*/p, length, caplen); + decnet_print(ndo, p, length, caplen); return (1); case ETHERTYPE_ATALK: if (ndo->ndo_vflag) - fputs("et1 ", stdout); - atalk_print(/*ndo,*/p, length); + ND_PRINT("et1 "); + atalk_print(ndo, p, length); return (1); case ETHERTYPE_AARP: - aarp_print(/*ndo,*/p, length); + aarp_print(ndo, p, length); 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); - return(1); + case ETHERTYPE_ISO: + if (length == 0 || caplen == 0) { + ND_PRINT(" [|osi]"); + return (1); + } + isoclns_print(ndo, p + 1, length - 1); + return(1); case ETHERTYPE_PPPOED: case ETHERTYPE_PPPOES: @@ -372,33 +397,37 @@ 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: if (length) { - printf(": "); - ppp_print(/*ndo,*/p, length); + ND_PRINT(": "); + ppp_print(ndo, p, length); } 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: case ETHERTYPE_CFM_OLD: - cfm_print(/*ndo,*/p, length); + cfm_print(ndo, p, length); return (1); case ETHERTYPE_LLDP: - lldp_print(/*ndo,*/p, length); + 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); @@ -418,17 +447,26 @@ 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: + 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: case ETHERTYPE_MOPDL: + case ETHERTYPE_IEEE1905_1: /* default_print for now */ default: return (0);