aboutsummaryrefslogtreecommitdiffstats
path: root/bpf
diff options
context:
space:
mode:
authorguy <guy>2002-06-07 04:31:12 +0000
committerguy <guy>2002-06-07 04:31:12 +0000
commit5095d581ec4baac218e3e0f1f6d3858ea8c9ea1c (patch)
tree102da9ae082d1e0bd5ad5fe58d4cc10961a20a4b /bpf
parent562499a65ddb30de198356ebedff6d9790f59e67 (diff)
We'd already reserved 107 for Frame Relay; use that instead of a new
value.
Diffstat (limited to 'bpf')
-rw-r--r--bpf/net/bpf.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/bpf/net/bpf.h b/bpf/net/bpf.h
index 9cf140d..9b2e5d0 100644
--- a/bpf/net/bpf.h
+++ b/bpf/net/bpf.h
@@ -37,7 +37,7 @@
*
* @(#)bpf.h 7.1 (Berkeley) 5/7/91
*
- * @(#) $Header: /tcpdump/master/libpcap/bpf/net/Attic/bpf.h,v 1.58 2002-06-07 04:17:15 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/bpf/net/Attic/bpf.h,v 1.59 2002-06-07 04:31:13 guy Exp $ (LBL)
*/
#ifndef BPF_MAJOR_VERSION
@@ -256,10 +256,18 @@ struct bpf_hdr {
#define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */
/*
- * Values between 106 and 107 are used in capture file headers as
- * link-layer types corresponding to DLT_ types that might differ
- * between platforms; don't use those values for new DLT_ new types.
+ * 106 is reserved for Linux Classical IP over ATM; it's like DLT_RAW,
+ * except when it isn't. (I.e., sometimes it's just raw IP, and
+ * sometimes it isn't.) We currently handle it as DLT_LINUX_SLL,
+ * so that we don't have to worry about the link-layer header.)
+ */
+
+/*
+ * Reserved for Frame Relay; BSD/OS has a DLT_FR, with a value of 11,
+ * but that collides with other values. DLT_FR and DLT_FRELAY packets
+ * start with the Frame Relay header (DLCI, etc.).
*/
+#define DLT_FRELAY 107
/*
* OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
@@ -347,12 +355,6 @@ struct bpf_hdr {
#define DLT_SUNATM 123 /* Solaris+SunATM */
/*
- * Reserved for Frame Relay; BSD/OS has a DLT_FR, with a value of 11,
- * but that collides with other values.
- */
-#define DLT_FRELAY 124
-
-/*
* The instruction encodings.
*/
/* instruction classes */