X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3a919068a93e81fb249a2374cb9e2ad7d1e1fc51..88e479b75ea97730bf265a2371c0658a401eae92:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 71c28a5f..84ad77d8 100644 --- a/print-ether.c +++ b/print-ether.c @@ -18,11 +18,8 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.88 2004-02-18 14:23:27 hannes Exp $ (LBL)"; -#endif +#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -30,26 +27,26 @@ static const char rcsid[] _U_ = #include #include -#include #include "interface.h" +#include "extract.h" #include "addrtoname.h" #include "ethertype.h" - #include "ether.h" -const u_char *snapend; - -const struct tok ethertype_values[] = { +const struct tok ethertype_values[] = { { ETHERTYPE_IP, "IPv4" }, { ETHERTYPE_MPLS, "MPLS unicast" }, { ETHERTYPE_MPLS_MULTI, "MPLS multicast" }, { ETHERTYPE_IPV6, "IPv6" }, { ETHERTYPE_8021Q, "802.1Q" }, + { ETHERTYPE_8021Q9100, "802.1Q-9100" }, + { ETHERTYPE_8021QinQ, "802.1Q-QinQ" }, + { ETHERTYPE_8021Q9200, "802.1Q-9200" }, { ETHERTYPE_VMAN, "VMAN" }, { ETHERTYPE_PUP, "PUP" }, { ETHERTYPE_ARP, "ARP"}, - { ETHERTYPE_REVARP , "Reverse ARP"}, + { ETHERTYPE_REVARP, "Reverse ARP"}, { ETHERTYPE_NS, "NS" }, { ETHERTYPE_SPRITE, "Sprite" }, { ETHERTYPE_TRAIL, "Trail" }, @@ -58,6 +55,7 @@ const struct tok ethertype_values[] = { { ETHERTYPE_DN, "DN" }, { ETHERTYPE_LAT, "LAT" }, { ETHERTYPE_SCA, "SCA" }, + { ETHERTYPE_TEB, "TEB" }, { ETHERTYPE_LANBRIDGE, "Lanbridge" }, { ETHERTYPE_DECDNS, "DEC DNS" }, { ETHERTYPE_DECDTS, "DEC DTS" }, @@ -67,237 +65,365 @@ const struct tok ethertype_values[] = { { ETHERTYPE_AARP, "Appletalk ARP" }, { ETHERTYPE_IPX, "IPX" }, { ETHERTYPE_PPP, "PPP" }, + { ETHERTYPE_MPCP, "MPCP" }, + { ETHERTYPE_SLOW, "Slow Protocols" }, { ETHERTYPE_PPPOED, "PPPoE D" }, { ETHERTYPE_PPPOES, "PPPoE S" }, + { ETHERTYPE_EAPOL, "EAPOL" }, + { ETHERTYPE_RRCP, "RRCP" }, + { ETHERTYPE_MS_NLB_HB, "MS NLB heartbeat" }, { ETHERTYPE_JUMBO, "Jumbo" }, { ETHERTYPE_LOOPBACK, "Loopback" }, { ETHERTYPE_ISO, "OSI" }, + { ETHERTYPE_GRE_ISO, "GRE-OSI" }, + { ETHERTYPE_CFM_OLD, "CFM (old)" }, + { ETHERTYPE_CFM, "CFM" }, + { ETHERTYPE_LLDP, "LLDP" }, + { ETHERTYPE_TIPC, "TIPC"}, + { ETHERTYPE_GEONET_OLD, "GeoNet (old)"}, + { ETHERTYPE_GEONET, "GeoNet"}, + { ETHERTYPE_CALM_FAST, "CALM FAST"}, { 0, NULL} }; static inline void -ether_hdr_print(register const u_char *bp, u_int length) +ether_hdr_print(netdissect_options *ndo, + const u_char *bp, u_int length) { register const struct ether_header *ep; + u_int16_t ether_type; + ep = (const struct ether_header *)bp; - (void)printf("%s > %s", + (void)ND_PRINT((ndo, "%s > %s", etheraddr_string(ESRC(ep)), - etheraddr_string(EDST(ep))); - - if (!qflag) { - if (ntohs(ep->ether_type) <= ETHERMTU) - (void)printf(", 802.3"); - else - (void)printf(", ethertype %s (0x%04x)", - tok2str(ethertype_values,"Unknown", ntohs(ep->ether_type)), - ntohs(ep->ether_type)); + etheraddr_string(EDST(ep)))); + + ether_type = EXTRACT_16BITS(&ep->ether_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)); } else { - if (ntohs(ep->ether_type) <= ETHERMTU) - (void)printf(", 802.3"); - else - (void)printf(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ntohs(ep->ether_type))); + 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))); } - (void)printf(", length %u: ", length); + (void)ND_PRINT((ndo, ", length %u: ", length)); } +/* + * 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. + */ void -ether_print(const u_char *p, u_int length, u_int caplen) +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; + u_int orig_length; u_short ether_type; u_short extracted_ether_type; - if (caplen < ETHER_HDRLEN) { - printf("[|ether]"); + if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) { + ND_PRINT((ndo, "[|ether]")); return; } - if (eflag) - ether_hdr_print(p, length); + if (ndo->ndo_eflag) { + if (print_encap_header != NULL) + (*print_encap_header)(ndo, encap_header_arg); + ether_hdr_print(ndo, p, length); + } + orig_length = length; length -= ETHER_HDRLEN; caplen -= ETHER_HDRLEN; ep = (struct ether_header *)p; p += ETHER_HDRLEN; - ether_type = ntohs(ep->ether_type); + ether_type = EXTRACT_16BITS(&ep->ether_type); +recurse: /* * Is it (gag) an 802.3 encapsulation? */ - extracted_ether_type = 0; if (ether_type <= ETHERMTU) { /* 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 (!eflag) - ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN); + 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); + } + + if (!ndo->ndo_suppress_default_print) + ndo->ndo_default_print(ndo, p, caplen); + } + } else if (ether_type == ETHERTYPE_8021Q || + ether_type == ETHERTYPE_8021Q9100 || + ether_type == ETHERTYPE_8021Q9200 || + ether_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 (ndo->ndo_eflag) { + u_int16_t tag = EXTRACT_16BITS(p); - if (!xflag && !qflag) - default_print(p, caplen); + ND_PRINT((ndo, "vlan %u, p %u%s, ", + tag & 0xfff, + tag >> 13, + (tag & 0x1000) ? ", CFI" : "")); } - } else if (ether_encap_print(ether_type, p, length, caplen, - &extracted_ether_type) == 0) { - /* ether_type not known, print raw packet */ - if (!eflag) - ether_hdr_print((u_char *)ep, length + ETHER_HDRLEN); - - if (!xflag && !qflag) - default_print(p, caplen); - } + + 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))); + p += 4; + length -= 4; + caplen -= 4; + goto recurse; + } else if (ether_type == ETHERTYPE_JUMBO) { + /* + * Alteon jumbo frames. + * See + * + * http://tools.ietf.org/html/draft-ietf-isis-ext-eth-01 + * + * which indicates that, following the type field, + * 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); + } + + if (!ndo->ndo_suppress_default_print) + ndo->ndo_default_print(ndo, p, caplen); + } + } else { + if (ethertype_print(ndo, ether_type, p, length, caplen) == 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); + } + + if (!ndo->ndo_suppress_default_print) + ndo->ndo_default_print(ndo, p, caplen); + } + } } /* * This is the top level routine of the printer. 'p' points * to the ether header of the packet, 'h->ts' is the timestamp, - * 'h->length' is the length of the packet off the wire, and 'h->caplen' + * '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(const struct pcap_pkthdr *h, const u_char *p) +ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, + const u_char *p) { - ether_print(p, h->len, h->caplen); + ether_print(ndo, p, h->len, h->caplen, NULL, NULL); return (ETHER_HDRLEN); } /* - * Prints the packet encapsulated in an Ethernet data segment - * (or an equivalent encapsulation), given the Ethernet type code. + * 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. * - * Returns non-zero if it can do so, zero if the ethertype is unknown. + * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header + * before the Ethernet header. + */ +u_int +netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, + const u_char *p) +{ + /* + * Fail if we don't have enough data for the Hilscher pseudo-header. + */ + if (h->len < 4 || h->caplen < 4) { + printf("[|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); +} + +/* + * 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. * - * The Ethernet type code is passed through a pointer; if it was - * ETHERTYPE_8021Q, it gets updated to be the Ethernet type of - * the 802.1Q payload, for the benefit of lower layers that might - * want to know what it is. + * This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte + * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF + * before the Ethernet header. + */ +u_int +netanalyzer_transparent_if_print(netdissect_options *ndo, + const struct pcap_pkthdr *h, + const u_char *p) +{ + /* + * Fail if we don't have enough data for the Hilscher pseudo-header, + * preamble, and SOF. + */ + if (h->len < 12 || h->caplen < 12) { + printf("[|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); +} + +/* + * Prints the packet payload, given an Ethernet type code for the payload's + * protocol. + * + * Returns non-zero if it can do so, zero if the ethertype is unknown. */ int -ether_encap_print(u_short ether_type, const u_char *p, - u_int length, u_int caplen, u_short *extracted_ether_type) +ethertype_print(netdissect_options *ndo, + u_short ether_type, const u_char *p, + u_int length, u_int caplen) { - recurse: - *extracted_ether_type = ether_type; - switch (ether_type) { case ETHERTYPE_IP: - ip_print(p, length); + ip_print(ndo, p, length); return (1); #ifdef INET6 case ETHERTYPE_IPV6: - ip6_print(p, length); + ip6_print(ndo, p, length); return (1); #endif /*INET6*/ case ETHERTYPE_ARP: case ETHERTYPE_REVARP: - arp_print(p, length, caplen); + arp_print(ndo, p, length, caplen); return (1); case ETHERTYPE_DN: - decnet_print(p, length, caplen); + decnet_print(/*ndo,*/p, length, caplen); return (1); case ETHERTYPE_ATALK: - if (vflag) + if (ndo->ndo_vflag) fputs("et1 ", stdout); - atalk_print(p, length); + atalk_print(/*ndo,*/p, length); return (1); case ETHERTYPE_AARP: - aarp_print(p, length); + aarp_print(/*ndo,*/p, length); return (1); case ETHERTYPE_IPX: - printf("(NOV-ETHII) "); - ipx_print(p, length); + ND_PRINT((ndo, "(NOV-ETHII) ")); + ipx_print(/*ndo,*/p, length); return (1); - case ETHERTYPE_8021Q: - if (eflag) - printf("vlan %u, p %u%s, ", - ntohs(*(u_int16_t *)p) & 0xfff, - ntohs(*(u_int16_t *)p) >> 13, - (ntohs(*(u_int16_t *)p) & 0x1000) ? ", CFI" : ""); + case ETHERTYPE_ISO: + isoclns_print(/*ndo,*/p+1, length-1, length-1); + return(1); - ether_type = ntohs(*(u_int16_t *)(p + 2)); - p += 4; - length -= 4; - caplen -= 4; + case ETHERTYPE_PPPOED: + case ETHERTYPE_PPPOES: + case ETHERTYPE_PPPOED2: + case ETHERTYPE_PPPOES2: + pppoe_print(/*ndo,*/p, length); + return (1); - if (ether_type > ETHERMTU) { - if (eflag) - printf("ethertype %s, ", - tok2str(ethertype_values,"0x%04x", ether_type)); - goto recurse; - } + case ETHERTYPE_EAPOL: + eap_print(ndo, p, length); + return (1); - *extracted_ether_type = 0; + case ETHERTYPE_RRCP: + rrcp_print(ndo, p - 14 , length + 14); + return (1); - if (llc_print(p, length, caplen, p - 18, p - 12, - extracted_ether_type) == 0) { - ether_hdr_print(p - 18, length + 4); + case ETHERTYPE_PPP: + if (length) { + printf(": "); + ppp_print(/*ndo,*/p, length); } - - if (!xflag && !qflag) - default_print(p - 18, caplen + 4); - return (1); - case ETHERTYPE_JUMBO: - ether_type = ntohs(*(u_int16_t *)(p)); - p += 2; - length -= 2; - caplen -= 2; - - if (ether_type > ETHERMTU) { - if (eflag) - printf("ethertype %s, ", - tok2str(ethertype_values,"0x%04x", ether_type)); - goto recurse; - } + case ETHERTYPE_MPCP: + mpcp_print(/*ndo,*/p, length); + return (1); - *extracted_ether_type = 0; + case ETHERTYPE_SLOW: + slow_print(/*ndo,*/p, length); + return (1); - if (llc_print(p, length, caplen, p - 16, p - 10, - extracted_ether_type) == 0) { - ether_hdr_print(p - 16, length + 2); - } + case ETHERTYPE_CFM: + case ETHERTYPE_CFM_OLD: + cfm_print(/*ndo,*/p, length); + return (1); - if (!xflag && !qflag) - default_print(p - 16, caplen + 2); + case ETHERTYPE_LLDP: + lldp_print(/*ndo,*/p, length); + return (1); + case ETHERTYPE_LOOPBACK: + loopback_print(ndo, p, length); return (1); - case ETHERTYPE_ISO: - isoclns_print(p+1, length-1, length-1); - return(1); + case ETHERTYPE_MPLS: + case ETHERTYPE_MPLS_MULTI: + mpls_print(/*ndo,*/p, length); + return (1); - case ETHERTYPE_PPPOED: - case ETHERTYPE_PPPOES: - pppoe_print(p, length); + case ETHERTYPE_TIPC: + tipc_print(ndo, p, length, caplen); return (1); - case ETHERTYPE_PPP: - if (length) { - printf(": "); - ppp_print(p, length); - } + case ETHERTYPE_MS_NLB_HB: + msnlb_print(ndo, p); return (1); - case ETHERTYPE_LOOPBACK: - return (0); + case ETHERTYPE_GEONET_OLD: + case ETHERTYPE_GEONET: + geonet_print(ndo, p-14, p, length); + return (1); - case ETHERTYPE_MPLS: - case ETHERTYPE_MPLS_MULTI: - mpls_print(p, length); - return (1); + case ETHERTYPE_CALM_FAST: + calm_fast_print(ndo, p-14, p, length); + return (1); case ETHERTYPE_LAT: case ETHERTYPE_SCA: @@ -308,3 +434,12 @@ ether_encap_print(u_short ether_type, const u_char *p, return (0); } } + + +/* + * Local Variables: + * c-style: whitesmith + * c-basic-offset: 8 + * End: + */ +