X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d5be981c91f153934cda3361567c857fc8d64886..c66320c67034e581097c08bd8532ee479f98e692:/print-ether.c diff --git a/print-ether.c b/print-ether.c index e57d993b..3b74581b 100644 --- a/print-ether.c +++ b/print-ether.c @@ -19,14 +19,13 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" #include "ethertype.h" @@ -83,6 +82,7 @@ const struct tok ethertype_values[] = { { ETHERTYPE_GEONET, "GeoNet"}, { ETHERTYPE_CALM_FAST, "CALM FAST"}, { ETHERTYPE_AOE, "AoE" }, + { ETHERTYPE_MEDSA, "MEDSA" }, { 0, NULL} }; @@ -91,7 +91,7 @@ ether_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) { register const struct ether_header *ep; - uint16_t ether_type; + uint16_t length_type; ep = (const struct ether_header *)bp; @@ -99,19 +99,21 @@ ether_hdr_print(netdissect_options *ndo, etheraddr_string(ndo, ESRC(ep)), etheraddr_string(ndo, EDST(ep)))); - ether_type = EXTRACT_16BITS(&ep->ether_type); + length_type = EXTRACT_16BITS(&ep->ether_length_type); if (!ndo->ndo_qflag) { - if (ether_type <= ETHERMTU) - ND_PRINT((ndo, ", 802.3")); - else - ND_PRINT((ndo, ", ethertype %s (0x%04x)", - tok2str(ethertype_values,"Unknown", ether_type), - ether_type)); + if (length_type <= ETHERMTU) { + ND_PRINT((ndo, ", 802.3")); + length = length_type; + } else + ND_PRINT((ndo, ", ethertype %s (0x%04x)", + tok2str(ethertype_values,"Unknown", length_type), + length_type)); } else { - if (ether_type <= ETHERMTU) - ND_PRINT((ndo, ", 802.3")); - else - ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", ether_type))); + if (length_type <= ETHERMTU) { + ND_PRINT((ndo, ", 802.3")); + length = length_type; + } else + ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type))); } ND_PRINT((ndo, ", length %u: ", length)); @@ -123,19 +125,24 @@ ether_hdr_print(netdissect_options *ndo, * a pointer to a function that can print header information for that * frame's protocol, and an argument to pass to that function. */ -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; + u_short length_type; + u_int hdrlen; + int llc_hdrlen; - if (caplen < ETHER_HDRLEN || length < ETHER_HDRLEN) { + if (caplen < ETHER_HDRLEN) { + ND_PRINT((ndo, "[|ether]")); + return (caplen); + } + if (length < ETHER_HDRLEN) { ND_PRINT((ndo, "[|ether]")); - return; + return (length); } if (ndo->ndo_eflag) { @@ -147,55 +154,57 @@ 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); + length_type = EXTRACT_16BITS(&ep->ether_length_type); recurse: /* * Is it (gag) an 802.3 encapsulation? */ - if (ether_type <= ETHERMTU) { + if (length_type <= ETHERMTU) { /* Try to print the LLC-layer header & higher layers */ - if (llc_print(ndo, 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, ESRC(ep), EDST(ep)); + 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; } - } 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) { + if (caplen < 4) { + ND_PRINT((ndo, "[|vlan]")); + return (hdrlen + caplen); + } + if (length < 4) { ND_PRINT((ndo, "[|vlan]")); - return; + return (hdrlen + length); } if (ndo->ndo_eflag) { - uint16_t tag = EXTRACT_16BITS(p); + uint16_t tag = EXTRACT_16BITS(p); ND_PRINT((ndo, "%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_16BITS(p + 2); + if (ndo->ndo_eflag && length_type > ETHERMTU) + ND_PRINT((ndo, "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 @@ -206,53 +215,48 @@ recurse: * there's an LLC header and payload. */ /* Try to print the LLC-layer header & higher layers */ - if (llc_print(ndo, 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, ESRC(ep), EDST(ep)); + 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 (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) == 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) 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. @@ -270,16 +274,14 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, } /* 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 @@ -300,9 +302,7 @@ netanalyzer_transparent_if_print(netdissect_options *ndo, } /* 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)); } /* @@ -329,7 +329,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: @@ -424,6 +424,10 @@ ethertype_print(netdissect_options *ndo, aoe_print(ndo, p, length); return (1); + case ETHERTYPE_MEDSA: + medsa_print(ndo, p, length, caplen); + return (1); + case ETHERTYPE_LAT: case ETHERTYPE_SCA: case ETHERTYPE_MOPRC: