Skip site navigation (1)Skip section navigation (2)
Date:      29 Oct 1998 17:30:49 +0100
From:      finrod@ewox.org (Dag-Erling Coidan Smørgrav)
To:        hackers@FreeBSD.ORG
Subject:   Re: s/bpfilter/bpf/
Message-ID:  <86k91j72km.fsf@niobe.ewox.org>
References:  <5159.909675209@time.cdrom.com>

next in thread | previous in thread | raw e-mail | index | archive | help
Here's a new patch which allows both keywords (bpfilter and bpf):

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 16:26:31
@@ -317,8 +317,11 @@
 msdosfs/msdosfs_lookup.c	optional msdosfs
 msdosfs/msdosfs_vfsops.c	optional msdosfs
 msdosfs/msdosfs_vnops.c		optional msdosfs
+# bpfilter is deprecated and will go away soon; use bpf instead.
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k91j72km.fsf>