Re: bpfilter - bpf patches [LONG]
On Sat, 3 Jul 1999, Doug wrote: Dag-Erling Smorgrav wrote: [Bcc:ed to net, committers; please follow up on hackers] Attached are patches for renaming 'pseudo-device bpfilter' to 'peudo-device bpf', courtesy of glimpse(1) and ed(1). LINT and GENERIC build fine with these patches; I haven't tried to run a kernel built with them, though. Also, although I caught and corrected a few spacing nits caused by chopping off five letters, there may be some I didn't catch. If no-one objects, I'll commit this to -CURRENT in a few days. Forgive me if this is a stupid question, but are there any circumstances where naming the kernel include file "bpf.h" would conflict with /usr/include/net/bpf.h? In any case, this is a long overdue, and welcome change. Thank you. :) Doug How would that conflict? "bpf.h" is a local include, so it's not the same include path set. Plus, it would only be included as bpf.h if -I/sys/net. To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-hackers" in the body of the message Brian Fundakowski Feldman _ __ ___ ___ ___ ___ [EMAIL PROTECTED] _ __ ___ | _ ) __| \ FreeBSD: The Power to Serve!_ __ | _ \._ \ |) | http://www.FreeBSD.org/ _ |___/___/___/ To Unsubscribe: send mail to [EMAIL PROTECTED] with "unsubscribe freebsd-hackers" in the body of the message
bpfilter - bpf patches [LONG]
[Bcc:ed to net, committers; please follow up on hackers] Attached are patches for renaming 'pseudo-device bpfilter' to 'peudo-device bpf', courtesy of glimpse(1) and ed(1). LINT and GENERIC build fine with these patches; I haven't tried to run a kernel built with them, though. Also, although I caught and corrected a few spacing nits caused by chopping off five letters, there may be some I didn't catch. If no-one objects, I'll commit this to -CURRENT in a few days. DES -- Dag-Erling Smorgrav - d...@yes.no Index: src/release/picobsd/router/conf/PICOBSD === RCS file: /home/ncvs/src/release/picobsd/router/conf/PICOBSD,v retrieving revision 1.14 diff -u -r1.14 PICOBSD --- PICOBSD 1999/05/24 17:27:30 1.14 +++ PICOBSD 1999/07/02 08:10:05 @@ -94,7 +94,7 @@ pseudo-device ether #pseudo-device tun 2 #pseudo-device vn -#pseudo-device bpfilter4 +#pseudo-device bpf 4 pseudo-device ppp 4 pseudo-device pty 16 #pseudo-device gzip# Exec gzipped a.out's Index: src/release/scripts/dokern.sh === RCS file: /home/ncvs/src/release/scripts/dokern.sh,v retrieving revision 1.14 diff -u -r1.14 dokern.sh --- dokern.sh 1999/06/09 09:08:22 1.14 +++ dokern.sh 1999/07/02 08:10:05 @@ -12,7 +12,7 @@ -e 's/GENERIC/BOOTMFS/g' # So dhclient will work (just on boot floppy). -echo pseudo-device bpfilter 4 +echo pseudo-device bpf 4 echo options NFS_NOSERVER echo options SCSI_NO_OP_STRINGS Index: src/share/man/man4/bpf.4 === RCS file: /home/ncvs/src/share/man/man4/bpf.4,v retrieving revision 1.16 diff -u -r1.16 bpf.4 --- bpf.4 1999/01/10 04:59:59 1.16 +++ bpf.4 1999/07/02 08:10:05 @@ -29,7 +29,7 @@ .Nm bpf .Nd Berkeley Packet Filter .Sh SYNOPSIS -.Cd pseudo-device bpfilter +.Cd pseudo-device bpf .Sh DESCRIPTION The Berkeley Packet Filter provides a raw interface to data link layers in a protocol Index: src/sys/alpha/tc/am7990.c === RCS file: /home/ncvs/src/sys/alpha/tc/am7990.c,v retrieving revision 1.3 diff -u -r1.3 am7990.c --- am7990.c1999/05/10 15:48:01 1.3 +++ am7990.c1999/07/02 08:08:50 @@ -78,7 +78,7 @@ */ #include opt_inet.h -#if NBPFILTER 0 +#if NBPF 0 #include net/bpf.h #include net/bpfdesc.h #endif @@ -229,7 +229,7 @@ if_attach(ifp); ether_ifattach(ifp); -#if NBPFILTER 0 +#if NBPF 0 bpfattach(ifp-if_bpf, ifp, DLT_EN10MB, sizeof(struct ether_header)); #endif @@ -318,7 +318,7 @@ struct letmd tmd; u_int8_t *myaddr; -#if NBPFILTER 0 +#if NBPF 0 if (ifp-if_flags IFF_PROMISC) init.init_mode = LE_MODE_NORMAL | LE_MODE_PROM; else @@ -565,7 +565,7 @@ /* We assume that the header fit entirely in one mbuf. */ eh = mtod(m, struct ether_header *); -#if NBPFILTER 0 +#if NBPF 0 /* * Check if there's a BPF listener on this interface. * If so, hand off the raw packet to BPF. @@ -923,7 +923,7 @@ if (m == 0) break; -#if NBPFILTER 0 +#if NBPF 0 /* * If BPF is listening on this interface, let it see the packet * before we commit it to the wire. Index: src/sys/alpha/tc/if_le_dec.c === RCS file: /home/ncvs/src/sys/alpha/tc/if_le_dec.c,v retrieving revision 1.1 diff -u -r1.1 if_le_dec.c --- if_le_dec.c 1998/08/20 08:27:10 1.1 +++ if_le_dec.c 1999/07/02 08:09:11 @@ -41,7 +41,7 @@ * @(#)if_le.c 8.2 (Berkeley) 11/16/93 */ -#include bpfilter.h +#include bpf.h #include sys/param.h #include sys/systm.h #include sys/kernel.h Index: src/sys/conf/files === RCS file: /home/ncvs/src/sys/conf/files,v retrieving revision 1.223 diff -u -r1.223 files --- files 1999/06/24 03:44:10 1.223 +++ files 1999/07/02 08:09:11 @@ -391,7 +391,7 @@ ntfs/ntfs_compr.c optional ntfs ntfs/ntfs_ihash.c optional ntfs net/bpf.c standard -net/bpf_filter.c optional bpfilter +net/bpf_filter.c optional bpf net/bridge.c optional bridge net/bsd_comp.c optional ppp_bsdcomp #net/hostcache.c standard Index: src/sys/contrib/dev/oltr/if_oltr.c === RCS file: /home/ncvs/src/sys/contrib/dev/oltr/if_oltr.c,v retrieving revision 1.5 diff -u -r1.5 if_oltr.c --- if_oltr.c 1999/05/09 17:07:24 1.5 +++ if_oltr.c 1999/07/02 08:09:11 @@ -37,7 +37,7 @@ #include pci.h #include oltr.h #include opt_inet.h -#include bpfilter.h +#include bpf.h #if (NOLTR + NPCI) 0 @@ -90,7 +90,7 @@ #include
Re: bpfilter - bpf patches [LONG]
Dag-Erling Smorgrav wrote: [Bcc:ed to net, committers; please follow up on hackers] Attached are patches for renaming 'pseudo-device bpfilter' to 'peudo-device bpf', courtesy of glimpse(1) and ed(1). LINT and GENERIC build fine with these patches; I haven't tried to run a kernel built with them, though. Also, although I caught and corrected a few spacing nits caused by chopping off five letters, there may be some I didn't catch. If no-one objects, I'll commit this to -CURRENT in a few days. Forgive me if this is a stupid question, but are there any circumstances where naming the kernel include file bpf.h would conflict with /usr/include/net/bpf.h? In any case, this is a long overdue, and welcome change. Thank you. :) Doug To Unsubscribe: send mail to majord...@freebsd.org with unsubscribe freebsd-hackers in the body of the message
Re: bpfilter - bpf patches [LONG]
On Sat, 3 Jul 1999, Doug wrote: Dag-Erling Smorgrav wrote: [Bcc:ed to net, committers; please follow up on hackers] Attached are patches for renaming 'pseudo-device bpfilter' to 'peudo-device bpf', courtesy of glimpse(1) and ed(1). LINT and GENERIC build fine with these patches; I haven't tried to run a kernel built with them, though. Also, although I caught and corrected a few spacing nits caused by chopping off five letters, there may be some I didn't catch. If no-one objects, I'll commit this to -CURRENT in a few days. Forgive me if this is a stupid question, but are there any circumstances where naming the kernel include file bpf.h would conflict with /usr/include/net/bpf.h? In any case, this is a long overdue, and welcome change. Thank you. :) Doug How would that conflict? bpf.h is a local include, so it's not the same include path set. Plus, it would only be included as bpf.h if -I/sys/net. To Unsubscribe: send mail to majord...@freebsd.org with unsubscribe freebsd-hackers in the body of the message Brian Fundakowski Feldman _ __ ___ ___ ___ ___ gr...@freebsd.org _ __ ___ | _ ) __| \ FreeBSD: The Power to Serve!_ __ | _ \._ \ |) | http://www.FreeBSD.org/ _ |___/___/___/ To Unsubscribe: send mail to majord...@freebsd.org with unsubscribe freebsd-hackers in the body of the message
Re: bpfilter - bpf patches [LONG]
Doug d...@gorean.org writes: Forgive me if this is a stupid question, but are there any circumstances where naming the kernel include file bpf.h would conflict with /usr/include/net/bpf.h? I don't think so. The bpf.h created by config(8) resides in the compile directory and is only used there; the real bpf.h is in /sys/net/ (or /usr/include/net) and is only referred to as net/bpf.h. Besides, if there were any confusion, I wouldn't (shouldn't) have been able to build LINT and GENERIC with the patches. That said, thanks for asking - while looking into this matter I found another problem :) new patches will be available soon. DES -- Dag-Erling Smorgrav - d...@flood.ping.uio.no To Unsubscribe: send mail to majord...@freebsd.org with unsubscribe freebsd-hackers in the body of the message
Re: bpfilter - bpf patches [LONG]
Dag-Erling Smorgrav d...@flood.ping.uio.no writes: That said, thanks for asking - while looking into this matter I found another problem :) new patches will be available soon. Nothing serious; a corrected patch is available on my freefall web page (http://www.freebsd.org/~des/software/) DES -- Dag-Erling Smorgrav - d...@yes.no To Unsubscribe: send mail to majord...@freebsd.org with unsubscribe freebsd-hackers in the body of the message
