X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6a58ce3ad1f0fc8b1bfe3f74435649b4f72b6955..8b1d184e10263b5889ffcfbc4887ca82d7ca07df:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 7143830f..aed2bea8 100644 --- a/print-ether.c +++ b/print-ether.c @@ -22,10 +22,10 @@ /* \summary: Ethernet printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include "netdissect.h" #include "extract.h" @@ -104,37 +104,37 @@ const struct tok ethertype_values[] = { { 0, NULL} }; -static inline void +static void ether_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length) { - const struct ether_header *ep; + const struct ether_header *ehp; uint16_t length_type; - ep = (const struct ether_header *)bp; + ehp = (const struct ether_header *)bp; - ND_PRINT((ndo, "%s > %s", - etheraddr_string(ndo, ep->ether_shost), - etheraddr_string(ndo, ep->ether_dhost))); + ND_PRINT("%s > %s", + etheraddr_string(ndo, ehp->ether_shost), + etheraddr_string(ndo, ehp->ether_dhost)); - length_type = EXTRACT_BE_U_2(ep->ether_length_type); + length_type = EXTRACT_BE_U_2(ehp->ether_length_type); if (!ndo->ndo_qflag) { if (length_type <= MAX_ETHERNET_LENGTH_VAL) { - ND_PRINT((ndo, ", 802.3")); + ND_PRINT(", 802.3"); length = length_type; } else - ND_PRINT((ndo, ", ethertype %s (0x%04x)", + ND_PRINT(", ethertype %s (0x%04x)", tok2str(ethertype_values,"Unknown", length_type), - length_type)); + length_type); } else { if (length_type <= MAX_ETHERNET_LENGTH_VAL) { - ND_PRINT((ndo, ", 802.3")); + ND_PRINT(", 802.3"); length = length_type; } else - ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type))); + ND_PRINT(", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type)); } - ND_PRINT((ndo, ", length %u: ", length)); + ND_PRINT(", length %u: ", length); } /* @@ -150,19 +150,20 @@ 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) { - const struct ether_header *ep; + const struct ether_header *ehp; u_int orig_length; u_short length_type; u_int hdrlen; int llc_hdrlen; struct lladdr_info src, dst; + ndo->ndo_protocol = "ether"; if (caplen < ETHER_HDRLEN) { - ND_PRINT((ndo, "[|ether]")); + ND_PRINT("[|ether]"); return (caplen); } if (length < ETHER_HDRLEN) { - ND_PRINT((ndo, "[|ether]")); + ND_PRINT("[|ether]"); return (length); } @@ -175,15 +176,15 @@ ether_print(netdissect_options *ndo, length -= ETHER_HDRLEN; caplen -= ETHER_HDRLEN; - ep = (const struct ether_header *)p; + ehp = (const struct ether_header *)p; p += ETHER_HDRLEN; hdrlen = ETHER_HDRLEN; - src.addr = ep->ether_shost; + src.addr = ehp->ether_shost; src.addr_string = etheraddr_string; - dst.addr = ep->ether_dhost; + dst.addr = ehp->ether_dhost; dst.addr_string = etheraddr_string; - length_type = EXTRACT_BE_U_2(ep->ether_length_type); + length_type = EXTRACT_BE_U_2(ehp->ether_length_type); recurse: /* @@ -208,22 +209,22 @@ recurse: * the enclosed type field. */ if (caplen < 4) { - ND_PRINT((ndo, "[|vlan]")); + ND_PRINT("[|vlan]"); return (hdrlen + caplen); } if (length < 4) { - ND_PRINT((ndo, "[|vlan]")); + ND_PRINT("[|vlan]"); return (hdrlen + length); } if (ndo->ndo_eflag) { uint16_t tag = EXTRACT_BE_U_2(p); - ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag))); + ND_PRINT("%s, ", ieee8021q_tci_string(tag)); } length_type = EXTRACT_BE_U_2(p + 2); if (ndo->ndo_eflag && length_type > MAX_ETHERNET_LENGTH_VAL) - ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type))); + ND_PRINT("ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type)); p += 4; length -= 4; caplen -= 4; @@ -254,7 +255,7 @@ recurse: if (!ndo->ndo_eflag) { if (print_encap_header != NULL) (*print_encap_header)(ndo, encap_header_arg); - ether_hdr_print(ndo, (const u_char *)ep, orig_length); + ether_hdr_print(ndo, (const u_char *)ehp, orig_length); } if (!ndo->ndo_suppress_default_print) @@ -274,6 +275,7 @@ u_int 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)); } @@ -293,8 +295,9 @@ netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, /* * Fail if we don't have enough data for the Hilscher pseudo-header. */ + ndo->ndo_protocol = "netanalyzer_if"; if (h->len < 4 || h->caplen < 4) { - ND_PRINT((ndo, "[|netanalyzer]")); + ND_PRINT("[|netanalyzer]"); return (h->caplen); } @@ -321,8 +324,9 @@ 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->len < 12 || h->caplen < 12) { - ND_PRINT((ndo, "[|netanalyzer-transparent]")); + ND_PRINT("[|netanalyzer-transparent]"); return (h->caplen); } @@ -364,7 +368,7 @@ ethertype_print(netdissect_options *ndo, case ETHERTYPE_ATALK: if (ndo->ndo_vflag) - ND_PRINT((ndo, "et1 ")); + ND_PRINT("et1 "); atalk_print(ndo, p, length); return (1); @@ -373,13 +377,13 @@ ethertype_print(netdissect_options *ndo, return (1); case ETHERTYPE_IPX: - ND_PRINT((ndo, "(NOV-ETHII) ")); + ND_PRINT("(NOV-ETHII) "); ipx_print(ndo, p, length); return (1); case ETHERTYPE_ISO: if (length == 0 || caplen == 0) { - ND_PRINT((ndo, " [|osi]")); + ND_PRINT(" [|osi]"); return (1); } isoclns_print(ndo, p + 1, length - 1); @@ -402,7 +406,7 @@ ethertype_print(netdissect_options *ndo, case ETHERTYPE_PPP: if (length) { - ND_PRINT((ndo, ": ")); + ND_PRINT(": "); ppp_print(ndo, p, length); } return (1); @@ -472,12 +476,3 @@ ethertype_print(netdissect_options *ndo, return (0); } } - - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */ -