There's no link-layer header on Linux ARPHRD_ATM packets; there's

[tcpdump] / print-fddi.c

diff --git a/print-fddi.c b/print-fddi.c
index bd4bd4f9e9f5e082f208b9ba5a9053889c821cd9..c1e3e2085a59780d155659da2335364a5ffec6b3 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.41 2000-07-01 03:39:02 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-fddi.c,v 1.52 2001-09-18 15:46:36 fenner Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,14 +34,7 @@ static const char rcsid[] =
 #include <sys/file.h>
 #include <sys/ioctl.h>
 
-struct mbuf;
-struct rtentry;
-#include <net/if.h>
-
 #include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #include <ctype.h>
 #include <netdb.h>
@@ -53,6 +46,7 @@ struct rtentry;
 #include "addrtoname.h"
 #include "ethertype.h"
 
+#include "ether.h"
 #include "fddi.h"
 
 /*
@@ -94,8 +88,6 @@ int   fddi_bitswap = 1;
  *  - vj
  */
 
-#define FDDI_HDRLEN (sizeof(struct fddi_header))
-
 static u_char fddi_bit_swap[] = {
        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
@@ -218,8 +210,8 @@ extract_fddi_addrs(const struct fddi_header *fddip, char *fsrc, char *fdst)
                        fsrc[i] = fddi_bit_swap[fddip->fddi_shost[i]];
        }
        else {
-               memcpy(fdst, (char *)fddip->fddi_dhost, 6);
-               memcpy(fsrc, (char *)fddip->fddi_shost, 6);
+               memcpy(fdst, (const char *)fddip->fddi_dhost, 6);
+               memcpy(fsrc, (const char *)fddip->fddi_shost, 6);
        }
 }
 
@@ -230,7 +222,7 @@ static inline void
 fddi_print(register const struct fddi_header *fddip, register u_int length,
           register const u_char *fsrc, register const u_char *fdst)
 {
-       char *srcname, *dstname;
+       const char *srcname, *dstname;
 
        srcname = etheraddr_string(fsrc);
        dstname = etheraddr_string(fdst);
@@ -266,10 +258,11 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
-       const struct fddi_header *fddip = (struct fddi_header *)p;
+       const struct fddi_header *fddip = (const struct fddi_header *)p;
        struct ether_header ehdr;
        u_short extracted_ethertype;
 
+       ++infodelay;
        ts_print(&h->ts);
 
        if (caplen < FDDI_HDRLEN) {
@@ -287,10 +280,10 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
         */
        snapend = p + caplen;
        /*
-        * Actually, the only printer that uses packetp is print-bootp.c,
-        * and it assumes that packetp points to an Ethernet header.  The
-        * right thing to do is to fix print-bootp.c to know which link
-        * type is in use when it excavates. XXX
+        * Actually, the only printers that use packetp are print-arp.c
+        * and print-bootp.c, and they assume that packetp points to an
+        * Ethernet header.  The right thing to do is to fix them to know
+        * which link type is in use when they excavate. XXX
         */
        packetp = (u_char *)&ehdr;
 
@@ -306,14 +299,14 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
        extracted_ethertype = 0;
        if ((fddip->fddi_fc & FDDIFC_CLFF) == FDDIFC_LLC_ASYNC) {
                /* Try to print the LLC-layer header & higher layers */
-               if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr))
-                   == 0) {
+               if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
+                   &extracted_ethertype) == 0) {
                        /*
                         * Some kinds of LLC packet we cannot
                         * handle intelligently
                         */
                        if (!eflag)
-                               fddi_print(fddip, length,
+                               fddi_print(fddip, length + FDDI_HDRLEN,
                                    ESRC(&ehdr), EDST(&ehdr));
                        if (extracted_ethertype) {
                                printf("(LLC %s) ",
@@ -327,7 +320,8 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
        else {
                /* Some kinds of FDDI packet we cannot handle intelligently */
                if (!eflag)
-                       fddi_print(fddip, length, ESRC(&ehdr), EDST(&ehdr));
+                       fddi_print(fddip, length + FDDI_HDRLEN, ESRC(&ehdr),
+                           EDST(&ehdr));
                if (!xflag && !qflag)
                        default_print(p, caplen);
        }
@@ -335,4 +329,7 @@ fddi_if_print(u_char *pcap, const struct pcap_pkthdr *h,
                default_print(p, caplen);
 out:
        putchar('\n');
+       --infodelay;
+       if (infoprint)
+               info(0);
 }