X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/cd8940439f5f6e18edcc153a07f9eb5bb6589e98..refs/heads/tcpdump-3.9:/print-arcnet.c diff --git a/print-arcnet.c b/print-arcnet.c index b5537509..48a43030 100644 --- a/print-arcnet.c +++ b/print-arcnet.c @@ -17,26 +17,19 @@ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - * + * * From: NetBSD: print-arcnet.c,v 1.2 2000/04/24 13:02:28 itojun Exp */ #ifndef lint -static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.3 2001-05-22 06:23:29 guy Exp $ (LBL)"; +static const char rcsid[] _U_ = + "@(#) $Header: /tcpdump/master/tcpdump/print-arcnet.c,v 1.20 2005-04-06 21:32:38 mcr Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include -#include -#include - -struct mbuf; -struct rtentry; - -#include +#include #include #include @@ -44,16 +37,10 @@ struct rtentry; #include "interface.h" #include "arcnet.h" -const u_char *packetp; -const u_char *snapend; - -int arcnet_encap_print(u_char arctype, const u_char *p, +static int arcnet_encap_print(u_char arctype, const u_char *p, u_int length, u_int caplen); -struct arctype_map { - const int arctype; - char * const name; -} arctypemap[] = { +struct tok arctypemap[] = { { ARCTYPE_IP_OLD, "oldip" }, { ARCTYPE_ARP_OLD, "oldarp" }, { ARCTYPE_IP, "ip" }, @@ -71,9 +58,7 @@ static inline void arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid) { const struct arc_header *ap; - struct arctype_map *atmp; - char *arctypename; - char typebuf[3]; + const char *arctypename; ap = (const struct arc_header *)bp; @@ -87,16 +72,7 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid) return; } - for (arctypename = NULL, atmp = arctypemap; atmp->arctype; atmp++) { - if (atmp->arctype == ap->arc_type) { - arctypename = atmp->name; - break; - } - } - if (!arctypename) { - arctypename = typebuf; - (void)snprintf(typebuf, sizeof(typebuf), "%02x", ap->arc_type); - } + arctypename = tok2str(arctypemap, "%02x", ap->arc_type); if (!phds) { (void)printf("%02x %02x %s %d: ", @@ -125,30 +101,28 @@ arcnet_print(const u_char *bp, u_int length, int phds, int flag, u_int seqid) } /* - * This is the top level routine of the printer. 'p' is the points - * to the ether header of the packet, 'tvp' is the timestamp, - * 'length' is the length of the packet off the wire, and 'caplen' + * This is the top level routine of the printer. 'p' points + * to the ARCNET 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. */ -void -arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) +u_int +arcnet_if_print(const struct pcap_pkthdr *h, const u_char *p) { u_int caplen = h->caplen; u_int length = h->len; - struct arc_header *ap; + const struct arc_header *ap; int phds, flag = 0, archdrlen = 0; u_int seqid = 0; u_char arc_type; - ts_print(&h->ts); - if (caplen < ARC_HDRLEN) { printf("[|arcnet]"); - goto out; + return (caplen); } - ap = (struct arc_header *)p; + ap = (const struct arc_header *)p; arc_type = ap->arc_type; switch (arc_type) { @@ -167,21 +141,21 @@ arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) if (caplen < ARC_HDRNEWLEN) { arcnet_print(p, length, 0, 0, 0); printf("[|phds]"); - goto out; + return (caplen); } if (ap->arc_flag == 0xff) { if (caplen < ARC_HDRNEWLEN_EXC) { arcnet_print(p, length, 0, 0, 0); printf("[|phds extended]"); - goto out; + return (caplen); } flag = ap->arc_flag2; - seqid = ap->arc_seqid2; + seqid = ntohs(ap->arc_seqid2); archdrlen = ARC_HDRNEWLEN_EXC; } else { flag = ap->arc_flag; - seqid = ap->arc_seqid; + seqid = ntohs(ap->arc_seqid); archdrlen = ARC_HDRNEWLEN; } } @@ -191,31 +165,82 @@ arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) arcnet_print(p, length, phds, flag, seqid); /* - * 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. + * Go past the ARCNET header. */ - packetp = p; - snapend = p + caplen; - length -= archdrlen; caplen -= archdrlen; p += archdrlen; - if (phds && flag && (flag & 1) == 0) - goto out2; + if (phds && flag && (flag & 1) == 0) { + /* + * This is a middle fragment. + */ + return (archdrlen); + } - if (!arcnet_encap_print(arc_type, p, length, caplen)) { + if (!arcnet_encap_print(arc_type, p, length, caplen)) default_print(p, caplen); - goto out; + + return (archdrlen); +} + +/* + * This is the top level routine of the printer. 'p' points + * to the ARCNET 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. It is quite similar + * to the non-Linux style printer except that Linux doesn't ever + * supply packets that look like exception frames, it always supplies + * reassembled packets rather than raw frames, and headers have an + * extra "offset" field between the src/dest and packet type. + */ +u_int +arcnet_linux_if_print(const struct pcap_pkthdr *h, const u_char *p) +{ + u_int caplen = h->caplen; + u_int length = h->len; + const struct arc_linux_header *ap; + + int archdrlen = 0; + u_char arc_type; + + if (caplen < ARC_LINUX_HDRLEN) { + printf("[|arcnet]"); + return (caplen); } - out2: - if (xflag) + ap = (const struct arc_linux_header *)p; + arc_type = ap->arc_type; + + switch (arc_type) { + default: + archdrlen = ARC_LINUX_HDRNEWLEN; + if (caplen < ARC_LINUX_HDRNEWLEN) { + printf("[|arcnet]"); + return (caplen); + } + break; + case ARCTYPE_IP_OLD: + case ARCTYPE_ARP_OLD: + case ARCTYPE_DIAGNOSE: + archdrlen = ARC_LINUX_HDRLEN; + break; + } + + if (eflag) + arcnet_print(p, length, 0, 0, 0); + + /* + * Go past the ARCNET header. + */ + length -= archdrlen; + caplen -= archdrlen; + p += archdrlen; + + if (!arcnet_encap_print(arc_type, p, length, caplen)) default_print(p, caplen); - out: - putchar('\n'); + return (archdrlen); } /* @@ -226,7 +251,7 @@ arcnet_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) */ -int +static int arcnet_encap_print(u_char arctype, const u_char *p, u_int length, u_int caplen) { @@ -234,7 +259,7 @@ arcnet_encap_print(u_char arctype, const u_char *p, case ARCTYPE_IP_OLD: case ARCTYPE_IP: - ip_print(p, length); + ip_print(gndo, p, length); return (1); #ifdef INET6 @@ -246,7 +271,7 @@ arcnet_encap_print(u_char arctype, const u_char *p, case ARCTYPE_ARP_OLD: case ARCTYPE_ARP: case ARCTYPE_REVARP: - arp_print(p, length, caplen); + arp_print(gndo, p, length, caplen); return (1); case ARCTYPE_ATALK: /* XXX was this ever used? */ @@ -255,7 +280,18 @@ arcnet_encap_print(u_char arctype, const u_char *p, atalk_print(p, length); return (1); + case ARCTYPE_IPX: + ipx_print(p, length); + return (1); + default: return (0); } } + +/* + * Local Variables: + * c-style: bsd + * End: + */ +