Allocate DLT_ for 802.15.4 without any header munging, for Mikko

Saarnivala.

Fix a comment.

diff --git a/pcap/bpf.h b/pcap/bpf.h
index e8bc61b3495280e35ff0dbd335c0ab78201a3afd..877058745f44c7a40edfd4023673638c373a99ef 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *

- * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.10 2007-05-24 23:57:36 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.11 2007-06-05 18:02:29 guy Exp $ (LBL)

  */
 
 /*
  */
 
 /*


@@ -695,6 +695,12 @@ struct bpf_version {
  */
 #define DLT_JUNIPER_ISM         194
 
  */
 #define DLT_JUNIPER_ISM         194
 

+/*
+ * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
+ * nothing); requested by Mikko Saarnivala <[email protected]>.
+ */
+#define DLT_IEEE802_15_4       195
+

 
 /*
  * The instruction encodings.
 
 /*
  * The instruction encodings.

diff --git a/savefile.c b/savefile.c
index 54d68c0aaad49cba2fc6e75426186ce363dc52fb..471177caa433f2648a3cae5b35d35e0fa0e24e38 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
 
 #ifndef lint
 static const char rcsid[] _U_ =

-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.156 2007-05-24 23:57:36 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.157 2007-06-05 18:02:29 guy Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -519,6 +519,12 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_JUNIPER_ISM    194
 
  */
 #define LINKTYPE_JUNIPER_ISM    194
 

+/*
+ * IEEE 802.15.4, exactly as it appears in the spec (no padding, no
+ * nothing); requested by Mikko Saarnivala <[email protected]>.
+ */
+#define LINKTYPE_IEEE802_15_4  195
+

 
 static struct linktype_map {
        int     dlt;
 
 static struct linktype_map {
        int     dlt;


@@ -758,12 +764,15 @@ static struct linktype_map {
        /* Per Packet Information encapsulated packets */
        { DLT_PPI,                      LINKTYPE_PPI },
 
        /* Per Packet Information encapsulated packets */
        { DLT_PPI,                      LINKTYPE_PPI },
 

-       /* IEEE 802.15 MAC Common Part Sublayer plus radiotap header */
+       /* IEEE 802.16 MAC Common Part Sublayer plus radiotap header */

        { DLT_IEEE802_16_MAC_CPS_RADIO, LINKTYPE_IEEE802_16_MAC_CPS_RADIO },
 
         /* Juniper Voice ISM */
         { DLT_JUNIPER_ISM,      LINKTYPE_JUNIPER_ISM },
 
        { DLT_IEEE802_16_MAC_CPS_RADIO, LINKTYPE_IEEE802_16_MAC_CPS_RADIO },
 
         /* Juniper Voice ISM */
         { DLT_JUNIPER_ISM,      LINKTYPE_JUNIPER_ISM },
 

+       /* IEEE 802.15.4 exactly as it appears in the spec */
+        { DLT_IEEE802_15_4,    LINKTYPE_IEEE802_15_4 },
+

        { -1,                   -1 }
 };
 
        { -1,                   -1 }
 };