Update from current NetBSD version of ieee80211_radiotap.h.

[tcpdump] / print-ipfc.c

diff --git a/print-ipfc.c b/print-ipfc.c
index 7c527e376c615820f439f9282632827414a10afc..7e1e8d8102dc585782b3e6c05faf7379f4d4c903 100644 (file)
--- a/print-ipfc.c
+++ b/print-ipfc.c
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.4 2002-12-19 09:39:13 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipfc.c,v 1.7.2.2 2005-11-13 12:12:59 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -101,8 +101,6 @@ ipfc_print(const u_char *p, u_int length, u_int caplen)
        p += IPFC_HDRLEN;
        caplen -= IPFC_HDRLEN;
 
        p += IPFC_HDRLEN;
        caplen -= IPFC_HDRLEN;
 

-       /* Frame Control field determines interpretation of packet */
-       extracted_ethertype = 0;

        /* Try to print the LLC-layer header & higher layers */
        if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
            &extracted_ethertype) == 0) {
        /* Try to print the LLC-layer header & higher layers */
        if (llc_print(p, length, caplen, ESRC(&ehdr), EDST(&ehdr),
            &extracted_ethertype) == 0) {


@@ -117,7 +115,7 @@ ipfc_print(const u_char *p, u_int length, u_int caplen)
                        printf("(LLC %s) ",
                etherproto_string(htons(extracted_ethertype)));
                }
                        printf("(LLC %s) ",
                etherproto_string(htons(extracted_ethertype)));
                }

-               if (!xflag && !qflag)
+               if (!suppress_default_print)

                        default_print(p, caplen);
        }
 }
                        default_print(p, caplen);
        }
 }


@@ -125,7 +123,7 @@ ipfc_print(const u_char *p, u_int length, u_int caplen)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the Network_Header of the packet, 'h->ts' is the timestamp,
 /*
  * This is the top level routine of the printer.  'p' points
  * to the Network_Header of the packet, 'h->ts' is the timestamp,

- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * is the number of bytes actually captured.
  */
 u_int
  * is the number of bytes actually captured.
  */
 u_int