X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/277dc1f0ec49d70f1c3df447eb469b754470e418..4c2790a43252b9cac1fe7f6b50b51c3c55d2370a:/print-token.c diff --git a/print-token.c b/print-token.c index cf627b1b..4f8422b5 100644 --- a/print-token.c +++ b/print-token.c @@ -24,52 +24,44 @@ * Guy Harris */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.1 2000-07-25 05:28:11 guy Exp $"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-token.c,v 1.27 2005-11-13 12:12:43 guy Exp $"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include - -struct mbuf; -struct rtentry; -#include - -#include -#include -#include -#include +#include #include #include +#include #include "interface.h" +#include "extract.h" #include "addrtoname.h" #include "ethertype.h" +#include "ether.h" #include "token.h" /* Extract src, dst addresses */ static inline void extract_token_addrs(const struct token_header *trp, char *fsrc, char *fdst) { - memcpy(fdst, (char *)trp->token_dhost, 6); - memcpy(fsrc, (char *)trp->token_shost, 6); + memcpy(fdst, (const char *)trp->token_dhost, 6); + memcpy(fsrc, (const char *)trp->token_shost, 6); } /* * Print the TR MAC header */ static inline void -token_print(register const struct token_header *trp, register u_int length, +token_hdr_print(register const struct token_header *trp, register u_int length, register const u_char *fsrc, register const u_char *fdst) { - char *srcname, *dstname; + const char *srcname, *dstname; srcname = etheraddr_string(fsrc); dstname = etheraddr_string(fdst); @@ -84,18 +76,18 @@ token_print(register const struct token_header *trp, register u_int length, printf("%s %s %d: ", srcname, dstname, length); } -static char *broadcast_indicator[] = { +static const char *broadcast_indicator[] = { "Non-Broadcast", "Non-Broadcast", "Non-Broadcast", "Non-Broadcast", "All-routes", "All-routes", "Single-route", "Single-route" }; -static char *direction[] = { +static const char *direction[] = { "Forward", "Backward" }; -static char *largest_frame[] = { +static const char *largest_frame[] = { "516", "1500", "2052", @@ -106,48 +98,26 @@ static char *largest_frame[] = { "??" }; -/* - * This is the top level routine of the printer. 'p' is the points - * to the TR header of the packet, 'tvp' is the timestamp, - * 'length' is the length of the packet off the wire, and 'caplen' - * is the number of bytes actually captured. - */ -void -token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) +u_int +token_print(const u_char *p, u_int length, u_int caplen) { - u_int caplen = h->caplen; - u_int length = h->len; - struct token_header *trp; - u_short ether_type; + const struct token_header *trp; u_short extracted_ethertype; struct ether_header ehdr; - u_int route_len = 0, seg; - - trp = (struct token_header *)p; + u_int route_len = 0, hdr_len = TOKEN_HDRLEN; + int seg; - ts_print(&h->ts); + trp = (const struct token_header *)p; if (caplen < TOKEN_HDRLEN) { printf("[|token-ring]"); - goto out; + return hdr_len; } + /* * Get the TR addresses into a canonical form */ extract_token_addrs(trp, (char*)ESRC(&ehdr), (char*)EDST(&ehdr)); - /* - * Some printers want to get back at the ethernet addresses, - * and/or check that they're not walking off the end of the packet. - * Rather than pass them all the way down, we set these globals. - */ - snapend = p + caplen; - /* - * Actually, the only printer that uses packetp is print-bootp.c, - * and it assumes that packetp points to an Ethernet header. The - * right thing to do is to fix print-bootp.c to know which link - * type is in use when it excavates. XXX - */ - packetp = (u_char *)&ehdr; /* Adjust for source routing information in the MAC header */ if (IS_SOURCE_ROUTED(trp)) { @@ -155,60 +125,79 @@ token_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) *ESRC(&ehdr) &= 0x7f; if (eflag) - token_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); + token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); + if (caplen < TOKEN_HDRLEN + 2) { + printf("[|token-ring]"); + return hdr_len; + } route_len = RIF_LENGTH(trp); + hdr_len += route_len; + if (caplen < hdr_len) { + printf("[|token-ring]"); + return hdr_len; + } if (vflag) { printf("%s ", broadcast_indicator[BROADCAST(trp)]); printf("%s", direction[DIRECTION(trp)]); - + for (seg = 0; seg < SEGMENT_COUNT(trp); seg++) printf(" [%d:%d]", RING_NUMBER(trp, seg), BRIDGE_NUMBER(trp, seg)); } else { - printf("rt = %x", ntohs(trp->token_rcf)); - + printf("rt = %x", EXTRACT_16BITS(&trp->token_rcf)); + for (seg = 0; seg < SEGMENT_COUNT(trp); seg++) - printf(":%x", ntohs(trp->token_rseg[seg])); + printf(":%x", EXTRACT_16BITS(&trp->token_rseg[seg])); } printf(" (%s) ", largest_frame[LARGEST_FRAME(trp)]); } else { if (eflag) - token_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); + token_hdr_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); } /* Skip over token ring MAC header and routing information */ - length -= TOKEN_HDRLEN + route_len; - p += TOKEN_HDRLEN + route_len; - caplen -= TOKEN_HDRLEN + route_len; + length -= hdr_len; + p += hdr_len; + caplen -= hdr_len; /* Frame Control field determines interpretation of packet */ - extracted_ethertype = 0; 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)) - == 0) { + if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr), + &extracted_ethertype) == 0) { /* ether_type not known, print raw packet */ if (!eflag) - token_print(trp, length, + 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 (!xflag && !qflag) + if (!suppress_default_print) default_print(p, caplen); } } else { /* Some kinds of TR packet we cannot handle intelligently */ /* XXX - dissect MAC packets if frame type is 0 */ if (!eflag) - token_print(trp, length, ESRC(&ehdr), EDST(&ehdr)); - if (!xflag && !qflag) + token_hdr_print(trp, length + TOKEN_HDRLEN + route_len, + ESRC(&ehdr), EDST(&ehdr)); + if (!suppress_default_print) default_print(p, caplen); } - if (xflag) - default_print(p, caplen); -out: - putchar('\n'); + return (hdr_len); +} + +/* + * This is the top level routine of the printer. 'p' points + * to the TR header of the packet, 'h->ts' is the timestamp, + * 'h->len' is the length of the packet off the wire, and 'h->caplen' + * is the number of bytes actually captured. + */ +u_int +token_if_print(const struct pcap_pkthdr *h, const u_char *p) +{ + return (token_print(p, h->len, h->caplen)); }