From owner-svn-src-all@FreeBSD.ORG Sat Apr 11 17:36:11 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8D211065674; Sat, 11 Apr 2009 17:36:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A658E8FC1C; Sat, 11 Apr 2009 17:36:11 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3BHaBDM093621; Sat, 11 Apr 2009 17:36:11 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3BHaBP7093616; Sat, 11 Apr 2009 17:36:11 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200904111736.n3BHaBP7093616@svn.freebsd.org> From: Rui Paulo Date: Sat, 11 Apr 2009 17:36:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190944 - in head/contrib/libpcap: . bpf/net pcap X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2009 17:36:12 -0000 Author: rpaulo Date: Sat Apr 11 17:36:11 2009 New Revision: 190944 URL: http://svn.freebsd.org/changeset/base/190944 Log: 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). Modified: head/contrib/libpcap/bpf/net/bpf_filter.c head/contrib/libpcap/bpf_dump.c head/contrib/libpcap/bpf_image.c head/contrib/libpcap/pcap/bpf.h head/contrib/libpcap/pcap/pcap.h Modified: head/contrib/libpcap/bpf/net/bpf_filter.c ============================================================================== --- head/contrib/libpcap/bpf/net/bpf_filter.c Sat Apr 11 16:57:50 2009 (r190943) +++ head/contrib/libpcap/bpf/net/bpf_filter.c Sat Apr 11 17:36:11 2009 (r190944) @@ -200,8 +200,8 @@ m_xhalf(m, k, err) */ u_int bpf_filter(pc, p, wirelen, buflen) - register const struct bpf_insn *pc; - register const u_char *p; + register struct bpf_insn *pc; + register u_char *p; u_int wirelen; register u_int buflen; { Modified: head/contrib/libpcap/bpf_dump.c ============================================================================== --- head/contrib/libpcap/bpf_dump.c Sat Apr 11 16:57:50 2009 (r190943) +++ head/contrib/libpcap/bpf_dump.c Sat Apr 11 17:36:11 2009 (r190944) @@ -31,7 +31,7 @@ static const char rcsid[] _U_ = #include void -bpf_dump(const struct bpf_program *p, int option) +bpf_dump(struct bpf_program *p, int option) { const struct bpf_insn *insn; int i; Modified: head/contrib/libpcap/bpf_image.c ============================================================================== --- head/contrib/libpcap/bpf_image.c Sat Apr 11 16:57:50 2009 (r190943) +++ head/contrib/libpcap/bpf_image.c Sat Apr 11 17:36:11 2009 (r190944) @@ -39,7 +39,7 @@ static const char rcsid[] _U_ = char * bpf_image(p, n) - const struct bpf_insn *p; + struct bpf_insn *p; int n; { int v; Modified: head/contrib/libpcap/pcap/bpf.h ============================================================================== --- head/contrib/libpcap/pcap/bpf.h Sat Apr 11 16:57:50 2009 (r190943) +++ head/contrib/libpcap/pcap/bpf.h Sat Apr 11 17:36:11 2009 (r190944) @@ -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(); Modified: head/contrib/libpcap/pcap/pcap.h ============================================================================== --- head/contrib/libpcap/pcap/pcap.h Sat Apr 11 16:57:50 2009 (r190943) +++ head/contrib/libpcap/pcap/pcap.h Sat Apr 11 17:36:11 2009 (r190944) @@ -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)