Add some recent DLT_ values (to further remind people that they can't

take them for their own purposes), and fix a comment to reflect current
reality (as of many many years ago).

diff --git a/pcap-bpf.h b/pcap-bpf.h
index c29ea68770994968cc662afb2b441aa1ef7eae89..87f6bdb915b0739ea42383d0cf7be205e2f34fb0 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.34.2.23 2007-08-14 20:57:49 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.34.2.24 2007-09-19 02:52:12 guy Exp $ (LBL)

  */
 
 /*
  */
 
 /*


@@ -132,7 +132,7 @@ struct bpf_version {
 #define DLT_AX25       3       /* Amateur Radio AX.25 */
 #define DLT_PRONET     4       /* Proteon ProNET Token Ring */
 #define DLT_CHAOS      5       /* Chaos */
 #define DLT_AX25       3       /* Amateur Radio AX.25 */
 #define DLT_PRONET     4       /* Proteon ProNET Token Ring */
 #define DLT_CHAOS      5       /* Chaos */

-#define DLT_IEEE802    6       /* IEEE 802 Networks */
+#define DLT_IEEE802    6       /* 802.5 Token Ring */

 #define DLT_ARCNET     7       /* ARCNET, with BSD-style header */
 #define DLT_SLIP       8       /* Serial Line IP */
 #define DLT_PPP                9       /* Point-to-point Protocol */
 #define DLT_ARCNET     7       /* ARCNET, with BSD-style header */
 #define DLT_SLIP       8       /* Serial Line IP */
 #define DLT_PPP                9       /* Point-to-point Protocol */


@@ -728,6 +728,19 @@ struct bpf_version {
  */
 #define DLT_IPMB               199
 
  */
 #define DLT_IPMB               199
 

+/*
+ * Juniper-private data link type, as per request from
+ * Hannes Gredler <[email protected]>. 
+ * The DLT_ is used for capturing data on a secure tunnel interface.
+ */
+#define DLT_JUNIPER_ST          200
+
+/*
+ * Bluetooth HCI UART transport layer (part H:4), with pseudo-header
+ * that includes direction information; requested by Paolo Abeni.
+ */
+#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR 201
+

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