X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fc6f112b40b9da56286ebc125f109e2889f5ebdb..e847135d66e822a96198a8d15771cf3a827b1ee9:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 64b7f338..ddf6a530 100644 --- a/print-ether.c +++ b/print-ether.c @@ -19,7 +19,6 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -76,11 +75,14 @@ const struct tok ethertype_values[] = { { 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} }; @@ -89,13 +91,13 @@ ether_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) { register const struct ether_header *ep; - u_int16_t ether_type; + uint16_t ether_type; ep = (const struct ether_header *)bp; ND_PRINT((ndo, "%s > %s", - etheraddr_string(ESRC(ep)), - etheraddr_string(EDST(ep)))); + etheraddr_string(ndo, ESRC(ep)), + etheraddr_string(ndo, EDST(ep)))); ether_type = EXTRACT_16BITS(&ep->ether_type); if (!ndo->ndo_qflag) { @@ -121,19 +123,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_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) { @@ -145,8 +152,9 @@ 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); @@ -156,18 +164,14 @@ recurse: */ if (ether_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; } + hdrlen += llc_hdrlen; } else if (ether_type == ETHERTYPE_8021Q || ether_type == ETHERTYPE_8021Q9100 || ether_type == ETHERTYPE_8021Q9200 || @@ -176,17 +180,18 @@ recurse: * 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; + return (hdrlen + caplen); + } + if (length < 4) { + ND_PRINT((ndo, "[|vlan]")); + return (hdrlen + length); } if (ndo->ndo_eflag) { - u_int16_t tag = EXTRACT_16BITS(p); + uint16_t tag = EXTRACT_16BITS(p); - ND_PRINT((ndo, "vlan %u, p %u%s, ", - tag & 0xfff, - tag >> 13, - (tag & 0x1000) ? ", CFI" : "")); + ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag))); } ether_type = EXTRACT_16BITS(p + 2); @@ -195,6 +200,7 @@ recurse: p += 4; length -= 4; caplen -= 4; + hdrlen += 4; goto recurse; } else if (ether_type == ETHERTYPE_JUMBO) { /* @@ -207,31 +213,28 @@ 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 (!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); } /* @@ -244,9 +247,7 @@ 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)); } /* @@ -271,9 +272,7 @@ 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)); } /* @@ -301,9 +300,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)); } /* @@ -324,11 +321,9 @@ 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: @@ -423,10 +418,19 @@ ethertype_print(netdissect_options *ndo, calm_fast_print(ndo, p-14, p, length); return (1); + case ETHERTYPE_AOE: + 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: case ETHERTYPE_MOPDL: + case ETHERTYPE_IEEE1905_1: /* default_print for now */ default: return (0);