Update config.{guess,sub}, timestamps 2023-01-01,2023-01-21

[libpcap] / pcap / bpf.h

diff --git a/pcap/bpf.h b/pcap/bpf.h
index 95ea2abc043b4957f26e390f7132c6fddc25ce76..3970d0a18426321a2ad1d8278488521df2dc18bb 100644 (file)
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -80,6 +80,7 @@
 #define lib_pcap_bpf_h
 
 #include <pcap/funcattrs.h>
+#include <pcap/dlt.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -117,10 +118,6 @@ struct bpf_program {
        struct bpf_insn *bf_insns;
 };
 
-#include <pcap/dlt.h>
-
-#ifndef __LINUX_FILTER_H__
-
 /*
  * The instruction encodings.
  *
@@ -152,7 +149,7 @@ struct bpf_program {
 #define                BPF_B           0x10
 /*                             0x18    reserved; used by BSD/OS */
 #define BPF_MODE(code) ((code) & 0xe0)
-#define                BPF_IMM         0x00
+#define                BPF_IMM 0x00
 #define                BPF_ABS         0x20
 #define                BPF_IND         0x40
 #define                BPF_MEM         0x60
@@ -241,31 +238,45 @@ struct bpf_program {
 /*                             0xf0    reserved */
 /*                             0xf8    reserved */
 
-#endif /* __LINUX_FILTER_H__ */
-
 /*
  * The instruction data structure.
  */
 struct bpf_insn {
        u_short code;
-       u_char  jt;
-       u_char  jf;
+       u_char  jt;
+       u_char  jf;
        bpf_u_int32 k;
 };
 
-#ifndef __LINUX_FILTER_H__
-
 /*
  * Macros for insn array initializers.
+ *
+ * In case somebody's included <linux/filter.h>, or something else that
+ * gives the kernel's definitions of BPF statements, get rid of its
+ * definitions, so we can supply ours instead.  If some kernel's
+ * definitions aren't *binary-compatible* with what BPF has had
+ * since it first sprung from the brows of Van Jacobson and Steve
+ * McCanne, that kernel should be fixed.
  */
+#ifdef BPF_STMT
+#undef BPF_STMT
+#endif
 #define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
+#ifdef BPF_JUMP
+#undef BPF_JUMP
+#endif
 #define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
 
-#endif /* __LINUX_FILTER_H__ */
-
+PCAP_AVAILABLE_0_4
 PCAP_API u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
+
+PCAP_AVAILABLE_0_6
 PCAP_API int   bpf_validate(const struct bpf_insn *f, int len);
+
+PCAP_AVAILABLE_0_4
 PCAP_API char  *bpf_image(const struct bpf_insn *, int);
+
+PCAP_AVAILABLE_0_6
 PCAP_API void  bpf_dump(const struct bpf_program *, int);
 
 /*