[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 bpfilter 4
+#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.c 1999/05/10 15:48:01 1.3
+++ am7990.c 1999/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 <net/iso88025.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -632,7 +632,7 @@
if_attach(ifp);
iso88025_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_IEEE802, sizeof(struct iso88025_header));
#endif
@@ -949,7 +949,7 @@
goto bad;
}
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m0);
#endif
@@ -1351,7 +1351,7 @@
}
ifp->if_ipackets++;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m0);
#endif
Index: src/sys/dev/en/midway.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/en/midway.c,v
retrieving revision 1.16
diff -u -r1.16 midway.c
--- midway.c 1999/05/08 14:23:00 1.16
+++ midway.c 1999/07/02 08:09:11
@@ -169,8 +169,8 @@
#endif /* __FreeBSD__ */
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#ifdef __FreeBSD__
#define BPFATTACH(ifp, dlt, hlen) bpfattach((ifp), (dlt), (hlen))
@@ -179,7 +179,7 @@
#define BPFATTACH(ifp, dlt, hlen) bpfattach(&(ifp)->if_bpf, (ifp), (dlt),
(hlen))
#define BPF_MTAP(ifp, m) bpf_mtap((ifp)->if_bpf, (m))
#endif
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
/*
* params
@@ -820,7 +820,7 @@
if_attach(ifp);
atm_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
BPFATTACH(ifp, DLT_ATM_RFC1483, sizeof(struct atmllc));
#endif
}
@@ -2120,7 +2120,7 @@
en_txlaunch(sc, chan, &launch);
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
/*
* adjust the top of the mbuf to skip the pseudo atm header
@@ -2139,7 +2139,7 @@
launch.t->m_data -= size;
launch.t->m_len += size;
}
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
/*
* do some housekeeping and get the next packet
*/
@@ -2709,7 +2709,7 @@
ifp = &sc->enif;
ifp->if_ipackets++;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
BPF_MTAP(ifp, m);
#endif
Index: src/sys/dev/iicbus/if_ic.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/iicbus/if_ic.c,v
retrieving revision 1.4
diff -u -r1.4 if_ic.c
--- if_ic.c 1999/05/08 21:59:03 1.4
+++ if_ic.c 1999/07/02 08:09:11
@@ -59,9 +59,9 @@
#include <netinet/ip.h>
#include <netinet/if_ether.h>
-#include "bpfilter.h"
+#include "bpf.h"
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -151,7 +151,7 @@
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_NULL, ICHDRLEN);
#endif
@@ -322,7 +322,7 @@
sc->ic_if.if_ipackets ++;
sc->ic_if.if_ibytes += len;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->ic_if.if_bpf)
bpf_tap(&sc->ic_if, sc->ic_ifbuf, len + ICHDRLEN);
#endif
@@ -417,7 +417,7 @@
} while ((mm = mm->m_next));
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
struct mbuf m0, *n = m;
Index: src/sys/dev/pccard/if_xe.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pccard/if_xe.c,v
retrieving revision 1.5
diff -u -r1.5 if_xe.c
--- if_xe.c 1999/06/22 19:21:00 1.5
+++ if_xe.c 1999/07/02 08:09:11
@@ -106,7 +106,7 @@
#include "xe.h"
#include "card.h"
#include "apm.h"
-#include "bpfilter.h"
+#include "bpf.h"
#if NXE > 0
@@ -131,9 +131,9 @@
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/if_mib.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
@@ -808,7 +808,7 @@
if_attach(scp->ifp);
ether_ifattach(scp->ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
/* If BPF is in the kernel, call the attach for it */
#if XE_DEBUG > 1
printf("xe%d: BPF listener attached\n", scp->unit);
@@ -944,7 +944,7 @@
return;
}
-#if NBPFILTER > 0
+#if NBPF > 0
/* Tap off here if there is a bpf listener */
if (ifp->if_bpf) {
#if XE_DEBUG > 1
@@ -952,7 +952,7 @@
#endif
bpf_mtap(ifp, mbp);
}
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
ifp->if_timer = 5; /* In case we don't hear from the card
again */
scp->tx_queued++;
@@ -1266,7 +1266,7 @@
else
insw(scp->dev->id_iobase+XE_EDP, ehp, len >> 1);
-#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.
@@ -1289,7 +1289,7 @@
mbp = NULL;
}
}
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
if (mbp != NULL) {
mbp->m_pkthdr.len = mbp->m_len = len - ETHER_HDR_LEN;
Index: src/sys/dev/pdq/pdq_ifsubr.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/pdq/pdq_ifsubr.c,v
retrieving revision 1.7
diff -u -r1.7 pdq_ifsubr.c
--- pdq_ifsubr.c 1998/02/20 13:11:45 1.7
+++ pdq_ifsubr.c 1999/07/02 08:09:11
@@ -45,8 +45,8 @@
#include <net/if.h>
#include <net/if_dl.h>
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -186,7 +186,7 @@
struct fddi_header *fh = mtod(m, struct fddi_header *);
sc->sc_if.if_ipackets++;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_bpf != NULL)
PDQ_BPF_MTAP(sc, m);
if ((fh->fddi_fc & (FDDIFC_L|FDDIFC_F)) != FDDIFC_LLC_ASYNC) {
@@ -222,7 +222,7 @@
struct mbuf *m)
{
pdq_softc_t *sc = (pdq_softc_t *) pdq->pdq_os_ctx;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_bpf != NULL)
PDQ_BPF_MTAP(sc, m);
#endif
@@ -384,7 +384,7 @@
if_attach(ifp);
fddi_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
PDQ_BPFATTACH(sc, DLT_FDDI, sizeof(struct fddi_header));
#endif
}
Index: src/sys/dev/ppbus/if_plip.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/ppbus/if_plip.c,v
retrieving revision 1.12
diff -u -r1.12 if_plip.c
--- if_plip.c 1999/02/14 16:19:16 1.12
+++ if_plip.c 1999/07/02 08:09:11
@@ -93,8 +93,8 @@
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -256,7 +256,7 @@
ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_NULL, sizeof(u_int32_t));
#endif
@@ -446,7 +446,7 @@
return (ctrecvl[cl] | ctrecvh[c]);
}
-#if NBPFILTER > 0
+#if NBPF > 0
static void
lptap(struct ifnet *ifp, struct mbuf *m)
{
@@ -525,7 +525,7 @@
sc->sc_if.if_ibytes += len;
top = m_devget(sc->sc_ifbuf + CLPIPHDRLEN, len, 0, &sc->sc_if, 0);
if (top) {
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf)
lptap(&sc->sc_if, top);
#endif
@@ -578,7 +578,7 @@
sc->sc_if.if_ibytes += len;
top = m_devget(sc->sc_ifbuf + LPIPHDRLEN, len, 0, &sc->sc_if, 0);
if (top) {
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf)
lptap(&sc->sc_if, top);
#endif
@@ -715,7 +715,7 @@
} else {
ifp->if_opackets++;
ifp->if_obytes += m->m_pkthdr.len;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
lptap(ifp, m);
#endif
@@ -762,7 +762,7 @@
} else {
ifp->if_opackets++;
ifp->if_obytes += m->m_pkthdr.len;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
lptap(ifp, m);
#endif
Index: src/sys/dev/vx/if_vx.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/vx/if_vx.c,v
retrieving revision 1.20
diff -u -r1.20 if_vx.c
--- if_vx.c 1999/01/27 20:09:20 1.20
+++ if_vx.c 1999/07/02 08:09:11
@@ -62,7 +62,7 @@
#define NVX 4
#endif
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -76,7 +76,7 @@
#include <net/ethernet.h>
#include <net/if_arp.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -216,7 +216,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -496,7 +496,7 @@
outw(BASE + VX_COMMAND, SET_TX_START_THRESH |
((len / 4 + sc->tx_start_thresh) >> 2));
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf) {
bpf_mtap(&sc->arpcom.ac_if, m0);
}
@@ -745,7 +745,7 @@
/* We assume 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.
Index: src/sys/i386/conf/GENERIC
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/GENERIC,v
retrieving revision 1.175
diff -u -r1.175 GENERIC
--- GENERIC 1999/06/29 18:55:53 1.175
+++ GENERIC 1999/07/03 09:40:42
@@ -197,9 +197,9 @@
pseudo-device pty 16 # Pseudo-ttys (telnet etc)
pseudo-device gzip # Exec gzipped a.out's
-# The `bpfilter' pseudo-device enables the Berkeley Packet Filter.
+# The `bpf' pseudo-device enables the Berkeley Packet Filter.
# Be aware of the legal and administrative consequences of enabling this!
-#pseudo-device bpfilter 4 #Berkeley packet filter
+#pseudo-device bpf 4 #Berkeley packet filter
# USB support
#controller uhci0 # UHCI PCI->USB interface
Index: src/sys/i386/conf/LINT
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/LINT,v
retrieving revision 1.613
diff -u -r1.613 LINT
--- LINT 1999/06/29 21:52:07 1.613
+++ LINT 1999/07/03 09:40:35
@@ -381,7 +381,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.
@@ -394,7 +394,7 @@
# The PPP_BSDCOMP option enables support for compress(1) style entire
# packet compression, the PPP_DEFLATE is for zlib/gzip style compression.
# PPP_FILTER enables code for filtering the ppp data stream and selecting
-# events for resetting the demand dial activity timer - requires bpfilter.
+# events for resetting the demand dial activity timer - requires bpf.
# See pppd(8) for more details.
#
pseudo-device ether #Generic Ethernet
@@ -402,7 +402,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 (ppp(8), nos-tun(8))
pseudo-device sl 2 #Serial Line IP
@@ -410,7 +410,7 @@
pseudo-device streams
options PPP_BSDCOMP #PPP BSD-compress support
options PPP_DEFLATE #PPP zlib/deflate/gzip support
-options PPP_FILTER #enable bpf filtering (needs bpfilter)
+options PPP_FILTER #enable bpf filtering (needs bpf)
#
# Internet family options:
Index: src/sys/i386/conf/PCCARD
===================================================================
RCS file: /home/ncvs/src/sys/i386/conf/PCCARD,v
retrieving revision 1.11
diff -u -r1.11 PCCARD
--- PCCARD 1999/06/17 23:53:20 1.11
+++ PCCARD 1999/07/02 08:09:11
@@ -201,11 +201,11 @@
options SYSVMSG
options SYSVSEM
-# 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
# USB support
#controller uhci0
Index: src/sys/i386/isa/if_ar.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_ar.c,v
retrieving revision 1.26
diff -u -r1.26 if_ar.c
--- if_ar.c 1999/05/06 18:58:04 1.26
+++ if_ar.c 1999/07/02 08:09:11
@@ -49,7 +49,7 @@
*/
#include "ar.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@
#include <net/if.h>
#include <net/if_sppp.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -357,7 +357,7 @@
sppp_attach((struct ifnet *)&sc->ifsppp);
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
#endif
}
@@ -537,7 +537,7 @@
txdata += AR_BUF_SIZ;
i++;
-#if NBPFILTER > 0
+#if NBPF > 0
if(ifp->if_bpf)
bpf_mtap(ifp, mtx);
#endif
@@ -1299,7 +1299,7 @@
}
}
ar_copy_rxbuf(m, sc, len);
-#if NBPFILTER > 0
+#if NBPF > 0
if(sc->ifsppp.pp_if.if_bpf)
bpf_mtap(&sc->ifsppp.pp_if, m);
#endif
Index: src/sys/i386/isa/if_cs.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_cs.c,v
retrieving revision 1.10
diff -u -r1.10 if_cs.c
--- if_cs.c 1999/04/16 21:22:20 1.10
+++ if_cs.c 1999/07/02 08:09:12
@@ -35,7 +35,7 @@
/* #define CS_DEBUG */
#include "cs.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <net/if_media.h>
#include <net/ethernet.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -620,7 +620,7 @@
printf(CS_NAME"%d: ethernet address %6D\n",
ifp->if_unit, sc->arpcom.ac_enaddr, ":");
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof (struct ether_header));
#endif
return 1;
@@ -777,7 +777,7 @@
eh = mtod(m, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m);
#endif
@@ -950,7 +950,7 @@
cs_write_mbufs(sc, m);
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
}
Index: src/sys/i386/isa/if_cx.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_cx.c,v
retrieving revision 1.28
diff -u -r1.28 if_cx.c
--- if_cx.c 1999/04/02 13:58:01 1.28
+++ if_cx.c 1999/07/02 08:09:12
@@ -19,7 +19,7 @@
#undef DEBUG
#include "cx.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_devfs.h"
#include "sppp.h"
@@ -38,7 +38,7 @@
#include <net/if.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -285,7 +285,7 @@
sppp_attach (c->ifp);
if_attach (c->ifp);
sp = (struct sppp*) c->ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
/* If BPF is in the kernel, call the attach for it. */
bpfattach (c->ifp, DLT_PPP, PPP_HEADER_LEN);
#endif
@@ -481,7 +481,7 @@
return;
}
m_copydata (m, 0, len, buf);
-#if NBPFILTER > 0
+#if NBPF > 0
if (c->ifp->if_bpf)
bpf_mtap (c->ifp, m);
#endif
@@ -805,7 +805,7 @@
printmbuf (m);
#endif
-#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.
Index: src/sys/i386/isa/if_ed.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_ed.c,v
retrieving revision 1.152
diff -u -r1.152 if_ed.c
--- if_ed.c 1999/05/09 23:24:45 1.152
+++ if_ed.c 1999/07/02 08:09:12
@@ -38,7 +38,7 @@
*/
#include "ed.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "pnp.h"
#ifndef EXTRA_ED
@@ -65,7 +65,7 @@
#include <net/if_dl.h>
#include <net/if_mib.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
#include "opt_bdg.h"
@@ -1721,7 +1721,7 @@
/*
* If BPF is in the kernel, call the attach for it
*/
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
return 1;
@@ -2179,7 +2179,7 @@
/*
* Tap off here if there is a bpf listener.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m0);
}
@@ -2621,7 +2621,7 @@
}
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Promiscuous flag may have changed, so reprogram the RCR.
@@ -2752,7 +2752,7 @@
struct ifnet *ifp ;
int need_more = 1 ; /* in case not bpf */
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf) {
need_more = 0 ;
ed_ring_copy(sc, buf, (char *)eh, len);
@@ -2783,7 +2783,7 @@
*/
ed_ring_copy(sc, buf, (char *)eh, len);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Check if there's a BPF listener on this interface. If so, hand off
Index: src/sys/i386/isa/if_el.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_el.c,v
retrieving revision 1.40
diff -u -r1.40 if_el.c
--- if_el.c 1999/01/12 01:29:42 1.40
+++ if_el.c 1999/07/02 08:09:12
@@ -20,7 +20,7 @@
* - Does not currently support multicasts
*/
#include "el.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -48,7 +48,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -213,7 +213,7 @@
sc->arpcom.ac_enaddr, ":");
/* Finally, attach to bpf filter if it is present. */
-#if NBPFILTER > 0
+#if NBPF > 0
dprintf(("Attaching to BPF...\n"));
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -348,7 +348,7 @@
len = max(len,ETHER_MIN_LEN);
/* Give the packet to the bpf, if any */
-#if NBPFILTER > 0
+#if NBPF > 0
if(sc->arpcom.ac_if.if_bpf)
bpf_tap(&sc->arpcom.ac_if, sc->el_pktbuf, len);
#endif
@@ -438,7 +438,7 @@
eh = (struct ether_header *)buf;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Check if there's a bpf filter listening on this interface.
* If so, hand off the raw packet to bpf.
Index: src/sys/i386/isa/if_ep.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_ep.c,v
retrieving revision 1.79
diff -u -r1.79 if_ep.c
--- if_ep.c 1999/01/31 22:41:51 1.79
+++ if_ep.c 1999/07/02 08:09:12
@@ -59,7 +59,7 @@
#include "ep.h"
#if NEP > 0
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -93,7 +93,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -635,7 +635,7 @@
ep_fset(F_RX_FIRST);
sc->top = sc->mcur = 0;
-#if NBPFILTER > 0
+#if NBPF > 0
if (!attached) {
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
}
@@ -871,7 +871,7 @@
while (pad--)
outb(BASE + EP_W1_TX_PIO_WR_1, 0); /* Padding */
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, top);
}
@@ -1137,7 +1137,7 @@
top->m_pkthdr.rcvif = &sc->arpcom.ac_if;
top->m_pkthdr.len = sc->cur_len;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, top);
Index: src/sys/i386/isa/if_ex.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_ex.c,v
retrieving revision 1.15
diff -u -r1.15 if_ex.c
--- if_ex.c 1999/05/02 22:01:24 1.15
+++ if_ex.c 1999/07/02 08:09:12
@@ -37,7 +37,7 @@
#include "ex.h"
#if NEX > 0
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -65,7 +65,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -294,7 +294,7 @@
/*
* If BPF is in the kernel, call the attach for it
*/
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
DODEBUG(Start_End, printf("ex_attach%d: finish\n", unit););
@@ -520,7 +520,7 @@
sc->tx_last = dest;
sc->tx_tail = next;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf != NULL)
bpf_mtap(ifp, opkt);
#endif
@@ -727,7 +727,7 @@
} /* QQQ */
}
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf != NULL) {
bpf_mtap(ifp, ipkt);
Index: src/sys/i386/isa/if_fe.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_fe.c,v
retrieving revision 1.50
diff -u -r1.50 if_fe.c
--- if_fe.c 1999/05/04 12:59:59 1.50
+++ if_fe.c 1999/07/02 08:09:12
@@ -70,7 +70,7 @@
*/
#include "fe.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_fe.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -110,7 +110,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -2763,7 +2763,7 @@
sc->sc_unit);
}
-#if NBPFILTER > 0
+#if NBPF > 0
/* If BPF is in the kernel, call the attach for it. */
bpfattach(&sc->sc_if, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -3132,7 +3132,7 @@
* and only if it is in "receive everything"
* mode.)
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if ( sc->sc_if.if_bpf
&& !( sc->sc_if.if_flags & IFF_PROMISC ) ) {
bpf_mtap( &sc->sc_if, m );
@@ -3764,7 +3764,7 @@
#define ETHER_ADDR_IS_MULTICAST(A) (*(char *)(A) & 1)
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Check if there's a BPF listener on this interface.
* If it is, hand off the raw packet to bpf.
Index: src/sys/i386/isa/if_ie.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_ie.c,v
retrieving revision 1.60
diff -u -r1.60 if_ie.c
--- if_ie.c 1999/05/13 12:21:41 1.60
+++ if_ie.c 1999/07/02 08:09:12
@@ -125,7 +125,7 @@
#include <net/if_types.h>
#include <net/if_dl.h>
-#include "bpfilter.h"
+#include "bpf.h"
#ifdef INET
#include <netinet/in.h>
@@ -153,7 +153,7 @@
#include <i386/isa/if_iee16.h>
#include <i386/isa/elink.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -842,7 +842,7 @@
if (ie->hard_type == IE_EE16)
at_shutdown(ee16_shutdown, ie, SHUTDOWN_POST_SYNC);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -1101,7 +1101,7 @@
* Receiving all multicasts, but no unicasts except those
* destined for us.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
/* BPF gets this packet if anybody cares */
*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
#endif
@@ -1117,14 +1117,14 @@
* Receiving all packets. These need to be passed on to
* BPF.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
#endif
/* If for us, accept and hand up to BPF */
if (ether_equal(eh->ether_dhost, ie->arpcom.ac_enaddr))
return (1);
-#if NBPFILTER > 0
+#if NBPF > 0
if (*to_bpf)
*to_bpf = 2; /* we don't need to see it */
#endif
@@ -1142,7 +1142,7 @@
for (i = 0; i < ie->mcast_count; i++) {
if (ether_equal(eh->ether_dhost,
(u_char *)&ie->mcast_addrs[i])) {
-#if NBPFILTER > 0
+#if NBPF > 0
if (*to_bpf)
*to_bpf = 1;
#endif
@@ -1156,7 +1156,7 @@
* Acting as a multicast router, and BPF running at the same
* time. Whew! (Hope this is a fast machine...)
*/
-#if NBPFILTER > 0
+#if NBPF > 0
*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
#endif
/* We want to see multicasts. */
@@ -1168,7 +1168,7 @@
return (1);
/* Anything else goes to BPF but nothing else. */
-#if NBPFILTER > 0
+#if NBPF > 0
if (*to_bpf)
*to_bpf = 2;
#endif
@@ -1183,7 +1183,7 @@
* for the multicast filter), but it will do in this case,
* and we want to get out of here as quickly as possible.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
*to_bpf = (ie->arpcom.ac_if.if_bpf != 0);
#endif
return (1);
@@ -1420,7 +1420,7 @@
struct mbuf *m = 0;
struct ether_header eh;
-#if NBPFILTER > 0
+#if NBPF > 0
int bpf_gets_it = 0;
#endif
@@ -1439,7 +1439,7 @@
ie->rfhead = (ie->rfhead + 1) % ie->nframes;
if (rfd.ie_fd_status & IE_FD_OK) {
-#if NBPFILTER > 0
+#if NBPF > 0
if (ieget(unit, ie, &m, &eh, &bpf_gets_it)) {
#else
if (ieget(unit, ie, &m, &eh, (int *)0)) {
@@ -1466,7 +1466,7 @@
m_freem(last_not_for_us);
last_not_for_us = 0;
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Check for a BPF filter; if so, hand it up. Note that we have to
* stick an extra mbuf up front, because bpf_mtap expects to have
@@ -1494,7 +1494,7 @@
last_not_for_us = m;
return;
}
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
/*
* In here there used to be code to check destination addresses upon
* receipt of a packet. We have deleted that code, and replaced it
@@ -1578,7 +1578,7 @@
m_freem(m0);
len = max(len, ETHER_MIN_LEN);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* See if bpf is listening on this interface, let it see the
* packet before we commit it to the wire.
Index: src/sys/i386/isa/if_le.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_le.c,v
retrieving revision 1.50
diff -u -r1.50 if_le.c
--- if_le.c 1999/05/11 19:54:12 1.50
+++ if_le.c 1999/07/02 08:09:12
@@ -52,7 +52,7 @@
#include <net/if_types.h>
#include <net/if_dl.h>
-#include "bpfilter.h"
+#include "bpf.h"
#ifdef INET
#include <netinet/in.h>
@@ -77,7 +77,7 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -370,7 +370,7 @@
ifp->if_addrlen = 6;
ifp->if_hdrlen = 14;
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -412,7 +412,7 @@
}
MEMCPY(&eh, seg1, sizeof(eh));
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->le_if.if_bpf != NULL && seg2 == NULL) {
bpf_tap(&sc->le_if, seg1, total_len);
/*
@@ -469,7 +469,7 @@
MEMCPY(mtod(m, caddr_t), seg1, len1);
if (seg2 != NULL)
MEMCPY(mtod(m, caddr_t) + len1, seg2, total_len - len1);
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->le_if.if_bpf != NULL && seg2 != NULL) {
bpf_mtap(&sc->le_if, m);
/*
@@ -1142,7 +1142,7 @@
LE_OUTB(sc, LEMAC_REG_TQ, tx_pg); /* tell chip to transmit this
packet */
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->le_if.if_bpf)
bpf_mtap(&sc->le_if, m);
#endif
Index: src/sys/i386/isa/if_lnc.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_lnc.c,v
retrieving revision 1.60
diff -u -r1.60 if_lnc.c
--- if_lnc.c 1999/05/09 23:24:47 1.60
+++ if_lnc.c 1999/07/02 08:09:12
@@ -64,7 +64,7 @@
#include "lnc.h"
#if NLNC > 0
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
/* Some defines that should really be in generic locations */
@@ -88,7 +88,7 @@
#include <netinet/if_ether.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -613,7 +613,7 @@
eh = (struct ether_header *) head->m_data;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf)
bpf_mtap(&sc->arpcom.ac_if, head);
#endif
@@ -1295,7 +1295,7 @@
printf("%s", ic_ident[sc->nic.ic]);
printf(" address %6D\n", sc->arpcom.ac_enaddr, ":");
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(&sc->arpcom.ac_if, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -1809,7 +1809,7 @@
ifp->if_timer = 2;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf)
bpf_mtap(&sc->arpcom.ac_if, head);
#endif
Index: src/sys/i386/isa/if_lnc.h
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_lnc.h,v
retrieving revision 1.10
diff -u -r1.10 if_lnc.h
--- if_lnc.h 1999/01/31 00:56:32 1.10
+++ if_lnc.h 1999/07/02 08:08:52
@@ -39,7 +39,7 @@
* Initialize multicast address hashing registers to accept
* all multicasts (only used when in promiscuous mode)
*/
-#if NBPFILTER > 0
+#if NBPF > 0
#define MULTI_INIT_ADDR 0xff
#else
#define MULTI_INIT_ADDR 0
Index: src/sys/i386/isa/if_rdp.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_rdp.c,v
retrieving revision 1.3
diff -u -r1.3 if_rdp.c
--- if_rdp.c 1999/01/12 00:36:31 1.3
+++ if_rdp.c 1999/07/02 08:09:12
@@ -62,7 +62,7 @@
*/
#include "rdp.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -629,7 +629,7 @@
/*
* If BPF is in the kernel, call the attach for it
*/
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
return 1;
@@ -814,7 +814,7 @@
/*
* Tap off here if there is a bpf listener.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
}
@@ -862,7 +862,7 @@
}
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Promiscuous flag may have changed, propagage this
* to the NIC.
@@ -1164,7 +1164,7 @@
outb(sc->baseaddr + lpt_control, Ctrl_SelData);
WrNib(sc, CMR1, CMR1_RDPAC);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Check if there's a BPF listener on this interface. If so, hand off
Index: src/sys/i386/isa/if_sr.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_sr.c,v
retrieving revision 1.23
diff -u -r1.23 if_sr.c
--- if_sr.c 1999/05/06 22:14:46 1.23
+++ if_sr.c 1999/07/02 08:09:13
@@ -53,7 +53,7 @@
#else
#define NFR 0
#endif
-#include "bpfilter.h"
+#include "bpf.h"
#include "sppp.h"
#if NSPPP <= 0
@@ -71,7 +71,7 @@
#include <net/if.h>
#include <net/if_sppp.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -848,7 +848,7 @@
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
#endif
}
@@ -1119,7 +1119,7 @@
sc->unit, mtx, len);
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, mtx);
#endif
@@ -2462,7 +2462,7 @@
*/
sr_copy_rxbuf(m, sc, len); /* copy from DPRAM */
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m);
#endif
Index: src/sys/i386/isa/if_wi.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_wi.c,v
retrieving revision 1.6
diff -u -r1.6 if_wi.c
--- if_wi.c 1999/06/06 16:44:04 1.6
+++ if_wi.c 1999/07/02 08:09:13
@@ -67,7 +67,7 @@
#define WI_HERMES_AUTOINC_WAR /* Work around data write autoinc bug. */
#define WI_HERMES_STATS_WAR /* Work around stats counter bug. */
-#include "bpfilter.h"
+#include "bpf.h"
#include "card.h"
#include "wi.h"
@@ -94,7 +94,7 @@
#include <netinet/if_ether.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -363,7 +363,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -446,7 +446,7 @@
ifp->if_ipackets++;
-#if NBPFILTER > 0
+#if NBPF > 0
/* Handle BPF listeners. */
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
@@ -1222,7 +1222,7 @@
m0->m_pkthdr.len + 2);
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listner, bounce a copy of
* this frame to him.
Index: src/sys/i386/isa/if_wl.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_wl.c,v
retrieving revision 1.21
diff -u -r1.21 if_wl.c
--- if_wl.c 1999/04/27 11:15:02 1.21
+++ if_wl.c 1999/07/02 08:09:13
@@ -190,7 +190,7 @@
#include "wl.h"
#include "opt_wavelan.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#include <sys/param.h>
@@ -214,7 +214,7 @@
#include <netinet/if_ether.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -510,7 +510,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -895,7 +895,7 @@
ifp = &(sc->wl_if);
IF_DEQUEUE(&ifp->if_snd, m);
if (m != (struct mbuf *)0) {
-#if NBPFILTER > 0
+#if NBPF > 0
/* let BPF see it before we commit it */
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
@@ -1080,7 +1080,7 @@
m->m_pkthdr.len = clen;
-#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.
Index: src/sys/i386/isa/if_ze.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_ze.c,v
retrieving revision 1.58
diff -u -r1.58 if_ze.c
--- if_ze.c 1999/05/06 18:43:58 1.58
+++ if_ze.c 1999/07/02 08:09:13
@@ -64,7 +64,7 @@
#include "ze.h"
#if NZE > 0
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -92,7 +92,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -650,7 +650,7 @@
/*
* If BPF is in the kernel, call the attach for it
*/
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -871,7 +871,7 @@
for (i = 0; i < ETHER_ADDR_LEN; ++i)
outb(sc->nic_addr + ED_P1_PAR0 + i, sc->arpcom.ac_enaddr[i]);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Initialize multicast address hashing registers to accept
* all multicasts (only used when in promiscuous mode)
@@ -1042,7 +1042,7 @@
/*
* If there is BPF support in the configuration, tap off here.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m0);
}
@@ -1434,7 +1434,7 @@
((ifp->if_flags & IFF_RUNNING) == 0))
ze_init(ifp->if_unit);
}
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_flags & IFF_PROMISC) {
/*
* Set promiscuous mode on interface.
@@ -1518,7 +1518,7 @@
m = ze_ring_to_mbuf(sc, buf, m, len);
if (m == NULL) goto bad;
-#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.
Index: src/sys/i386/isa/if_zp.c
===================================================================
RCS file: /home/ncvs/src/sys/i386/isa/if_zp.c,v
retrieving revision 1.51
diff -u -r1.51 if_zp.c
--- if_zp.c 1999/04/19 06:56:24 1.51
+++ if_zp.c 1999/07/02 08:09:13
@@ -114,7 +114,7 @@
#include "zp.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@@ -145,7 +145,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -568,7 +568,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
#if NAPM > 0
@@ -761,7 +761,7 @@
while (pad--)
outb(BASE + EP_W1_TX_PIO_WR_1, 0); /* Padding */
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf) {
bpf_mtap(&sc->arpcom.ac_if, top);
}
@@ -975,7 +975,7 @@
outw(BASE + EP_COMMAND, RX_DISCARD_TOP_PACK);
while (inw(BASE + EP_STATUS) & S_COMMAND_IN_PROGRESS);
++sc->arpcom.ac_if.if_ipackets;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf) {
bpf_mtap(&sc->arpcom.ac_if, top);
Index: src/sys/i4b/driver/i4b_ipr.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/driver/i4b_ipr.c,v
retrieving revision 1.4
diff -u -r1.4 i4b_ipr.c
--- i4b_ipr.c 1999/05/20 10:08:58 1.4
+++ i4b_ipr.c 1999/07/02 08:09:13
@@ -110,8 +110,8 @@
/* undef to uncompress in the mbuf itself */
#endif /* IPR_VJ */
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <sys/time.h>
#include <net/bpf.h>
#endif
@@ -350,7 +350,7 @@
if_attach(&sc->sc_if);
-#if NBPFILTER > 0
+#if NBPF > 0
#ifdef __FreeBSD__
bpfattach(&sc->sc_if, DLT_NULL, sizeof(u_int));
#else
@@ -994,7 +994,7 @@
sc->sc_inb += m->m_pkthdr.len;
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
if(sc->sc_if.if_bpf)
{
/* prepend the address family as a four byte field */
@@ -1010,7 +1010,7 @@
bpf_mtap(sc->sc_if.if_bpf, &mm);
#endif
}
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
if(IF_QFULL(&ipintrq))
{
@@ -1062,7 +1062,7 @@
microtime(&sc->sc_if.if_lastchange);
-#if NBPFILTER > 0
+#if NBPF > 0
if(sc->sc_if.if_bpf)
{
/* prepend the address family as a four byte field */
@@ -1079,7 +1079,7 @@
bpf_mtap(sc->sc_if.if_bpf, &mm);
#endif
}
-#endif /* NBPFILTER */
+#endif /* NBPF */
#if I4BIPRACCT
sc->sc_outb += m->m_pkthdr.len; /* size before compression */
Index: src/sys/i4b/driver/i4b_isppp.c
===================================================================
RCS file: /home/ncvs/src/sys/i4b/driver/i4b_isppp.c,v
retrieving revision 1.3
diff -u -r1.3 i4b_isppp.c
--- i4b_isppp.c 1999/05/20 10:09:01 1.3
+++ i4b_isppp.c 1999/07/02 08:09:13
@@ -74,8 +74,8 @@
#include <netinet/in_var.h>
#include <netinet/ip.h>
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <sys/time.h>
#include <net/bpf.h>
#endif
@@ -290,7 +290,7 @@
sppp_attach(&sc->sc_if);
if_attach(&sc->sc_if);
-#if NBPFILTER > 0
+#if NBPF > 0
#ifdef __FreeBSD__
bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN);
CALLOUT_INIT(&sc->sc_ch);
@@ -361,7 +361,7 @@
while ((m = sppp_dequeue(&sc->sc_if)) != NULL)
{
-#if NBPFILTER > 0
+#if NBPF > 0
#ifdef __FreeBSD__
if (ifp->if_bpf)
bpf_mtap(ifp, m);
@@ -371,7 +371,7 @@
if (ifp->if_bpf)
bpf_mtap(ifp->if_bpf, m);
#endif
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
microtime(&ifp->if_lastchange);
@@ -654,7 +654,7 @@
printf("i4bisppp_rx_data_ready: received packet!\n");
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#ifdef __FreeBSD__
if(sc->sc_if.if_bpf)
@@ -666,7 +666,7 @@
bpf_mtap(sc->sc_if.if_bpf, m);
#endif
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
s = splimp();
Index: src/sys/modules/fxp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/fxp/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 1999/04/18 13:31:23 1.2
+++ Makefile 1999/07/02 08:09:13
@@ -3,15 +3,15 @@
S = ${.CURDIR}/../..
.PATH: $S/pci
KMOD = fxp
-SRCS = if_fxp.c fxp.h bpfilter.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES += fxp.h bpfilter.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS = if_fxp.c fxp.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES += fxp.h bpf.h opt_bdg.h device_if.h bus_if.h pci_if.h
CFLAGS += ${DEBUG_FLAGS}
fxp.h:
echo "#define NFXP 1" > fxp.h
-bpfilter.h:
- echo "#define NBPFILTER 0" > bpfilter.h
+bpf.h:
+ echo "#define NBPF 0" > bpf.h
opt_bdg.h:
touch opt_bdg.h
Index: src/sys/modules/if_disc/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_disc/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 1999/04/28 01:17:58 1.7
+++ Makefile 1999/07/02 08:09:13
@@ -2,16 +2,16 @@
.PATH: ${.CURDIR}/../../net
KMOD= if_disc
-SRCS= if_disc.c bpfilter.h opt_inet.h
+SRCS= if_disc.c bpf.h opt_inet.h
NOMAN=
-NBPFILTER?= 1
+NBPF?= 1
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h opt_inet.h
+CLEANFILES+= bpf.h opt_inet.h
-bpfilter.h:
- echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+bpf.h:
+ echo "#define NBPF ${NBPF}" > bpf.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
Index: src/sys/modules/if_ppp/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_ppp/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 1999/04/28 01:18:02 1.17
+++ Makefile 1999/07/02 08:09:13
@@ -3,7 +3,7 @@
.PATH: ${.CURDIR}/../../net
KMOD= if_ppp
SRCS= if_ppp.c ppp_tty.c slcompress.c \
- bpfilter.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
+ bpf.h ppp.h opt_inet.h opt_ipx.h opt_ppp.h vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.c vnode_if.h
@@ -23,10 +23,10 @@
SRCS+= ppp_deflate.c zlib.c
.endif
-CLEANFILES+= bpfilter.h opt_inet.h opt_ipx.h opt_ppp.h ppp.h
+CLEANFILES+= bpf.h opt_inet.h opt_ipx.h opt_ppp.h ppp.h
-bpfilter.h:
- echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
+bpf.h:
+ echo "#define NBPF ${PPP_FILTER}" > bpf.h
ppp.h:
echo "#define NPPP ${NPPP}" > ppp.h
Index: src/sys/modules/if_sl/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_sl/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 1999/04/28 01:18:05 1.8
+++ Makefile 1999/07/02 08:09:13
@@ -2,18 +2,18 @@
.PATH: ${.CURDIR}/../../net
KMOD= if_sl
-SRCS= if_sl.c slcompress.c bpfilter.h opt_inet.h sl.h
+SRCS= if_sl.c slcompress.c bpf.h opt_inet.h sl.h
NOMAN=
-NBPFILTER?= 1
+NBPF?= 1
NSL?= 2
PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h opt_inet.h sl.h
+CLEANFILES+= bpf.h opt_inet.h sl.h
-bpfilter.h:
- echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+bpf.h:
+ echo "#define NBPF ${NBPF}" > bpf.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
Index: src/sys/modules/if_tun/Makefile
===================================================================
RCS file: /home/ncvs/src/sys/modules/if_tun/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 1999/04/28 01:18:08 1.9
+++ Makefile 1999/07/02 08:09:13
@@ -2,18 +2,18 @@
.PATH: ${.CURDIR}/../../net
KMOD= if_tun
-SRCS= if_tun.c bpfilter.h opt_devfs.h opt_inet.h tun.h vnode_if.h
+SRCS= if_tun.c bpf.h opt_devfs.h opt_inet.h tun.h vnode_if.h
NOMAN=
CLEANFILES+= vnode_if.h vnode_if.c
-NBPFILTER?= 1
+NBPF?= 1
NTUN?= 2
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h opt_devfs.h opt_inet.h tun.h
+CLEANFILES+= bpf.h opt_devfs.h opt_inet.h tun.h
-bpfilter.h:
- echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+bpf.h:
+ echo "#define NBPF ${NBPF}" > bpf.h
opt_devfs.h:
touch opt_devfs.h
Index: src/sys/net/bpf.c
===================================================================
RCS file: /home/ncvs/src/sys/net/bpf.c,v
retrieving revision 1.51
diff -u -r1.51 bpf.c
--- bpf.c 1999/05/31 11:28:08 1.51
+++ bpf.c 1999/07/02 08:09:13
@@ -40,7 +40,7 @@
* $Id: bpf.c,v 1.51 1999/05/31 11:28:08 phk Exp $
*/
-#include "bpfilter.h"
+#include "bpf.h"
#ifndef __GNUC__
#define inline
@@ -84,7 +84,7 @@
#include <sys/devfsext.h>
#endif /*DEVFS*/
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Older BSDs don't have kernel malloc.
@@ -114,7 +114,7 @@
* bpf_dtab holds the descriptors, indexed by minor device #
*/
static struct bpf_if *bpf_iflist;
-static struct bpf_d bpf_dtab[NBPFILTER];
+static struct bpf_d bpf_dtab[NBPF];
static int bpf_dtab_init;
static int bpf_allocbufs __P((struct bpf_d *));
@@ -366,7 +366,7 @@
if (p->p_prison)
return (EPERM);
- if (minor(dev) >= NBPFILTER)
+ if (minor(dev) >= NBPF)
return (ENXIO);
/*
* Each minor can be opened by only one process. If the requested
@@ -1286,7 +1286,7 @@
* Mark all the descriptors free if this hasn't been done.
*/
if (!bpf_dtab_init) {
- for (i = 0; i < NBPFILTER; ++i)
+ for (i = 0; i < NBPF; ++i)
D_MARKFREE(&bpf_dtab[i]);
bpf_dtab_init = 1;
}
@@ -1296,7 +1296,7 @@
}
#ifdef DEVFS
-static void *bpf_devfs_token[NBPFILTER];
+static void *bpf_devfs_token[NBPF];
#endif
static int bpf_devsw_installed;
@@ -1315,7 +1315,7 @@
bpf_devsw_installed = 1;
#ifdef DEVFS
- for ( i = 0 ; i < NBPFILTER ; i++ ) {
+ for ( i = 0 ; i < NBPF ; i++ ) {
bpf_devfs_token[i] =
devfs_add_devswf(&bpf_cdevsw, i, DV_CHR, 0, 0,
0600, "bpf%d", i);
@@ -1326,7 +1326,7 @@
SYSINIT(bpfdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,bpf_drvinit,NULL)
-#else /* !BPFILTER */
+#else /* !BPF */
/*
* NOP stubs to allow bpf-using drivers to load and function.
*
Index: src/sys/net/if_disc.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_disc.c,v
retrieving revision 1.21
diff -u -r1.21 if_disc.c
--- if_disc.c 1998/12/14 01:59:16 1.21
+++ if_disc.c 1999/07/02 08:09:14
@@ -51,7 +51,7 @@
#include <net/route.h>
#include <net/bpf.h>
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#ifdef TINY_DSMTU
@@ -85,7 +85,7 @@
ifp->if_hdrlen = 0;
ifp->if_addrlen = 0;
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_NULL, sizeof(u_int));
#endif
}
@@ -99,7 +99,7 @@
{
if ((m->m_flags & M_PKTHDR) == 0)
panic("discoutput no HDR");
-#if NBPFILTER > 0
+#if NBPF > 0
/* BPF write needs to be handled specially */
if (dst->sa_family == AF_UNSPEC) {
dst->sa_family = *(mtod(m, int *));
Index: src/sys/net/if_fddisubr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_fddisubr.c,v
retrieving revision 1.34
diff -u -r1.34 if_fddisubr.c
--- if_fddisubr.c 1999/01/27 22:42:13 1.34
+++ if_fddisubr.c 1999/07/02 08:09:14
@@ -105,7 +105,7 @@
extern struct ifqueue pkintrq;
#endif
-#include "bpfilter.h"
+#include "bpf.h"
#define senderr(e) { error = (e); goto bad;}
@@ -309,7 +309,7 @@
break;
}
-#if NBPFILTER > 0
+#if NBPF > 0
case AF_IMPLINK:
{
fh = mtod(m, struct fddi_header *);
Index: src/sys/net/if_iso88025subr.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_iso88025subr.c,v
retrieving revision 1.2
diff -u -r1.2 if_iso88025subr.c
--- if_iso88025subr.c 1999/03/10 10:11:43 1.2
+++ if_iso88025subr.c 1999/07/02 08:08:54
@@ -68,7 +68,7 @@
#include <netinet/if_ether.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
Index: src/sys/net/if_loop.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_loop.c,v
retrieving revision 1.38
diff -u -r1.38 if_loop.c
--- if_loop.c 1999/02/20 21:03:53 1.38
+++ if_loop.c 1999/07/02 08:09:14
@@ -82,8 +82,8 @@
#include <netatalk/at_var.h>
#endif NETATALK
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpfdesc.h>
#endif
@@ -122,7 +122,7 @@
ifp->if_type = IFT_LOOP;
ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_NULL, sizeof(u_int));
#endif
}
@@ -186,7 +186,7 @@
if ((m->m_flags & M_PKTHDR) == 0)
panic("if_simloop: no HDR");
m->m_pkthdr.rcvif = ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
/* BPF write needs to be handled specially */
if (dst->sa_family == AF_UNSPEC) {
dst->sa_family = *(mtod(m, int *));
Index: src/sys/net/if_ppp.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_ppp.c,v
retrieving revision 1.60
diff -u -r1.60 if_ppp.c
--- if_ppp.c 1999/04/27 11:17:00 1.60
+++ if_ppp.c 1999/07/02 08:09:14
@@ -112,12 +112,12 @@
#include <netipx/ipx_if.h>
#endif
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#endif
-#if defined(PPP_FILTER) && NBPFILTER == 0
+#if defined(PPP_FILTER) && NBPF == 0
#error "PPP_FILTER requires bpf"
#endif
@@ -221,7 +221,7 @@
sc->sc_fastq.ifq_maxlen = IFQ_MAXLEN;
sc->sc_rawq.ifq_maxlen = IFQ_MAXLEN;
if_attach(&sc->sc_if);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(&sc->sc_if, DLT_PPP, PPP_HDRLEN);
#endif
}
@@ -828,7 +828,7 @@
#endif /* PPP_FILTER */
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* See if bpf wants to look at the packet.
*/
@@ -1463,7 +1463,7 @@
#endif /* PPP_FILTER */
}
-#if NBPFILTER > 0
+#if NBPF > 0
/* See if bpf wants to look at the packet. */
if (sc->sc_if.if_bpf)
bpf_mtap(&sc->sc_if, m);
Index: src/sys/net/if_sl.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_sl.c,v
retrieving revision 1.74
diff -u -r1.74 if_sl.c
--- if_sl.c 1999/04/27 11:17:02 1.74
+++ if_sl.c 1999/07/02 08:09:14
@@ -68,7 +68,7 @@
#include "sl.h"
#if NSL > 0
-#include "bpfilter.h"
+#include "bpf.h"
#include "opt_inet.h"
#if !defined(ACTUALLY_LKM_NOT_KERNEL) && !defined(KLD_MODULE)
#include "opt_slip.h"
@@ -105,7 +105,7 @@
#include <net/if_slvar.h>
#include <net/slip.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -150,7 +150,7 @@
* time. So, setting SLIP_HIWAT to ~100 guarantees that we'll lose
* at most 1% while maintaining good interactive response.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
#define BUFOFFSET (128+sizeof(struct ifnet **)+SLIP_HDRLEN)
#else
#define BUFOFFSET (128+sizeof(struct ifnet **))
@@ -232,7 +232,7 @@
sc->sc_if.if_linkmib = sc;
sc->sc_if.if_linkmiblen = sizeof *sc;
if_attach(&sc->sc_if);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(&sc->sc_if, DLT_SLIP, SLIP_HDRLEN);
#endif
}
@@ -538,7 +538,7 @@
register struct ip *ip;
int s;
struct mbuf *m2;
-#if NBPFILTER > 0
+#if NBPF > 0
u_char bpfbuf[SLTMAX + SLIP_HDRLEN];
register int len = 0;
#endif
@@ -583,7 +583,7 @@
* queueing, and the connection id compression will get
* munged when this happens.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf) {
/*
* We need to save the TCP/IP header before it's
@@ -612,7 +612,7 @@
*mtod(m, u_char *) |= sl_compress_tcp(m, ip,
&sc->sc_comp, 1);
}
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf) {
/*
* Put the SLIP pseudo-"link header" in place. The
@@ -775,7 +775,7 @@
register struct mbuf *m;
register int len;
int s;
-#if NBPFILTER > 0
+#if NBPF > 0
u_char chdr[CHDR_LEN];
#endif
@@ -844,7 +844,7 @@
/* less than min length packet - ignore */
goto newpack;
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf) {
/*
* Save the compressed header, so we
@@ -885,7 +885,7 @@
} else
goto error;
}
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf) {
/*
* Put the SLIP pseudo-"link header" in place.
Index: src/sys/net/if_tun.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_tun.c,v
retrieving revision 1.59
diff -u -r1.59 if_tun.c
--- if_tun.c 1999/06/19 18:42:28 1.59
+++ if_tun.c 1999/07/02 08:09:14
@@ -54,8 +54,8 @@
#include <netns/ns_if.h>
#endif
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -144,7 +144,7 @@
ifp->if_flags = IFF_POINTOPOINT | IFF_MULTICAST;
ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_NULL, sizeof(u_int));
#endif
}
@@ -340,7 +340,7 @@
return EHOSTDOWN;
}
-#if NBPFILTER > 0
+#if NBPF > 0
/* BPF write needs to be handled specially */
if (dst->sa_family == AF_UNSPEC) {
dst->sa_family = *(mtod(m0, int *));
@@ -366,7 +366,7 @@
bpf_mtap(ifp, &m);
}
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
/* prepend sockaddr? this may abort if the mbuf allocation fails */
if (tp->tun_flags & TUN_LMODE) {
@@ -628,7 +628,7 @@
top->m_pkthdr.len = tlen;
top->m_pkthdr.rcvif = ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
/*
* We need to prepend the address family as
Index: src/sys/net/if_vlan.c
===================================================================
RCS file: /home/ncvs/src/sys/net/if_vlan.c,v
retrieving revision 1.7
diff -u -r1.7 if_vlan.c
--- if_vlan.c 1999/04/07 23:26:43 1.7
+++ if_vlan.c 1999/07/02 08:09:14
@@ -57,7 +57,7 @@
#include "vlan.h"
#if NVLAN > 0
#include "opt_inet.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/kernel.h>
@@ -69,7 +69,7 @@
#include <sys/sysctl.h>
#include <sys/systm.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
#include <net/ethernet.h>
@@ -176,7 +176,7 @@
ifp->if_snd.ifq_maxlen = ifqmaxlen;
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
/* Now undo some of the damage... */
@@ -209,10 +209,10 @@
IF_DEQUEUE(&ifp->if_snd, m);
if (m == 0)
break;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m);
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
/*
* If the LINK0 flag is set, it means the underlying interface
@@ -304,7 +304,7 @@
*/
m->m_pkthdr.rcvif = &ifv->ifv_if;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifv->ifv_if.if_bpf) {
/*
* Do the usual BPF fakery. Note that we don't support
@@ -356,7 +356,7 @@
m->m_len -= EVL_ENCAPLEN;
m->m_pkthdr.len -= EVL_ENCAPLEN;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifv->ifv_if.if_bpf) {
/*
* Do the usual BPF fakery. Note that we don't support
Index: src/sys/pc98/conf/GENERIC98
===================================================================
RCS file: /home/ncvs/src/sys/pc98/conf/GENERIC98,v
retrieving revision 1.77
diff -u -r1.77 GENERIC98
--- GENERIC98 1999/06/18 14:48:18 1.77
+++ GENERIC98 1999/07/02 08:09:14
@@ -262,8 +262,8 @@
options SYSVSEM
-# 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/pc98/if_ed.c
===================================================================
RCS file: /home/ncvs/src/sys/pc98/pc98/if_ed.c,v
retrieving revision 1.63
diff -u -r1.63 if_ed.c
--- if_ed.c 1999/05/10 09:06:12 1.63
+++ if_ed.c 1999/07/02 08:09:14
@@ -60,7 +60,7 @@
*/
#include "ed.h"
-#include "bpfilter.h"
+#include "bpf.h"
#include "pnp.h"
#ifndef EXTRA_ED
@@ -87,7 +87,7 @@
#include <net/if_dl.h>
#include <net/if_mib.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
#include "opt_bdg.h"
@@ -2463,7 +2463,7 @@
/*
* If BPF is in the kernel, call the attach for it
*/
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
return 1;
@@ -2929,7 +2929,7 @@
/*
* Tap off here if there is a bpf listener.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m0);
}
@@ -3371,7 +3371,7 @@
}
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Promiscuous flag may have changed, so reprogram the RCR.
@@ -3502,7 +3502,7 @@
struct ifnet *ifp ;
int need_more = 1 ; /* in case not bpf */
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->arpcom.ac_if.if_bpf) {
need_more = 0 ;
ed_ring_copy(sc, buf, (char *)eh, len);
@@ -3533,7 +3533,7 @@
*/
ed_ring_copy(sc, buf, (char *)eh, len);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Check if there's a BPF listener on this interface. If so, hand off
Index: src/sys/pc98/pc98/olpt.c
===================================================================
RCS file: /home/ncvs/src/sys/pc98/pc98/olpt.c,v
retrieving revision 1.1
diff -u -r1.1 olpt.c
--- olpt.c 1999/06/18 14:48:26 1.1
+++ olpt.c 1999/07/02 08:09:14
@@ -145,8 +145,8 @@
#include <net/netisr.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#endif
#endif /* INET */
@@ -958,7 +958,7 @@
if_attach(ifp);
printf("lp%d: TCP/IP capable interface\n", unit);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_NULL, LPIPHDRLEN);
#endif
}
@@ -1232,7 +1232,7 @@
IF_DROP(&ipintrq);
goto done;
}
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->sc_if.if_bpf) {
bpf_tap(&sc->sc_if, sc->sc_ifbuf, len);
}
@@ -1424,7 +1424,7 @@
} else {
ifp->if_opackets++;
ifp->if_obytes += m->m_pkthdr.len;
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf) {
/*
* We need to prepend the packet type as
Index: src/sys/pci/if_al.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_al.c,v
retrieving revision 1.4
diff -u -r1.4 if_al.c
--- if_al.c 1999/05/26 22:56:22 1.4
+++ if_al.c 1999/07/02 08:09:16
@@ -49,7 +49,7 @@
* has physical address and multicast address registers.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1066,7 +1066,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(al_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1300,7 +1300,7 @@
ifp->if_ipackets++;
eh = mtod(m, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -1625,7 +1625,7 @@
/* Pack the data into the descriptor. */
al_encap(sc, cur_tx, m_head);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_ax.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_ax.c,v
retrieving revision 1.9
diff -u -r1.9 if_ax.c
--- if_ax.c 1999/05/09 17:06:48 1.9
+++ if_ax.c 1999/07/02 08:09:14
@@ -49,7 +49,7 @@
* the registers.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -65,7 +65,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1308,7 +1308,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(ax_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1542,7 +1542,7 @@
ifp->if_ipackets++;
eh = mtod(m, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -1866,7 +1866,7 @@
if (cur_tx != start_tx)
AX_TXOWN(cur_tx) = AX_TXSTAT_OWN;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_de.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_de.c,v
retrieving revision 1.106
diff -u -r1.106 if_de.c
--- if_de.c 1999/05/10 14:12:26 1.106
+++ if_de.c 1999/07/02 08:09:14
@@ -93,8 +93,8 @@
#include <dev/mii/miivar.h>
#endif
-#include "bpfilter.h"
-#if NBPFILTER > 0
+#include "bpf.h"
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -3539,7 +3539,7 @@
#endif /* TULIP_BUS_DMA */
eh = *mtod(ms, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->tulip_bpf != NULL) {
if (me == ms)
TULIP_BPF_TAP(sc, mtod(ms, caddr_t), total_len);
@@ -3810,7 +3810,7 @@
TULIP_TXMAP_POSTSYNC(sc, map);
sc->tulip_txmaps[sc->tulip_txmaps_free++] = map;
#endif /* TULIP_BUS_DMA */
-#if NBPFILTER > 0
+#if NBPF > 0
if (sc->tulip_bpf != NULL)
TULIP_BPF_MTAP(sc, m);
#endif
@@ -5115,7 +5115,7 @@
#endif
#endif /* __bsdi__ */
-#if NBPFILTER > 0
+#if NBPF > 0
TULIP_BPF_ATTACH(sc);
#endif
Index: src/sys/pci/if_devar.h
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_devar.h,v
retrieving revision 1.13
diff -u -r1.13 if_devar.h
--- if_devar.h 1999/05/26 23:05:23 1.13
+++ if_devar.h 1999/07/02 08:08:55
@@ -961,7 +961,7 @@
#endif
#if BSD >= 199506
#define TULIP_IFP_TO_SOFTC(ifp) ((tulip_softc_t *)((ifp)->if_softc))
-#if NBPFILTER > 0
+#if NBPF > 0
#define TULIP_BPF_MTAP(sc, m) bpf_mtap(&(sc)->tulip_if, m)
#define TULIP_BPF_TAP(sc, p, l) bpf_tap(&(sc)->tulip_if, p, l)
#define TULIP_BPF_ATTACH(sc) bpfattach(&(sc)->tulip_if, DLT_EN10MB,
sizeof(struct ether_header))
@@ -1115,7 +1115,7 @@
* While I think FreeBSD's 2.2 change to the bpf is a nice simplification,
* it does add yet more conditional code to this driver. Sigh.
*/
-#if !defined(TULIP_BPF_MTAP) && NBPFILTER > 0
+#if !defined(TULIP_BPF_MTAP) && NBPF > 0
#define TULIP_BPF_MTAP(sc, m) bpf_mtap((sc)->tulip_bpf, m)
#define TULIP_BPF_TAP(sc, p, l) bpf_tap((sc)->tulip_bpf, p, l)
#define TULIP_BPF_ATTACH(sc) bpfattach(&(sc)->tulip_bpf,
&(sc)->tulip_if, DLT_EN10MB, sizeof(struct ether_header))
Index: src/sys/pci/if_fxp.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_fxp.c,v
retrieving revision 1.69
diff -u -r1.69 if_fxp.c
--- if_fxp.c 1999/05/09 10:45:54 1.69
+++ if_fxp.c 1999/07/02 08:09:15
@@ -34,7 +34,7 @@
* Intel EtherExpress Pro/100B PCI Fast Ethernet driver
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,7 +52,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -419,7 +419,7 @@
*/
ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
ether_ifattach(ifp, enaddr);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(&sc->sc_ethercom.ec_if.if_bpf, ifp, DLT_EN10MB,
sizeof(struct ether_header));
#endif
@@ -598,7 +598,7 @@
*/
ifp->if_snd.ifq_maxlen = FXP_NTXCB - 1;
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -988,7 +988,7 @@
sc->tx_queued++;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Pass packet to bpf if there is a listener.
*/
@@ -1097,12 +1097,12 @@
m->m_pkthdr.len = m->m_len =
total_len ;
eh = mtod(m, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_tap(FXP_BPFTAP_ARG(ifp),
mtod(m, caddr_t),
total_len);
-#endif /* NBPFILTER > 0 */
+#endif /* NBPF > 0 */
#ifdef BRIDGE
if (do_bridge) {
struct ifnet *bdg_ifp ;
Index: src/sys/pci/if_mx.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_mx.c,v
retrieving revision 1.19
diff -u -r1.19 if_mx.c
--- if_mx.c 1999/06/16 16:27:30 1.19
+++ if_mx.c 1999/07/02 08:09:15
@@ -56,7 +56,7 @@
* the NWAY support.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -72,7 +72,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1563,7 +1563,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(mx_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1777,7 +1777,7 @@
eh = mtod(m, struct ether_header *);
m->m_pkthdr.rcvif = ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -2118,7 +2118,7 @@
if (cur_tx != start_tx)
MX_TXOWN(cur_tx) = MX_TXSTAT_OWN;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_pn.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_pn.c,v
retrieving revision 1.21
diff -u -r1.21 if_pn.c
--- if_pn.c 1999/05/28 18:43:10 1.21
+++ if_pn.c 1999/07/02 08:09:15
@@ -57,7 +57,7 @@
* 100BaseTX PHY.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -73,7 +73,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1211,7 +1211,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(pn_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1569,7 +1569,7 @@
eh = mtod(m, struct ether_header *);
m->m_pkthdr.rcvif = ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -1900,7 +1900,7 @@
if (cur_tx != start_tx)
PN_TXOWN(cur_tx) = PN_TXSTAT_OWN;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_rl.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_rl.c,v
retrieving revision 1.17
diff -u -r1.17 if_rl.c
--- if_rl.c 1999/06/19 20:17:37 1.17
+++ if_rl.c 1999/07/02 08:09:15
@@ -83,7 +83,7 @@
* to select which interface to use depending on the chip type.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1234,7 +1234,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(rl_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1417,7 +1417,7 @@
eh = mtod(m, struct ether_header *);
ifp->if_ipackets++;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -1614,7 +1614,7 @@
rl_encap(sc, m_head);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_ti.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_ti.c,v
retrieving revision 1.7
diff -u -r1.7 if_ti.c
--- if_ti.c 1999/06/19 00:36:53 1.7
+++ if_ti.c 1999/07/02 08:09:15
@@ -78,7 +78,7 @@
* - Andrew Gallatin for providing FreeBSD/Alpha support.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include "vlan.h"
#include <sys/param.h>
@@ -96,7 +96,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1735,7 +1735,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -1830,7 +1830,7 @@
eh = mtod(m, struct ether_header *);
m->m_pkthdr.rcvif = ifp;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -2113,7 +2113,7 @@
* If there's a BPF listener, bounce a copy of this frame
* to him.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m_head);
#endif
Index: src/sys/pci/if_tl.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_tl.c,v
retrieving revision 1.32
diff -u -r1.32 if_tl.c
--- if_tl.c 1999/05/09 17:07:01 1.32
+++ if_tl.c 1999/07/02 08:09:15
@@ -178,7 +178,7 @@
* itself thereby reducing the load on the host CPU.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -194,7 +194,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1786,7 +1786,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -1966,7 +1966,7 @@
continue;
}
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -2434,7 +2434,7 @@
* If there's a BPF listener, bounce a copy of this frame
* to him.
*/
-#if NBPFILTER > 0
+#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, cur_tx->tl_mbuf);
#endif
Index: src/sys/pci/if_tx.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_tx.c,v
retrieving revision 1.27
diff -u -r1.27 if_tx.c
--- if_tx.c 1999/05/10 00:20:46 1.27
+++ if_tx.c 1999/07/02 08:09:15
@@ -67,7 +67,7 @@
} \
}
-#include "bpfilter.h"
+#include "bpf.h"
#include "pci.h"
#include "opt_bdg.h"
@@ -107,7 +107,7 @@
#include <netns/ns_if.h>
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
@@ -357,7 +357,7 @@
/* Attach os interface and bpf */
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(&sc->sc_if.if_bpf, ifp, DLT_EN10MB,
sizeof(struct ether_header));
#endif
@@ -554,7 +554,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp,DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -850,7 +850,7 @@
/* Set watchdog timer */
ifp->if_timer = 8;
-#if NBPFILTER > 0
+#if NBPF > 0
if( ifp->if_bpf )
#if defined(__FreeBSD__)
bpf_mtap( ifp, m0 );
@@ -920,15 +920,15 @@
m->m_pkthdr.rcvif = &(sc->sc_if);
m->m_pkthdr.len = m->m_len = len;
-#if NBPFILTER > 0
- /* Give mbuf to BPFILTER */
+#if NBPF > 0
+ /* Give mbuf to BPF */
if( sc->sc_if.if_bpf )
#if defined(__FreeBSD__)
bpf_mtap( &sc->sc_if, m );
#else /* __OpenBSD__ */
bpf_mtap( sc->sc_if.if_bpf, m );
#endif /* __FreeBSD__ */
-#endif /* NBPFILTER */
+#endif /* NBPF */
#ifdef BRIDGE
if (do_bridge) {
@@ -951,7 +951,7 @@
}
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
#ifdef BRIDGE
/*
* This deserves explanation
@@ -961,7 +961,7 @@
* address of one of the other interfaces.
*
* But if the bridge is off, then we have to drop
- * stuff that came in just via bpfilter.
+ * stuff that came in just via bpf.
*/
if (!do_bridge)
#endif
Index: src/sys/pci/if_vr.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_vr.c,v
retrieving revision 1.11
diff -u -r1.11 if_vr.c
--- if_vr.c 1999/05/09 17:07:03 1.11
+++ if_vr.c 1999/07/02 08:09:15
@@ -59,7 +59,7 @@
* transmission.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -75,7 +75,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1110,7 +1110,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@@ -1316,7 +1316,7 @@
eh = mtod(m, struct ether_header *);
m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = total_len;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -1621,7 +1621,7 @@
if (cur_tx != start_tx)
VR_TXOWN(cur_tx) = VR_TXSTAT_OWN;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_wb.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_wb.c,v
retrieving revision 1.10
diff -u -r1.10 if_wb.c
--- if_wb.c 1999/05/13 20:36:00 1.10
+++ if_wb.c 1999/07/02 08:09:15
@@ -83,7 +83,7 @@
* three of my test boards seems fine.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1228,7 +1228,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(wb_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1423,7 +1423,7 @@
ifp->if_ipackets++;
eh = mtod(m, struct ether_header *);
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Handle BPF listeners. Let the BPF user see the packet, but
* don't pass it up to the ether_input() layer unless it's
@@ -1772,7 +1772,7 @@
if (cur_tx != start_tx)
WB_TXOWN(cur_tx) = WB_TXSTAT_OWN;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
Index: src/sys/pci/if_xl.c
===================================================================
RCS file: /home/ncvs/src/sys/pci/if_xl.c,v
retrieving revision 1.40
diff -u -r1.40 if_xl.c
--- if_xl.c 1999/06/01 19:04:23 1.40
+++ if_xl.c 1999/07/02 08:09:15
@@ -89,7 +89,7 @@
* PCI-based NICs.
*/
-#include "bpfilter.h"
+#include "bpf.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -105,7 +105,7 @@
#include <net/if_dl.h>
#include <net/if_media.h>
-#if NBPFILTER > 0
+#if NBPF > 0
#include <net/bpf.h>
#endif
@@ -1791,7 +1791,7 @@
if_attach(ifp);
ether_ifattach(ifp);
-#if NBPFILTER > 0
+#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
at_shutdown(xl_shutdown, sc, SHUTDOWN_POST_SYNC);
@@ -1967,7 +1967,7 @@
m->m_pkthdr.rcvif = ifp;
m->m_pkthdr.len = m->m_len = total_len;
-#if NBPFILTER > 0
+#if NBPF > 0
/* Handle BPF listeners. Let the BPF user see the packet. */
if (ifp->if_bpf)
bpf_mtap(ifp, m);
@@ -1987,7 +1987,7 @@
}
#endif
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* Don't pass packet up to the ether_input() layer unless it's
* a broadcast packet, multicast packet, matches our ethernet
@@ -2381,7 +2381,7 @@
}
prev = cur_tx;
-#if NBPFILTER > 0
+#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.
To Unsubscribe: send mail to majord...@freebsd.org
with "unsubscribe freebsd-hackers" in the body of the message
