d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous commit that commented out some bpf functions.

Browse Source 
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).
This commit is contained in:
Rui Paulo 2009-04-11 17:36:11 +00:00
parent 84997ef7b0
commit efbbe93e56
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/libpcap/bpf/net/bpf_filter.c
View File

@ -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;
{

2
contrib/libpcap/bpf_dump.c
View File

@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
#include <stdio.h>
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;

2
contrib/libpcap/bpf_image.c
View File

@ -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;

2
contrib/libpcap/pcap/bpf.h
View File

@ -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();

8
contrib/libpcap/pcap/pcap.h
View File

@ -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)