/*
- * 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
*/
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.57 2000-10-07 05:46:21 itojun Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.68 2002-05-29 10:06:26 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
const u_char *snapend;
static inline void
-ether_print(register const u_char *bp, u_int length)
+ether_hdr_print(register const u_char *bp, u_int length)
{
register const struct ether_header *ep;
length);
}
-static u_short extracted_ethertype;
-
-/*
- * This is the top level routine of the printer. 'p' is the points
- * 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
-ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+ether_print(const u_char *p, u_int length, u_int caplen)
{
- u_int caplen = h->caplen;
- u_int length = h->len;
struct ether_header *ep;
u_short ether_type;
+ u_short extracted_ethertype;
- ts_print(&h->ts);
-
- if (caplen < sizeof(struct ether_header)) {
+ if (caplen < ETHER_HDRLEN) {
printf("[|ether]");
- goto out;
+ return;
}
if (eflag)
- ether_print(p, length);
+ ether_hdr_print(p, length);
/*
* Some printers want to get back at the ethernet addresses,
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);
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_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
if (extracted_ethertype) {
printf("(LLC %s) ",
etherproto_string(htons(extracted_ethertype)));
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_hdr_print((u_char *)ep, length + ETHER_HDRLEN);
if (!xflag && !qflag)
default_print(p, caplen);
}
- if (xflag)
- default_print(p, caplen);
- out:
+}
+
+/*
+ * This is the top level routine of the printer. 'p' is the points
+ * 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
+ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
+{
+ u_int caplen = h->caplen;
+ u_int length = h->len;
+
+ ++infodelay;
+ ts_print(&h->ts);
+
+ ether_print(p, length, caplen);
+
+ /*
+ * If "-x" was specified, print stuff past the Ethernet header,
+ * if there's anything to print.
+ */
+ if (xflag && caplen > ETHER_HDRLEN)
+ default_print(p + ETHER_HDRLEN, caplen - ETHER_HDRLEN);
+
putchar('\n');
+
+ --infodelay;
+ if (infoprint)
+ info(0);
}
/*
*
* 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.
*/
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)
{
recurse:
- extracted_ethertype = ethertype;
+ *extracted_ethertype = ethertype;
switch (ethertype) {
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",
+ 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" : "");
if (ethertype > ETHERMTU)
goto recurse;
- extracted_ethertype = 0;
+ *extracted_ethertype = 0;
- if (llc_print(p, length, caplen, p - 18, p - 12) == 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) {
+ ether_hdr_print(p - 18, length + 4);
+ if (*extracted_ethertype) {
printf("(LLC %s) ",
- etherproto_string(htons(extracted_ethertype)));
+ etherproto_string(htons(*extracted_ethertype)));
}
if (!xflag && !qflag)
default_print(p - 18, caplen + 4);
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:
projects / tcpdump / blobdiff