From Heinz-Ado Arnolds <[email protected]>: mark IPX packets

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index f3c7ae626f6bb26ae6d89387e514c92e433b0886..0bcd82d5f8ae77a1ddf154de3c7337c43bd137dc 100644 (file)
--- 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,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.55 2000-09-28 06:42:59 guy 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
@@ -35,15 +35,10 @@ struct mbuf;
 struct rtentry;
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <stdio.h>
 #include <pcap.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "ethertype.h"
@@ -72,8 +67,6 @@ ether_print(register const u_char *bp, u_int length)
                             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,
@@ -87,10 +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;
+       u_short extracted_ethertype;
 
+       ++infodelay;
        ts_print(&h->ts);
 
-       if (caplen < sizeof(struct ether_header)) {
+       if (caplen < ETHER_HDRLEN) {
                printf("[|ether]");
                goto out;
        }
@@ -106,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);
 
@@ -119,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)));
@@ -130,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);
        }
@@ -141,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);
 }
 
 /*
@@ -149,16 +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.
  */
 
 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) {
 
@@ -192,11 +194,12 @@ ether_encap_print(u_short ethertype, const u_char *p,
                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" : "");
@@ -207,15 +210,16 @@ ether_encap_print(u_short ethertype, const u_char *p,
                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) {
+                       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);
@@ -227,6 +231,19 @@ ether_encap_print(u_short ethertype, const u_char *p,
                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: