X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/1fe6e66ecec3fb7a7cc729038012cbb264542331..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-fddi.c diff --git a/print-fddi.c b/print-fddi.c index 2a47ad65..d73d92d6 100644 --- a/print-fddi.c +++ b/print-fddi.c @@ -19,27 +19,28 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \summary: Fiber Distributed Data Interface (FDDI) printer */ + #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include -#include "interface.h" +#include "netdissect.h" +#include "extract.h" #include "addrtoname.h" -#include "ether.h" /* * Based on Ultrix if_fddi.h */ struct fddi_header { - u_char fddi_fc; /* frame control */ - u_char fddi_dhost[6]; - u_char fddi_shost[6]; + nd_uint8_t fddi_fc; /* frame control */ + nd_mac_addr fddi_dhost; + nd_mac_addr fddi_shost; }; /* @@ -84,9 +85,9 @@ struct fddi_header { * Some FDDI interfaces use bit-swapped addresses. */ #if defined(ultrix) || defined(__alpha) || defined(__bsdi) || defined(__NetBSD__) || defined(__linux__) -int fddi_bitswap = 0; +static int fddi_bitswap = 0; #else -int fddi_bitswap = 1; +static int fddi_bitswap = 1; #endif /* @@ -157,78 +158,78 @@ static const u_char fddi_bit_swap[] = { /* * Print FDDI frame-control bits */ -static inline void +static void print_fddi_fc(netdissect_options *ndo, u_char fc) { switch (fc) { case FDDIFC_VOID: /* Void frame */ - ND_PRINT((ndo, "void ")); + ND_PRINT("void "); break; case FDDIFC_NRT: /* Nonrestricted token */ - ND_PRINT((ndo, "nrt ")); + ND_PRINT("nrt "); break; case FDDIFC_RT: /* Restricted token */ - ND_PRINT((ndo, "rt ")); + ND_PRINT("rt "); break; case FDDIFC_SMT_INFO: /* SMT Info */ - ND_PRINT((ndo, "info ")); + ND_PRINT("info "); break; case FDDIFC_SMT_NSA: /* SMT Next station adrs */ - ND_PRINT((ndo, "nsa ")); + ND_PRINT("nsa "); break; case FDDIFC_MAC_BEACON: /* MAC Beacon frame */ - ND_PRINT((ndo, "beacon ")); + ND_PRINT("beacon "); break; case FDDIFC_MAC_CLAIM: /* MAC Claim frame */ - ND_PRINT((ndo, "claim ")); + ND_PRINT("claim "); break; default: switch (fc & FDDIFC_CLFF) { case FDDIFC_MAC: - ND_PRINT((ndo, "mac%1x ", fc & FDDIFC_ZZZZ)); + ND_PRINT("mac%1x ", fc & FDDIFC_ZZZZ); break; case FDDIFC_SMT: - ND_PRINT((ndo, "smt%1x ", fc & FDDIFC_ZZZZ)); + ND_PRINT("smt%1x ", fc & FDDIFC_ZZZZ); break; case FDDIFC_LLC_ASYNC: - ND_PRINT((ndo, "async%1x ", fc & FDDIFC_ZZZZ)); + ND_PRINT("async%1x ", fc & FDDIFC_ZZZZ); break; case FDDIFC_LLC_SYNC: - ND_PRINT((ndo, "sync%1x ", fc & FDDIFC_ZZZZ)); + ND_PRINT("sync%1x ", fc & FDDIFC_ZZZZ); break; case FDDIFC_IMP_ASYNC: - ND_PRINT((ndo, "imp_async%1x ", fc & FDDIFC_ZZZZ)); + ND_PRINT("imp_async%1x ", fc & FDDIFC_ZZZZ); break; case FDDIFC_IMP_SYNC: - ND_PRINT((ndo, "imp_sync%1x ", fc & FDDIFC_ZZZZ)); + ND_PRINT("imp_sync%1x ", fc & FDDIFC_ZZZZ); break; default: - ND_PRINT((ndo, "%02x ", fc)); + ND_PRINT("%02x ", fc); break; } } } /* Extract src, dst addresses */ -static inline void +static void extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst) { - register int i; + int i; if (fddi_bitswap) { /* @@ -249,54 +250,58 @@ extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst) /* * Print the FDDI MAC header */ -static inline void +static void fddi_hdr_print(netdissect_options *ndo, - register const struct fddi_header *fddip, register u_int length, - register const u_char *fsrc, register const u_char *fdst) + const struct fddi_header *fddip, u_int length, + const u_char *fsrc, const u_char *fdst) { const char *srcname, *dstname; - srcname = etheraddr_string(fsrc); - dstname = etheraddr_string(fdst); + srcname = etheraddr_string(ndo, fsrc); + dstname = etheraddr_string(ndo, fdst); - if (ndo->ndo_vflag) - ND_PRINT((ndo, "%02x %s %s %d: ", - fddip->fddi_fc, - srcname, dstname, - length)); - else if (ndo->ndo_qflag) - ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length)); - else { - print_fddi_fc(ndo, fddip->fddi_fc); - ND_PRINT((ndo, "%s %s %d: ", srcname, dstname, length)); - } + if (!ndo->ndo_qflag) + print_fddi_fc(ndo, EXTRACT_U_1(fddip->fddi_fc)); + ND_PRINT("%s > %s, length %u: ", + srcname, dstname, + length); } -static inline void +static void fddi_smt_print(netdissect_options *ndo, const u_char *p _U_, u_int length _U_) { - ND_PRINT((ndo, "")); + ND_PRINT(""); } -void +u_int fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) { const struct fddi_header *fddip = (const struct fddi_header *)p; - struct ether_header ehdr; - u_short extracted_ethertype; + uint8_t fc; + nd_mac_addr srcmac, dstmac; + struct lladdr_info src, dst; + int llc_hdrlen; + ndo->ndo_protocol = "fddi"; if (caplen < FDDI_HDRLEN) { - ND_PRINT((ndo, "[|fddi]")); - return; + nd_print_trunc(ndo); + return (caplen); } + fc = EXTRACT_U_1(fddip->fddi_fc); + /* * Get the FDDI addresses into a canonical form */ - extract_fddi_addrs(fddip, (char *)ESRC(&ehdr), (char *)EDST(&ehdr)); + extract_fddi_addrs(fddip, (char *)srcmac, (char *)dstmac); if (ndo->ndo_eflag) - fddi_hdr_print(ndo, fddip, length, ESRC(&ehdr), EDST(&ehdr)); + fddi_hdr_print(ndo, fddip, length, srcmac, dstmac); + + src.addr = srcmac; + src.addr_string = etheraddr_string; + dst.addr = dstmac; + dst.addr_string = etheraddr_string; /* Skip over FDDI MAC header */ length -= FDDI_HDRLEN; @@ -304,34 +309,31 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) caplen -= FDDI_HDRLEN; /* Frame Control field determines interpretation of packet */ - if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) { + if ((fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) { /* Try to print the LLC-layer header & higher layers */ - if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr), - &extracted_ethertype) == 0) { + llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst); + if (llc_hdrlen < 0) { /* * Some kinds of LLC packet we cannot * handle intelligently */ - if (!ndo->ndo_eflag) - fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN, - ESRC(&ehdr), EDST(&ehdr)); - if (extracted_ethertype) { - ND_PRINT((ndo, "(LLC %s) ", - etherproto_string(htons(extracted_ethertype)))); - } if (!ndo->ndo_suppress_default_print) - ndo->ndo_default_print(ndo, p, caplen); + ND_DEFAULTPRINT(p, caplen); + llc_hdrlen = -llc_hdrlen; } - } else if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_SMT) + } else if ((fc & FDDIFC_CLFF) == FDDIFC_SMT) { fddi_smt_print(ndo, p, caplen); - else { + llc_hdrlen = 0; + } else { /* Some kinds of FDDI packet we cannot handle intelligently */ if (!ndo->ndo_eflag) - fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN, ESRC(&ehdr), - EDST(&ehdr)); + fddi_hdr_print(ndo, fddip, length + FDDI_HDRLEN, srcmac, + dstmac); if (!ndo->ndo_suppress_default_print) - ndo->ndo_default_print(ndo, p, caplen); + ND_DEFAULTPRINT(p, caplen); + llc_hdrlen = 0; } + return (FDDI_HDRLEN + llc_hdrlen); } /* @@ -341,9 +343,8 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) * is the number of bytes actually captured. */ u_int -fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register const u_char *p) +fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - fddi_print(ndo, p, h->len, h->caplen); - - return (FDDI_HDRLEN); + ndo->ndo_protocol = "fddi_if"; + return (fddi_print(ndo, p, h->len, h->caplen)); }