X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/933dc24d09c8f7cc6a91d31037acec5dd7d5e1c1..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-token.c diff --git a/print-token.c b/print-token.c index 6bf2b23d..ff2a3841 100644 --- a/print-token.c +++ b/print-token.c @@ -24,18 +24,19 @@ * Guy Harris */ +/* \summary: Token Ring printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include -#include "interface.h" +#include "netdissect.h" #include "extract.h" #include "addrtoname.h" -#include "ether.h" /* * Copyright (c) 1998, Larry Lile @@ -66,27 +67,26 @@ */ #define TOKEN_HDRLEN 14 -#define TOKEN_RING_MAC_LEN 6 #define ROUTING_SEGMENT_MAX 16 #define IS_SOURCE_ROUTED(trp) ((trp)->token_shost[0] & 0x80) -#define FRAME_TYPE(trp) (((trp)->token_fc & 0xC0) >> 6) +#define FRAME_TYPE(trp) ((EXTRACT_U_1((trp)->token_fc) & 0xC0) >> 6) #define TOKEN_FC_LLC 1 -#define BROADCAST(trp) ((EXTRACT_16BITS(&(trp)->token_rcf) & 0xE000) >> 13) -#define RIF_LENGTH(trp) ((EXTRACT_16BITS(&(trp)->token_rcf) & 0x1f00) >> 8) -#define DIRECTION(trp) ((EXTRACT_16BITS(&(trp)->token_rcf) & 0x0080) >> 7) -#define LARGEST_FRAME(trp) ((EXTRACT_16BITS(&(trp)->token_rcf) & 0x0070) >> 4) -#define RING_NUMBER(trp, x) ((EXTRACT_16BITS(&(trp)->token_rseg[x]) & 0xfff0) >> 4) -#define BRIDGE_NUMBER(trp, x) ((EXTRACT_16BITS(&(trp)->token_rseg[x]) & 0x000f)) +#define BROADCAST(trp) ((EXTRACT_BE_U_2((trp)->token_rcf) & 0xE000) >> 13) +#define RIF_LENGTH(trp) ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x1f00) >> 8) +#define DIRECTION(trp) ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0080) >> 7) +#define LARGEST_FRAME(trp) ((EXTRACT_BE_U_2((trp)->token_rcf) & 0x0070) >> 4) +#define RING_NUMBER(trp, x) ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0xfff0) >> 4) +#define BRIDGE_NUMBER(trp, x) ((EXTRACT_BE_U_2((trp)->token_rseg[x]) & 0x000f)) #define SEGMENT_COUNT(trp) ((int)((RIF_LENGTH(trp) - 2) / 2)) struct token_header { - 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]; + nd_uint8_t token_ac; + nd_uint8_t token_fc; + nd_mac_addr token_dhost; + nd_mac_addr token_shost; + nd_uint16_t token_rcf; + nd_uint16_t token_rseg[ROUTING_SEGMENT_MAX]; }; static const char tstr[] = "[|token-ring]"; @@ -104,8 +104,8 @@ extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst) */ static inline void 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 struct token_header *trp, u_int length, + const u_char *fsrc, const u_char *fdst) { const char *srcname, *dstname; @@ -114,8 +114,8 @@ token_hdr_print(netdissect_options *ndo, if (!ndo->ndo_qflag) ND_PRINT((ndo, "%02x %02x ", - trp->token_ac, - trp->token_fc)); + EXTRACT_U_1(trp->token_ac), + EXTRACT_U_1(trp->token_fc))); ND_PRINT((ndo, "%s > %s, length %u: ", srcname, dstname, length)); @@ -148,7 +148,8 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen { const struct token_header *trp; int llc_hdrlen; - struct ether_header ehdr; + nd_mac_addr srcmac, dstmac; + struct lladdr_info src, dst; u_int route_len = 0, hdr_len = TOKEN_HDRLEN; int seg; @@ -162,15 +163,15 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen /* * Get the TR addresses into a canonical form */ - extract_token_addrs(trp, (char*)ESRC(&ehdr), (char*)EDST(&ehdr)); + extract_token_addrs(trp, (char*)srcmac, (char*)dstmac); /* Adjust for source routing information in the MAC header */ if (IS_SOURCE_ROUTED(trp)) { /* Clear source-routed bit */ - *ESRC(&ehdr) &= 0x7f; + srcmac[0] &= 0x7f; if (ndo->ndo_eflag) - token_hdr_print(ndo, trp, length, ESRC(&ehdr), EDST(&ehdr)); + token_hdr_print(ndo, trp, length, srcmac, dstmac); if (caplen < TOKEN_HDRLEN + 2) { ND_PRINT((ndo, "%s", tstr)); @@ -190,17 +191,22 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen ND_PRINT((ndo, " [%d:%d]", RING_NUMBER(trp, seg), BRIDGE_NUMBER(trp, seg))); } else { - ND_PRINT((ndo, "rt = %x", EXTRACT_16BITS(&trp->token_rcf))); + ND_PRINT((ndo, "rt = %x", EXTRACT_BE_U_2(trp->token_rcf))); for (seg = 0; seg < SEGMENT_COUNT(trp); seg++) - ND_PRINT((ndo, ":%x", EXTRACT_16BITS(&trp->token_rseg[seg]))); + ND_PRINT((ndo, ":%x", EXTRACT_BE_U_2(trp->token_rseg[seg]))); } ND_PRINT((ndo, " (%s) ", largest_frame[LARGEST_FRAME(trp)])); } else { if (ndo->ndo_eflag) - token_hdr_print(ndo, trp, length, ESRC(&ehdr), EDST(&ehdr)); + token_hdr_print(ndo, trp, length, srcmac, dstmac); } + src.addr = srcmac; + src.addr_string = etheraddr_string; + dst.addr = dstmac; + dst.addr_string = etheraddr_string; + /* Skip over token ring MAC header and routing information */ length -= hdr_len; p += hdr_len; @@ -209,8 +215,7 @@ token_print(netdissect_options *ndo, 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 */ - llc_hdrlen = llc_print(ndo, p, length, caplen, ESRC(&ehdr), - EDST(&ehdr)); + llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst); if (llc_hdrlen < 0) { /* packet type not known, print raw packet */ if (!ndo->ndo_suppress_default_print) @@ -223,7 +228,7 @@ token_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen /* XXX - dissect MAC packets if frame type is 0 */ if (!ndo->ndo_eflag) token_hdr_print(ndo, trp, length + TOKEN_HDRLEN + route_len, - ESRC(&ehdr), EDST(&ehdr)); + srcmac, dstmac); if (!ndo->ndo_suppress_default_print) ND_DEFAULTPRINT(p, caplen); }