Linktype for IEEE 802.15.4, with address fields padded as done by Linux

drivers; requested by  Juergen Schimmer.

diff --git a/pcap/bpf.h b/pcap/bpf.h
index bf44804ba6cf04d61bbf60fc7d7ff46cdd335992..df35fe5b6894d0a34840900769eda6c33f2329c5 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -37,7 +37,7 @@
  *
  *      @(#)bpf.h       7.1 (Berkeley) 5/7/91
  *
- * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.4 2006-12-20 03:30:32 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.5 2007-04-03 07:18:27 guy Exp $ (LBL)
  */
 
 /*
@@ -667,6 +667,12 @@ struct bpf_version {
  */
 #define DLT_CAN20B              190
 
+/*
+ * IEEE 802.15.4, with address fields padded, as is done by Linux
+ * drivers; requested by Juergen Schimmer.
+ */
+#define DLT_IEEE802_15_4_LINUX 191
+
 /*
  * The instruction encodings.
  */

diff --git a/savefile.c b/savefile.c
index bacd3bf723ecf7a4a1eae2c674fb4ea55f7dfa2f..5d576320f4569b2ce937611d6566a3fd354f4462 100644 (file)
--- a/savefile.c
+++ b/savefile.c
@@ -30,7 +30,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.151 2007-04-01 17:06:47 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/libpcap/savefile.c,v 1.152 2007-04-03 07:18:27 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -493,6 +493,12 @@ static const char rcsid[] _U_ =
  */
 #define LINKTYPE_CAN20B         190
 
+/*
+ * IEEE 802.15.4, with address fields padded, as is done by Linux
+ * drivers; requested by Juergen Schimmer.
+ */
+#define LINKTYPE_IEEE802_15_4_LINUX    191
+
 static struct linktype_map {
        int     dlt;
        int     linktype;
@@ -725,6 +731,9 @@ static struct linktype_map {
        /* Controller Area Network (CAN) v2.0B */
        { DLT_CAN20B,           LINKTYPE_CAN20B },
 
+       /* IEEE 802.15.4 with address fields padded */
+       { DLT_IEEE802_15_4_LINUX,       LINKTYPE_IEEE802_15_4_LINUX },
+
        { -1,                   -1 }
 };