Add support for DLT_PRISM and DLT_IEEE802_11_RADIO.

diff --git a/interface.h b/interface.h
index 439854f3889bf282224ef39923701b3a39327dde..97c3c766387bd5f550f653e57608a314806fa63f 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,7 @@
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.198 2002-12-04 19:09:30 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.199 2002-12-12 07:28:35 guy Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
  */
 
 #ifndef tcpdump_interface_h


@@ -231,6 +231,8 @@ extern void fddi_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void fr_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void ieee802_11_if_print(u_char *, const struct pcap_pkthdr *,
        const u_char *);
 extern void fr_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void ieee802_11_if_print(u_char *, const struct pcap_pkthdr *,
        const u_char *);

+extern void ieee802_11_radio_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);

 extern void gre_print(const u_char *, u_int);
 extern void icmp_print(const u_char *, u_int, const u_char *);
 extern void igmp_print(const u_char *, u_int);
 extern void gre_print(const u_char *, u_int);
 extern void icmp_print(const u_char *, u_int, const u_char *);
 extern void igmp_print(const u_char *, u_int);


@@ -266,6 +268,8 @@ extern void ppp_bsdos_if_print(u_char *, const struct pcap_pkthdr *,
        const u_char *);
 extern void pppoe_if_print(u_char *, const struct pcap_pkthdr *,
        const u_char *);
        const u_char *);
 extern void pppoe_if_print(u_char *, const struct pcap_pkthdr *,
        const u_char *);

+extern void prism_if_print(u_char *, const struct pcap_pkthdr *,
+       const u_char *);

 extern int vjc_print(register const char *, u_short);
 extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void rip_print(const u_char *, u_int);
 extern int vjc_print(register const char *, u_short);
 extern void raw_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void rip_print(const u_char *, u_int);

diff --git a/print-802_11.c b/print-802_11.c
index 01eacef5dc226327f3753e0527e09c4385443c78..36a474cd0076809f7ba33115b73d982949615ce8 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.12 2002-12-11 04:56:44 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-802_11.c,v 1.13 2002-12-12 07:28:35 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -720,7 +720,7 @@ static int GetHeaderLength(u_int16_t fc)
  * Print the 802.11 MAC header
  */
 static inline void
  * Print the 802.11 MAC header
  */
 static inline void

-ieee_802_11_print(u_int16_t fc, const u_char *p)
+ieee_802_11_hdr_print(u_int16_t fc, const u_char *p)

 {
        switch (FC_TYPE(fc)) {
        case T_MGMT:
 {
        switch (FC_TYPE(fc)) {
        case T_MGMT:


@@ -742,39 +742,23 @@ ieee_802_11_print(u_int16_t fc, const u_char *p)
        }
 }
 
        }
 }
 

-/*
- * This is the top level routine of the printer.  'p' points
- * to the 802.11 header of the packet, 'h->ts' 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
-ieee802_11_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+static void
+ieee802_11_print(const u_char *p, u_int length, u_int caplen)

 {
 {

-       u_int caplen = h->caplen;
-       u_int length = h->len;

        u_int16_t fc;
        u_int HEADER_LENGTH;
        u_short extracted_ethertype;
 
        u_int16_t fc;
        u_int HEADER_LENGTH;
        u_short extracted_ethertype;
 

-       ++infodelay;
-       ts_print(&h->ts);
-
-       if (caplen < IEEE802_11_FC_LEN) {
-               printf("[|802.11]");
-               goto out;
-       }
-

        fc = EXTRACT_LE_16BITS(p);
        HEADER_LENGTH = GetHeaderLength(fc);
 
        if (caplen < HEADER_LENGTH) {
                printf("[|802.11]");
        fc = EXTRACT_LE_16BITS(p);
        HEADER_LENGTH = GetHeaderLength(fc);
 
        if (caplen < HEADER_LENGTH) {
                printf("[|802.11]");

-               goto out;
+               return;

        }
 
        if (eflag)
        }
 
        if (eflag)

-               ieee_802_11_print(fc, p);
+               ieee_802_11_hdr_print(fc, p);

 
        /*
         * Some printers want to get back at the ethernet addresses,
 
        /*
         * Some printers want to get back at the ethernet addresses,


@@ -793,14 +777,14 @@ ieee802_11_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char
                if (!mgmt_body_print(fc, (const struct mgmt_header_t *)packetp,
                    p)) {
                        printf("[|802.11]");
                if (!mgmt_body_print(fc, (const struct mgmt_header_t *)packetp,
                    p)) {
                        printf("[|802.11]");

-                       goto out;
+                       return;

                }
                break;
 
        case T_CTRL:
                if (!ctrl_body_print(fc, p - HEADER_LENGTH)) {
                        printf("[|802.11]");
                }
                break;
 
        case T_CTRL:
                if (!ctrl_body_print(fc, p - HEADER_LENGTH)) {
                        printf("[|802.11]");

-                       goto out;
+                       return;

                }
                break;
 
                }
                break;
 


@@ -809,7 +793,7 @@ ieee802_11_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char
                if (FC_WEP(fc)) {
                        if (!wep_print(p)) {
                                printf("[|802.11]");
                if (FC_WEP(fc)) {
                        if (!wep_print(p)) {
                                printf("[|802.11]");

-                               goto out;
+                               return;

                        }
                } else {
                        if (llc_print(p, length, caplen, packetp + 10,
                        }
                } else {
                        if (llc_print(p, length, caplen, packetp + 10,


@@ -819,7 +803,7 @@ ieee802_11_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char
                                 * handle intelligently
                                 */
                                if (!eflag)
                                 * handle intelligently
                                 */
                                if (!eflag)

