X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/88e479b75ea97730bf265a2371c0658a401eae92..refs/pull/494/head:/print-token.c diff --git a/print-token.c b/print-token.c index 50eb6c0f..6f9950db 100644 --- a/print-token.c +++ b/print-token.c @@ -28,16 +28,13 @@ #include "config.h" #endif -#include +#include -#include #include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" -#include "ethertype.h" - #include "ether.h" /* @@ -84,12 +81,12 @@ #define SEGMENT_COUNT(trp) ((int)((RIF_LENGTH(trp) - 2) / 2)) struct token_header { - u_int8_t token_ac; - u_int8_t token_fc; - u_int8_t token_dhost[TOKEN_RING_MAC_LEN]; - u_int8_t token_shost[TOKEN_RING_MAC_LEN]; - u_int16_t token_rcf; - u_int16_t token_rseg[ROUTING_SEGMENT_MAX]; + uint8_t token_ac; + uint8_t token_fc; + uint8_t token_dhost[TOKEN_RING_MAC_LEN]; + uint8_t token_shost[TOKEN_RING_MAC_LEN]; + uint16_t token_rcf; + uint16_t token_rseg[ROUTING_SEGMENT_MAX]; }; static const char tstr[] = "[|token-ring]"; @@ -106,22 +103,22 @@ extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst) * Print the TR MAC header */ static inline void -token_hdr_print(register const struct token_header *trp, register u_int length, - register const u_char *fsrc, register const u_char *fdst) +token_hdr_print(netdissect_options *ndo, + register const struct token_header *trp, register u_int length, + register const u_char *fsrc, register 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 (vflag) - (void) printf("%02x %02x %s %s %d: ", + if (!ndo->ndo_qflag) + ND_PRINT((ndo, "%02x %02x ", trp->token_ac, - trp->token_fc, - srcname, dstname, - length); - else - printf("%s %s %d: ", srcname, dstname, length); + trp->token_fc)); + ND_PRINT((ndo, "%s > %s, length %u: ", + srcname, dstname, + length)); } static const char *broadcast_indicator[] = { @@ -147,10 +144,10 @@ static const char *largest_frame[] = { }; u_int -token_print(const u_char *p, u_int length, u_int caplen) +token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen) { const struct token_header *trp; - u_short extracted_ethertype; + int llc_hdrlen; struct ether_header ehdr; u_int route_len = 0, hdr_len = TOKEN_HDRLEN; int seg; @@ -158,7 +155,7 @@ token_print(const u_char *p, u_int length, u_int caplen) trp = (const struct token_header *)p; if (caplen < TOKEN_HDRLEN) { - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); return hdr_len; } @@ -172,36 +169,36 @@ token_print(const u_char *p, u_int length, u_int caplen) /* Clear source-routed bit */ *ESRC(&ehdr) &= 0x7f; - if (eflag) - token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); + if (ndo->ndo_eflag) + token_hdr_print(ndo, trp, length, ESRC(&ehdr), EDST(&ehdr)); if (caplen < TOKEN_HDRLEN + 2) { - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); return hdr_len; } route_len = RIF_LENGTH(trp); hdr_len += route_len; if (caplen < hdr_len) { - printf("%s", tstr); + ND_PRINT((ndo, "%s", tstr)); return hdr_len; } - if (vflag) { - printf("%s ", broadcast_indicator[BROADCAST(trp)]); - printf("%s", direction[DIRECTION(trp)]); + if (ndo->ndo_vflag) { + ND_PRINT((ndo, "%s ", broadcast_indicator[BROADCAST(trp)])); + ND_PRINT((ndo, "%s", direction[DIRECTION(trp)])); for (seg = 0; seg < SEGMENT_COUNT(trp); seg++) - printf(" [%d:%d]", RING_NUMBER(trp, seg), - BRIDGE_NUMBER(trp, seg)); + ND_PRINT((ndo, " [%d:%d]", RING_NUMBER(trp, seg), + BRIDGE_NUMBER(trp, seg))); } else { - printf("rt = %x", EXTRACT_16BITS(&trp->token_rcf)); + ND_PRINT((ndo, "rt = %x", EXTRACT_16BITS(&trp->token_rcf))); for (seg = 0; seg < SEGMENT_COUNT(trp); seg++) - printf(":%x", EXTRACT_16BITS(&trp->token_rseg[seg])); + ND_PRINT((ndo, ":%x", EXTRACT_16BITS(&trp->token_rseg[seg]))); } - printf(" (%s) ", largest_frame[LARGEST_FRAME(trp)]); + ND_PRINT((ndo, " (%s) ", largest_frame[LARGEST_FRAME(trp)])); } else { - if (eflag) - token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); + if (ndo->ndo_eflag) + token_hdr_print(ndo, trp, length, ESRC(&ehdr), EDST(&ehdr)); } /* Skip over token ring MAC header and routing information */ @@ -212,28 +209,23 @@ token_print(const u_char *p, u_int length, u_int caplen) /* Frame Control field determines interpretation of packet */ if (FRAME_TYPE(trp) == TOKEN_FC_LLC) { /* Try to print the LLC-layer header & higher layers */ - if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr), - &extracted_ethertype) == 0) { - /* ether_type not known, print raw packet */ - if (!eflag) - token_hdr_print(trp, - length + TOKEN_HDRLEN + route_len, - ESRC(&ehdr), EDST(&ehdr)); - if (extracted_ethertype) { - printf("(LLC %s) ", - etherproto_string(htons(extracted_ethertype))); - } - if (!suppress_default_print) - default_print(p, caplen); + llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(&ehdr), + EDST(&ehdr)); + 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; } + hdr_len += llc_hdrlen; } else { /* Some kinds of TR packet we cannot handle intelligently */ /* XXX - dissect MAC packets if frame type is 0 */ - if (!eflag) - token_hdr_print(trp, length + TOKEN_HDRLEN + route_len, + if (!ndo->ndo_eflag) + token_hdr_print(ndo, trp, length + TOKEN_HDRLEN + route_len, ESRC(&ehdr), EDST(&ehdr)); - if (!suppress_default_print) - default_print(p, caplen); + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, caplen); } return (hdr_len); } @@ -245,7 +237,7 @@ token_print(const u_char *p, u_int length, u_int caplen) * is the number of bytes actually captured. */ u_int -token_if_print(const struct pcap_pkthdr *h, const u_char *p) +token_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { - return (token_print(p, h->len, h->caplen)); + return (token_print(ndo, p, h->len, h->caplen)); }