X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2c2ad4f4ae108fffd2b1f1ee963d183ef62ca149..fd5f8f865a3cecc437818a465113842aa0a8077d:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 0d8dbba9..3aeda8f7 100644 --- a/print-ether.c +++ b/print-ether.c @@ -27,6 +27,7 @@ #include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -151,11 +152,11 @@ ether_common_print(netdissect_options *ndo, const u_char *p, u_int length, if (caplen < ETHER_HDRLEN + switch_tag_len) { nd_print_trunc(ndo); - return (caplen); + return caplen; } if (length < ETHER_HDRLEN + switch_tag_len) { nd_print_trunc(ndo); - return (length); + return length; } if (print_encap_header != NULL) @@ -204,31 +205,48 @@ recurse: p += 2; hdrlen += 2; + /* + * Process 802.1AE MACsec headers. + */ + printed_length = 0; if (length_type == ETHERTYPE_MACSEC) { /* * MACsec, aka IEEE 802.1AE-2006 * Print the header, and try to print the payload if it's not encrypted */ - int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen); + if (ndo->ndo_eflag) { + ether_type_print(ndo, length_type); + ND_PRINT(", length %u: ", orig_length); + printed_length = 1; + } + + int ret = macsec_print(ndo, &p, &length, &caplen, &hdrlen, + &src, &dst); if (ret == 0) { - /* Payload is encrypted; just quit. */ - return (hdrlen + caplen); + /* Payload is encrypted; print it as raw data. */ + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, caplen); + return hdrlen; } else if (ret > 0) { /* Problem printing the header; just quit. */ - return (ret); + return ret; } else { /* * Keep processing type/length fields. */ - goto recurse; + length_type = GET_BE_U_2(p); + + length -= 2; + caplen -= 2; + p += 2; + hdrlen += 2; } } /* * Process VLAN tag types. */ - printed_length = 0; while (length_type == ETHERTYPE_8021Q || length_type == ETHERTYPE_8021Q9100 || length_type == ETHERTYPE_8021Q9200 || @@ -241,12 +259,12 @@ recurse: if (caplen < 4) { ndo->ndo_protocol = "vlan"; nd_print_trunc(ndo); - return (hdrlen + caplen); + return hdrlen + caplen; } if (length < 4) { ndo->ndo_protocol = "vlan"; nd_print_trunc(ndo); - return (hdrlen + length); + return hdrlen + length; } if (ndo->ndo_eflag) { uint16_t tag = GET_BE_U_2(p); @@ -329,11 +347,11 @@ recurse: } else if (length_type == ETHERTYPE_ARISTA) { if (caplen < 2) { ND_PRINT("[|arista]"); - return (hdrlen + caplen); + return hdrlen + caplen; } if (length < 2) { ND_PRINT("[|arista]"); - return (hdrlen + length); + return hdrlen + length; } ether_type_print(ndo, length_type); ND_PRINT(", length %u: ", orig_length); @@ -384,7 +402,7 @@ recurse: ND_DEFAULTPRINT(p, caplen); } } - return (hdrlen); + return hdrlen; } /* @@ -402,8 +420,8 @@ ether_switch_tag_print(netdissect_options *ndo, const u_char *p, u_int length, void (*print_switch_tag)(netdissect_options *, const u_char *), u_int switch_tag_len) { - return (ether_common_print(ndo, p, length, caplen, print_switch_tag, - switch_tag_len, NULL, NULL)); + return ether_common_print(ndo, p, length, caplen, print_switch_tag, + switch_tag_len, NULL, NULL); } /* @@ -421,8 +439,8 @@ ether_print(netdissect_options *ndo, const u_char *encap_header_arg) { ndo->ndo_protocol = "ether"; - return (ether_common_print(ndo, p, length, caplen, NULL, 0, - print_encap_header, encap_header_arg)); + return ether_common_print(ndo, p, length, caplen, NULL, 0, + print_encap_header, encap_header_arg); } /* @@ -431,12 +449,13 @@ ether_print(netdissect_options *ndo, * of the packet off the wire, and 'h->caplen' is the number * of bytes actually captured. */ -u_int +void ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - ndo->ndo_protocol = "ether_if"; - return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL)); + ndo->ndo_protocol = "ether"; + ndo->ndo_ll_hdr_len += + ether_print(ndo, p, h->len, h->caplen, NULL, NULL); } /* @@ -448,21 +467,20 @@ ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, * This is for DLT_NETANALYZER, which has a 4-byte pseudo-header * before the Ethernet header. */ -u_int +void 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. */ - ndo->ndo_protocol = "netanalyzer_if"; - if (h->caplen < 4) { - nd_print_trunc(ndo); - return (h->caplen); - } + ndo->ndo_protocol = "netanalyzer"; + ND_TCHECK_LEN(p, 4); /* Skip the pseudo-header. */ - return (4 + ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL)); + ndo->ndo_ll_hdr_len += 4; + ndo->ndo_ll_hdr_len += + ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL); } /* @@ -475,7 +493,7 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, * pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF * before the Ethernet header. */ -u_int +void netanalyzer_transparent_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) @@ -484,14 +502,13 @@ netanalyzer_transparent_if_print(netdissect_options *ndo, * Fail if we don't have enough data for the Hilscher pseudo-header, * preamble, and SOF. */ - ndo->ndo_protocol = "netanalyzer_transparent_if"; - if (h->caplen < 12) { - nd_print_trunc(ndo); - return (h->caplen); - } + ndo->ndo_protocol = "netanalyzer_transparent"; + ND_TCHECK_LEN(p, 12); /* Skip the pseudo-header, preamble, and SOF. */ - return (12 + ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL)); + ndo->ndo_ll_hdr_len += 12; + ndo->ndo_ll_hdr_len += + ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL); } /* @@ -547,6 +564,9 @@ ethertype_print(netdissect_options *ndo, nd_print_trunc(ndo); return (1); } + /* At least one byte is required */ + /* FIXME: Reference for this byte? */ + ND_TCHECK_1(p); isoclns_print(ndo, p + 1, length - 1); return(1); @@ -558,7 +578,7 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_EAPOL: - eap_print(ndo, p, length); + eapol_print(ndo, p); return (1); case ETHERTYPE_RRCP: