Allow tcpdump to work with earlier libpcaps.

[tcpdump] / print-ether.c

diff --git a/print-ether.c b/print-ether.c
index bd2a7b7b48964a1b0163006a1e3221a91756ea07..167c53e21337a70c3ff092d445ac9e7dfc720e38 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.50 2000-06-10 13:49:52 assar 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
@@ -31,32 +31,20 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.h>
 
-#if __STDC__
 struct mbuf;
 struct rtentry;
-#endif
-#include <net/if.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>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#include "ether.h"
+
 const u_char *packetp;
 const u_char *snapend;
 
@@ -97,7 +85,7 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 
        ts_print(&h->ts);
 
-       if (caplen < sizeof(struct ether_header)) {
+       if (caplen < ETHER_HDRLEN) {
                printf("[|ether]");
                goto out;
        }
@@ -113,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);
 
@@ -140,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)
-                       ether_print((u_char *)ep, length + sizeof(*ep));
+                       ether_print((u_char *)ep, length + ETHER_HDRLEN);
                if (!xflag && !qflag)
                        default_print(p, caplen);
        }
@@ -203,7 +191,7 @@ ether_encap_print(u_short ethertype, const u_char *p,
                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" : "");