Allow tcpdump to work with earlier libpcaps.

[tcpdump] / print-ether.c

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

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ether.c,v 1.48 1999-11-21 09:36:51 fenner 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
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -31,32 +31,20 @@ static const char rcsid[] =
 #include <sys/time.h>
 #include <sys/socket.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;
 


@@ -97,7 +85,7 @@ ether_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p)
 
        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;
        }


@@ -113,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);
 


@@ -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)
        } 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);
        }


@@ -198,30 +186,34 @@ 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:
        case ETHERTYPE_8021Q:

-               printf("802.1Q vlan#%d P%d%s",
-                      ntohs(*(unsigned short*)p)&0xFFF,
-                      ntohs(*(unsigned short*)p)>>13,
-                      (ntohs(*(unsigned short*)p)&0x1000) ? " CFI" : "");
-               ethertype = ntohs(*(unsigned short*)(p+2));
+               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;
                p += 4;
                length -= 4;
                caplen -= 4;

-               if (ethertype > ETHERMTU) 
+               if (ethertype > ETHERMTU)

                        goto recurse;
 
                extracted_ethertype = 0;
 
                        goto recurse;
 
                extracted_ethertype = 0;
 

-               if (llc_print(p, length, caplen, p-18, p-12) == 0) {
+               if (llc_print(p, length, caplen, p - 18, p - 12) == 0) {

                        /* ether_type not known, print raw packet */
                        if (!eflag)
                        /* ether_type not known, print raw packet */
                        if (!eflag)

-                               ether_print(p-18, length+4);
+                               ether_print(p - 18, length + 4);

                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }
                        if (!xflag && !qflag)
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
                               etherproto_string(htons(extracted_ethertype)));
                        }
                        if (!xflag && !qflag)

-                               default_print(p-18, caplen+4);
+                               default_print(p - 18, caplen + 4);

                }
                return (1);
 
                }
                return (1);