X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/f555c163f90c9de17ebcef8313f86404c5174ca9..13ccad293fd49be3faa45bf31b587f7a3efbc77d:/print-ether.c diff --git a/print-ether.c b/print-ether.c index 5ec96024..0bcd82d5 100644 --- a/print-ether.c +++ b/print-ether.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 + * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -20,28 +20,21 @@ */ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.44 1999-10-07 23:47:11 mcr Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.66 2001-11-25 02:01:47 guy Exp $ (LBL)"; +#endif + +#ifdef HAVE_CONFIG_H +#include "config.h" #endif #include #include #include -#if __STDC__ struct mbuf; struct rtentry; -#endif -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include @@ -50,6 +43,8 @@ struct rtentry; #include "addrtoname.h" #include "ethertype.h" +#include "ether.h" + const u_char *packetp; const u_char *snapend; @@ -74,8 +69,8 @@ ether_print(register const u_char *bp, u_int length) /* * 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' + * to the ether header of the packet, 'h->tv' is the timestamp, + * 'h->length' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ void @@ -85,11 +80,12 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) u_int length = h->len; struct ether_header *ep; u_short ether_type; - extern u_short extracted_ethertype; + u_short extracted_ethertype; + ++infodelay; ts_print(&h->ts); - if (caplen < sizeof(struct ether_header)) { + if (caplen < ETHER_HDRLEN) { printf("[|ether]"); goto out; } @@ -105,10 +101,10 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) packetp = p; snapend = p + caplen; - length -= sizeof(struct ether_header); - caplen -= sizeof(struct ether_header); + length -= ETHER_HDRLEN; + caplen -= ETHER_HDRLEN; ep = (struct ether_header *)p; - p += sizeof(struct ether_header); + p += ETHER_HDRLEN; ether_type = ntohs(ep->ether_type); @@ -118,10 +114,11 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) extracted_ethertype = 0; if (ether_type <= ETHERMTU) { /* Try to print the LLC-layer header & higher layers */ - if (llc_print(p, length, caplen, ESRC(ep), EDST(ep)) == 0) { + if (llc_print(p, length, caplen, ESRC(ep), EDST(ep), + &extracted_ethertype) == 0) { /* ether_type not known, print raw packet */ if (!eflag) - ether_print((u_char *)ep, length); + ether_print((u_char *)ep, length + ETHER_HDRLEN); if (extracted_ethertype) { printf("(LLC %s) ", etherproto_string(htons(extracted_ethertype))); @@ -129,10 +126,11 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) if (!xflag && !qflag) default_print(p, caplen); } - } else if (ether_encap_print(ether_type, p, length, caplen) == 0) { + } else if (ether_encap_print(ether_type, p, length, caplen, + &extracted_ethertype) == 0) { /* ether_type not known, print raw packet */ if (!eflag) - ether_print((u_char *)ep, length + sizeof(*ep)); + ether_print((u_char *)ep, length + ETHER_HDRLEN); if (!xflag && !qflag) default_print(p, caplen); } @@ -140,6 +138,9 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) default_print(p, caplen); out: putchar('\n'); + --infodelay; + if (infoprint) + info(0); } /* @@ -148,17 +149,18 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) * * Returns non-zero if it can do so, zero if the ethertype is unknown. * - * Stuffs the ether type into a global for the benefit of lower layers - * that might want to know what it is. + * The Ethernet type code is passed through a pointer; if it was + * ETHERTYPE_8021Q, it gets updated to be the Ethernet type of + * the 802.1Q payload, for the benefit of lower layers that might + * want to know what it is. */ -u_short extracted_ethertype; - int ether_encap_print(u_short ethertype, const u_char *p, - u_int length, u_int caplen) + u_int length, u_int caplen, u_short *extracted_ethertype) { - extracted_ethertype = ethertype; + recurse: + *extracted_ethertype = ethertype; switch (ethertype) { @@ -166,6 +168,12 @@ ether_encap_print(u_short ethertype, const u_char *p, ip_print(p, length); return (1); +#ifdef INET6 + case ETHERTYPE_IPV6: + ip6_print(p, length); + return (1); +#endif /*INET6*/ + case ETHERTYPE_ARP: case ETHERTYPE_REVARP: arp_print(p, length, caplen); @@ -185,6 +193,57 @@ ether_encap_print(u_short ethertype, const u_char *p, aarp_print(p, length); return (1); + case ETHERTYPE_IPX: + printf("(NOV-ETHII) "); + ipx_print(p, length); + return (1); + + case ETHERTYPE_8021Q: + printf("802.1Q vlan#%d P%d%s ", + ntohs(*(u_int16_t *)p) & 0xfff, + ntohs(*(u_int16_t *)p) >> 13, + (ntohs(*(u_int16_t *)p) & 0x1000) ? " CFI" : ""); + ethertype = ntohs(*(u_int16_t *)(p + 2)); + p += 4; + length -= 4; + caplen -= 4; + if (ethertype > ETHERMTU) + goto recurse; + + *extracted_ethertype = 0; + + if (llc_print(p, length, caplen, p - 18, p - 12, + extracted_ethertype) == 0) { + /* ether_type not known, print raw packet */ + if (!eflag) + ether_print(p - 18, length + 4); + if (*extracted_ethertype) { + printf("(LLC %s) ", + etherproto_string(htons(*extracted_ethertype))); + } + if (!xflag && !qflag) + default_print(p - 18, caplen + 4); + } + return (1); + + case ETHERTYPE_PPPOED: + case ETHERTYPE_PPPOES: + pppoe_print(p, length); + return (1); + + case ETHERTYPE_PPP: + printf("ppp"); + if (length) { + printf(": "); + ppp_print(p, length); + } + return (1); + + case ETHERTYPE_MPLS: + case ETHERTYPE_MPLS_MULTI: + mpls_print(p, length); + return (1); + case ETHERTYPE_LAT: case ETHERTYPE_SCA: case ETHERTYPE_MOPRC: