summaryrefslogtreecommitdiffstats
path: root/contrib/libpcap/pcap
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2009-04-11 17:36:11 +0000
committerrpaulo <rpaulo@FreeBSD.org>2009-04-11 17:36:11 +0000
commitdc6531d9b1b6ce55370a4cee6183aa644690daf2 (patch)
tree2a0b01e82224813b931198b5a3a4c0e496d30369 /contrib/libpcap/pcap
parentdb35db3621c037ac015d13b564eec24582972f8e (diff)
downloadFreeBSD-src-dc6531d9b1b6ce55370a4cee6183aa644690daf2.zip
FreeBSD-src-dc6531d9b1b6ce55370a4cee6183aa644690daf2.tar.gz
Revert previous commit that commented out some bpf functions.
Unconstify arguments of bpf_image(), bpf_filter() and bpf_dump(). This is needed because some ports rely heavely on these arguments (some of them even roll out their own implemenentations of bpf_dump).
Diffstat (limited to 'contrib/libpcap/pcap')
-rw-r--r--contrib/libpcap/pcap/bpf.h2
-rw-r--r--contrib/libpcap/pcap/pcap.h8
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
index 9f4ca33..c9b30ed 100644
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -916,7 +916,7 @@ struct bpf_insn {
#if __STDC__ || defined(__cplusplus)
extern int bpf_validate(const struct bpf_insn *, int);
-extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
+extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
#else
extern int bpf_validate();
extern u_int bpf_filter();
diff --git a/contrib/libpcap/pcap/pcap.h b/contrib/libpcap/pcap/pcap.h
index 2687e1e..6997a9f 100644
--- a/contrib/libpcap/pcap/pcap.h
+++ b/contrib/libpcap/pcap/pcap.h
@@ -334,10 +334,10 @@ void pcap_freealldevs(pcap_if_t *);
const char *pcap_lib_version(void);
/* XXX this guy lives in the bpf tree */
-/* u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
-int bpf_validate(const struct bpf_insn *f, int len); */
-char *bpf_image(const struct bpf_insn *, int);
-void bpf_dump(const struct bpf_program *, int);
+u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
+int bpf_validate(struct bpf_insn *f, int len);
+char *bpf_image(struct bpf_insn *, int);
+void bpf_dump(struct bpf_program *, int);
#if defined(WIN32)
OpenPOWER on IntegriCloud