aboutsummaryrefslogtreecommitdiffstats
path: root/bpf
diff options
context:
space:
mode:
authorguy <guy>2000-12-16 21:31:10 +0000
committerguy <guy>2000-12-16 21:31:10 +0000
commit7928a0e82399963769aa80aaf889a90bc35baffd (patch)
treeeb609e59d3ec2ca8df4b41f80cd7deae223ff360 /bpf
parentc9452a76667590c4c8137f2b812ae60ac9be80a9 (diff)
Handle DLT_NULL correctly - the AF_ value is in host byte order, which
means that we should "htonl()" it before using it in BPF expressions *but*, if we're reading a capture file from a machine with the opposite byte order from ours, we should byte-swap it before "htonl()"ing it. Handle OpenBSD DLT_LOOP as well - it's like DLT_NULL except that the AF_ value is in *network* byte order. Don't support checking for inbound or outbound packets except on those data link types that supply an inbound/outbound qualifier (DLT_SLIP and DLT_PPP) - this came from OpenBSD's libpcap, delta 1.12 to "gencode.c".
Diffstat (limited to 'bpf')
-rw-r--r--bpf/net/bpf.h29
1 files changed, 27 insertions, 2 deletions
diff --git a/bpf/net/bpf.h b/bpf/net/bpf.h
index 3066edf..5ea3afb 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.41 2000-11-15 05:36:49 guy Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/libpcap/bpf/net/Attic/bpf.h,v 1.42 2000-12-16 21:31:11 guy Exp $ (LBL)
*/
#ifndef BPF_MAJOR_VERSION
@@ -168,7 +168,9 @@ struct bpf_hdr {
* DLT_* codes appropriately for that platform (the BSDs, for example,
* should not just pick up this version of "bpf.h"; they should also define
* the additional DLT_* codes used by their kernels, as well as the values
- * defined here).
+ * defined here - and, if the values they use for particular DLT_ types
+ * differ from those here, they should use their values, not the ones
+ * here).
*/
#define DLT_NULL 0 /* no link-layer encapsulation */
#define DLT_EN10MB 1 /* Ethernet (10Mb) */
@@ -246,6 +248,29 @@ 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.
+ */
+
+/*
+ * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except
+ * that the AF_ type in the link-layer header is in network byte order.
+ *
+ * OpenBSD defines it as 12, but that collides with DLT_RAW, so we
+ * define it as 108 here. If OpenBSD picks up this file, it should
+ * define DLT_LOOP as 12 in its version, as per the comment above -
+ * and should not use 108 for any purpose.
+ */
+#define DLT_LOOP 108
+
+/*
+ * Values between 109 and 113 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.
+ */
+
+/*
* The instruction encondings.
*/
/* instruction classes */