-                                       ieee_802_11_print(fc, p - HEADER_LENGTH);
+                                       ieee_802_11_hdr_print(fc, p - HEADER_LENGTH);

                                if (extracted_ethertype) {
                                        printf("(LLC %s) ",
                                            etherproto_string(htons(extracted_ethertype)));
                                if (extracted_ethertype) {
                                        printf("(LLC %s) ",
                                            etherproto_string(htons(extracted_ethertype)));


@@ -838,7 +822,95 @@ ieee802_11_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char
 
        if (xflag)
                default_print(p, caplen);
 
        if (xflag)
                default_print(p, caplen);

- out:
+}
+
+/*
+ * This is the top level routine of the printer.  'p' points
+ * to the 802.11 header of the packet, 'h->ts' 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
+ieee802_11_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+{
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+
+       ++infodelay;
+       ts_print(&h->ts);
+
+       if (caplen < IEEE802_11_FC_LEN) {
+               printf("[|802.11]");
+               goto out;
+       }
+
+       ieee802_11_print(p, length, caplen);
+
+out:
+       putchar('\n');
+       --infodelay;
+       if (infoprint)
+               info(0);
+}
+
+#define PRISM_HDR_LEN  144
+
+/*
+ * For DLT_PRISM_HEADER; like DLT_IEEE802_11, but with an extra header,
+ * containing information such as radio information, which we
+ * currently ignore.
+ */
+void
+prism_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+{
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+
+       ++infodelay;
+       ts_print(&h->ts);
+
+       if (caplen < PRISM_HDR_LEN + IEEE802_11_FC_LEN) {
+               printf("[|802.11]");
+               goto out;
+       }
+
+       ieee802_11_print(p + PRISM_HDR_LEN, length - PRISM_HDR_LEN,
+           caplen - PRISM_HDR_LEN);
+
+out:
+       putchar('\n');
+       --infodelay;
+       if (infoprint)
+               info(0);
+}
+
+#define IEEE802_11_RADIO_HDR_LEN       146
+
+/*
+ * For DLT_IEEE802_11_RADIO; like DLT_IEEE802_11, but with an extra
+ * header, containing information such as radio information, which we
+ * currently ignore.
+ */
+void
+ieee802_11_radio_if_print(u_char *user _U_, const struct pcap_pkthdr *h,
+    const u_char *p)
+{
+       u_int caplen = h->caplen;
+       u_int length = h->len;
+
+       ++infodelay;
+       ts_print(&h->ts);
+
+       if (caplen < IEEE802_11_RADIO_HDR_LEN + IEEE802_11_FC_LEN) {
+               printf("[|802.11]");
+               goto out;
+       }
+
+       ieee802_11_print(p + IEEE802_11_RADIO_HDR_LEN,
+           length - IEEE802_11_RADIO_HDR_LEN,
+           caplen - IEEE802_11_RADIO_HDR_LEN);
+
+out:

        putchar('\n');
        --infodelay;
        if (infoprint)
        putchar('\n');
        --infodelay;
        if (infoprint)

diff --git a/tcpdump.c b/tcpdump.c
index 96019d9bf1347c107801a190e5ae724dd96e349b..6b02404ae2aaacf54de8173313392b09020ca3e3 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -30,7 +30,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.188 2002-11-11 19:54:40 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.189 2002-12-12 07:28:36 guy Exp $ (LBL)";

 #endif
 
 /*
 #endif
 
 /*


@@ -178,6 +178,12 @@ static struct printer printers[] = {
 #endif
 #ifdef DLT_IP_OVER_FC
        { ipfc_if_print,        DLT_IP_OVER_FC },
 #endif
 #ifdef DLT_IP_OVER_FC
        { ipfc_if_print,        DLT_IP_OVER_FC },

+#endif
+#ifdef DLT_PRISM_HEADER
+       { prism_if_print,       DLT_PRISM_HEADER },
+#endif
+#ifdef DLT_IEEE802_11_RADIO
+       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },

 #endif
        { NULL,                 0 },
 };
 #endif
        { NULL,                 0 },
 };