diff options
| author | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 2006-08-16 12:23:02 +0000 |
| commit | e49049679f4ee5ce6bb9214122154c529a811b5e (patch) | |
| tree | 435ea094ad0e55736442383de5885c9c40c9d2a2 /contrib/ipfilter/ipsd/sbpf.c | |
| parent | fcfb8e57499dfda26645e92a1b5ad74c6f35ee92 (diff) | |
| download | FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.zip FreeBSD-src-e49049679f4ee5ce6bb9214122154c529a811b5e.tar.gz | |
Resolve conflicts
MFC after: 1 weeks
Diffstat (limited to 'contrib/ipfilter/ipsd/sbpf.c')
| -rw-r--r-- | contrib/ipfilter/ipsd/sbpf.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/contrib/ipfilter/ipsd/sbpf.c index 6d4f83d..a724ba5 100644 --- a/contrib/ipfilter/ipsd/sbpf.c +++ b/contrib/ipfilter/ipsd/sbpf.c @@ -11,6 +11,9 @@ #include <ctype.h> #include <signal.h> #include <errno.h> +#ifdef __NetBSD__ +# include <paths.h> +#endif #include <sys/types.h> #include <sys/param.h> #include <sys/mbuf.h> @@ -123,8 +126,18 @@ int tout; struct bpf_version bv; struct timeval to; struct ifreq ifr; +#ifdef _PATH_BPF + char *bpfname = _PATH_BPF; + int fd; + + if ((fd = open(bpfname, O_RDWR)) < 0) + { + fprintf(stderr, "no bpf devices available as /dev/bpfxx\n"); + return -1; + } +#else char bpfname[16]; - int fd, i; + int fd = -1, i; for (i = 0; i < 16; i++) { @@ -137,6 +150,7 @@ int tout; fprintf(stderr, "no bpf devices available as /dev/bpfxx\n"); return -1; } +#endif if (ioctl(fd, BIOCVERSION, (caddr_t)&bv) < 0) { |
