Allow tcpdump to work with earlier libpcaps.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index 4ce1e736355a40e5d8285459f408c38bb78232e6..167c53e21337a70c3ff092d445ac9e7dfc720e38 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,39 +20,31 @@
  */
 #ifndef lint
 static const char rcsid[] =
  */
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.46 1999-10-30 05:11:13 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.59 2000-10-22 04:17:53 guy Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"

 #endif
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 
 #endif
 
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 

-#if __STDC__

 struct mbuf;
 struct rtentry;
 struct mbuf;
 struct rtentry;

-#endif
-#include <net/if.h>

 
 #include <netinet/in.h>
 
 #include <netinet/in.h>

-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>

 
 #include <stdio.h>
 #include <pcap.h>
 
 
 #include <stdio.h>
 #include <pcap.h>
 

-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-

 #include "interface.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 
 #include "interface.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 

+#include "ether.h"
+

 const u_char *packetp;
 const u_char *snapend;
 
 const u_char *packetp;
 const u_char *snapend;
 


@@ -75,10 +67,12 @@ ether_print(register const u_char *bp, u_int length)
                             length);
 }
 
                             length);
 }
 

+static u_short extracted_ethertype;
+

 /*
  * This is the top level routine of the printer.  'p' is the points
 /*
  * 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
  * is the number of bytes actually captured.
  */
 void


@@ -88,11 +82,10 @@ 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_int length = h->len;
        struct ether_header *ep;
        u_short ether_type;

-       extern u_short extracted_ethertype;

 
        ts_print(&h->ts);
 
 
        ts_print(&h->ts);
 

-       if (caplen < sizeof(struct ether_header)) {
+       if (caplen < ETHER_HDRLEN) {

                printf("[|ether]");
                goto out;
        }
                printf("[|ether]");
                goto out;
        }


@@ -108,10 +101,10 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        packetp = p;
        snapend = p + caplen;
 
        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;
        ep = (struct ether_header *)p;

-       p += sizeof(struct ether_header);
+       p += ETHER_HDRLEN;

 
        ether_type = ntohs(ep->ether_type);
 
 
        ether_type = ntohs(ep->ether_type);
 


@@ -135,7 +128,7 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
        } else if (ether_encap_print(ether_type, p, length, caplen) == 0) {
                /* ether_type not known, print raw packet */
                if (!eflag)
        } else if (ether_encap_print(ether_type, p, length, caplen) == 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);
        }
                if (!xflag && !qflag)
                        default_print(p, caplen);
        }


@@ -155,12 +148,11 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
  * that might want to know what it is.
  */
 
  * 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)
 {
 int
 ether_encap_print(u_short ethertype, const u_char *p,
     u_int length, u_int caplen)
 {

+ recurse:

        extracted_ethertype = ethertype;
 
        switch (ethertype) {
        extracted_ethertype = ethertype;
 
        switch (ethertype) {


@@ -194,6 +186,42 @@ ether_encap_print(u_short ethertype, const u_char *p,
                aarp_print(p, length);
                return (1);
 
                aarp_print(p, length);
                return (1);
 

+       case ETHERTYPE_IPX:
+               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) == 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_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC:
        case ETHERTYPE_LAT:
        case ETHERTYPE_SCA:
        case ETHERTYPE_MOPRC: