From owner-freebsd-hackers Thu Oct 29 05:17:05 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id FAA22237 for freebsd-hackers-outgoing; Thu, 29 Oct 1998 05:17:05 -0800 (PST) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from niobe.ewox.org (ppp041.uio.no [129.240.240.42]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id FAA22207 for ; Thu, 29 Oct 1998 05:16:54 -0800 (PST) (envelope-from finrod@niobe.ewox.org) Received: (from finrod@localhost) by niobe.ewox.org (8.9.1/8.8.8) id OAA03682; Thu, 29 Oct 1998 14:16:39 +0100 (CET) (envelope-from finrod) To: hackers@FreeBSD.ORG Subject: s/bpfilter/bpf/ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit From: finrod@ewox.org (Dag-Erling Coidan Smørgrav) Date: 29 Oct 1998 14:16:38 +0100 Message-ID: <86u30n7bk9.fsf@niobe.ewox.org> Lines: 172 X-Mailer: Gnus v5.3/Emacs 19.34 Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG While in Arnhem, I discussed renaming the bpfilter pseudo-device to bpf. There seemed to be agreement that it would be more consistent (amongst other items, the device nodes are named /dev/bpf*, and the man page is bpf(4)). The only impact this will have on users is that config will no longer recognize bpfilter as a valid pseudo-device name. All kernel config files that have bpf enabled will have to be edited. Other than that, there should be no user-visible changes. No syscalls, ioctls, library functions or header files will be renamed. All bpf consumers will compile and run as previously, and it will not be necessary to recompile any applications to adapt to the change. A patch is enclosed below; if it passes the usual tests and nobody objects, I'll commit it. (as you can see, the only changes are s/bpfilter/bpf/ in the man page, kernel source list, and sample kernel config files) Index: src/release/picobsd/router/conf/PICOBSD =================================================================== RCS file: /home/ncvs/src/release/picobsd/router/conf/PICOBSD,v retrieving revision 1.7 diff -u -r1.7 PICOBSD --- PICOBSD 1998/10/25 15:31:26 1.7 +++ PICOBSD 1998/10/29 12:54:23 @@ -86,7 +86,7 @@ pseudo-device ether #pseudo-device tun 2 #pseudo-device vn -#pseudo-device bpfilter 4 +#pseudo-device bpf 4 pseudo-device ppp 4 pseudo-device pty 16 #pseudo-device gzip # Exec gzipped a.out's Index: src/share/man/man4/bpf.4 =================================================================== RCS file: /home/ncvs/src/share/man/man4/bpf.4,v retrieving revision 1.13 diff -u -r1.13 bpf.4 --- bpf.4 1998/05/25 07:11:41 1.13 +++ bpf.4 1998/10/29 12:56:37 @@ -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/conf/files =================================================================== RCS file: /home/ncvs/src/sys/conf/files,v retrieving revision 1.167 diff -u -r1.167 files --- files 1998/10/25 07:23:32 1.167 +++ files 1998/10/29 12:54:15 @@ -317,8 +317,8 @@ msdosfs/msdosfs_lookup.c optional msdosfs msdosfs/msdosfs_vfsops.c optional msdosfs msdosfs/msdosfs_vnops.c optional msdosfs -net/bpf.c optional bpfilter -net/bpf_filter.c optional bpfilter +net/bpf.c optional bpf +net/bpf_filter.c optional bpf net/bsd_comp.c optional ppp_bsdcomp #net/hostcache.c standard net/if.c standard Index: src/sys/i386/conf/GENERIC =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v retrieving revision 1.128 diff -u -r1.128 GENERIC --- GENERIC 1998/10/22 13:49:51 1.128 +++ GENERIC 1998/10/29 12:53:14 @@ -178,8 +178,8 @@ # options SYSVSHM -# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be +# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be # aware of the legal and administrative consequences of enabling this # option. The number of devices determines the maximum number of # simultaneous BPF clients programs runnable. -#pseudo-device bpfilter 4 #Berkeley packet filter +#pseudo-device bpf 4 #Berkeley packet filter Index: src/sys/i386/conf/LINT =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/LINT,v retrieving revision 1.491 diff -u -r1.491 LINT --- LINT 1998/10/22 13:49:51 1.491 +++ LINT 1998/10/29 12:52:03 @@ -362,7 +362,7 @@ # of synchronous PPP links (like `cx', `ar'). # The `sl' pseudo-device implements the Serial Line IP (SLIP) service. # The `ppp' pseudo-device implements the Point-to-Point Protocol. -# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be +# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be # aware of the legal and administrative consequences of enabling this # option. The number of devices determines the maximum number of # simultaneous BPF clients programs runnable. @@ -381,7 +381,7 @@ pseudo-device fddi #Generic FDDI pseudo-device sppp #Generic Synchronous PPP pseudo-device loop #Network loopback device -pseudo-device bpfilter 4 #Berkeley packet filter +pseudo-device bpf 4 #Berkeley packet filter pseudo-device disc #Discard device pseudo-device tun 1 #Tunnel driver (user process ppp(8)) pseudo-device sl 2 #Serial Line IP Index: src/sys/i386/conf/SMP-GENERIC =================================================================== RCS file: /home/ncvs/src/sys/i386/conf/SMP-GENERIC,v retrieving revision 1.20 diff -u -r1.20 SMP-GENERIC --- SMP-GENERIC 1998/10/22 13:49:51 1.20 +++ SMP-GENERIC 1998/10/29 12:51:48 @@ -195,8 +195,8 @@ # options SYSVSHM -# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be +# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be # aware of the legal and administrative consequences of enabling this # option. The number of devices determines the maximum number of # simultaneous BPF clients programs runnable. -#pseudo-device bpfilter 4 #Berkeley packet filter +#pseudo-device bpf 4 #Berkeley packet filter Index: src/sys/pc98/conf/GENERIC98 =================================================================== RCS file: /home/ncvs/src/sys/pc98/conf/GENERIC98,v retrieving revision 1.54 diff -u -r1.54 GENERIC98 --- GENERIC98 1998/10/22 16:16:02 1.54 +++ GENERIC98 1998/10/29 12:49:19 @@ -171,11 +171,11 @@ # device ed0 at isa? port 0x00d0 net irq 6 -# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be +# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be # aware of the legal and administrative consequences of enabling this # option. The number of devices determines the maximum number of # simultaneous BPF clients programs runnable. -#pseudo-device bpfilter 4 #Berkeley packet filter +#pseudo-device bpf 4 #Berkeley packet filter device ed1 at isa? port 0x00d8 net irq 6 flags 0x200000 device ed2 at isa? port 0x00d8 net irq 6 flags 0x300000 device ed3 at isa? port 0x00d0 net irq 6 flags 0x400000 Index: src/sys/pc98/conf/SMP-GENERIC98 =================================================================== RCS file: /home/ncvs/src/sys/pc98/conf/SMP-GENERIC98,v retrieving revision 1.9 diff -u -r1.9 SMP-GENERIC98 --- SMP-GENERIC98 1998/10/22 16:16:02 1.9 +++ SMP-GENERIC98 1998/10/29 12:49:11 @@ -235,8 +235,8 @@ # options SYSVSHM -# The `bpfilter' pseudo-device enables the Berkeley Packet Filter. Be +# The `bpf' pseudo-device enables the Berkeley Packet Filter. Be # aware of the legal and administrative consequences of enabling this # option. The number of devices determines the maximum number of # simultaneous BPF clients programs runnable. -#pseudo-device bpfilter 4 #Berkeley packet filter +#pseudo-device bpf 4 #Berkeley packet filter DES -- Dag-Erling Smørgrav - finrod@ewox.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message