d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename bpfilter to bpf.

Browse Source
This commit is contained in:
Dag-Erling Smørgrav 1999-07-06 19:23:32 +00:00
parent 14802b6092
commit 6b5ca0d83e
97 changed files with 577 additions and 577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/alpha/dokern.sh
View File

@ -12,7 +12,7 @@ sed -e '/pty/d' \
-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"

2
release/amd64/dokern.sh
View File

@ -12,7 +12,7 @@ sed -e '/pty/d' \
-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"

2
release/i386/dokern.sh
View File

@ -12,7 +12,7 @@ sed -e '/pty/d' \
-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"

2
release/pc98/dokern.sh
View File

@ -12,7 +12,7 @@ sed -e '/pty/d' \
-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"

4
release/picobsd/router/conf/PICOBSD
View File

@ -1,5 +1,5 @@
#
# $Id: PICOBSD,v 1.11.2.2 1999/02/15 02:49:31 des Exp $
# $Id: PICOBSD,v 1.14 1999/05/24 17:27:30 roger Exp $
#
machine i386
@ -94,7 +94,7 @@ pseudo-device loop
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

2
release/scripts/dokern.sh
View File

@ -12,7 +12,7 @@ sed -e '/pty/d' \
-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"

4
share/man/man4/bpf.4
View File

@ -20,7 +20,7 @@
.\" This document is derived in part from the enet man page (enet.4)
.\" distributed with 4.3BSD Unix.
.\"
.\" $Id: bpf.4,v 1.15 1998/11/03 22:01:21 des Exp $
.\" $Id: bpf.4,v 1.16 1999/01/10 04:59:59 danny Exp $
.\"
.Dd January 16, 1996
.Dt BPF 4
@ -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

12
sys/alpha/tc/am7990.c
View File

@ -1,4 +1,4 @@
/* $Id: am7990.c,v 1.2 1998/12/04 22:54:42 archie Exp $ */
/* $Id: am7990.c,v 1.3 1999/05/10 15:48:01 peter Exp $ */
/* $NetBSD: am7990.c,v 1.43 1998/03/29 22:36:42 mycroft Exp $ */
/*-
@ -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 @@ am7990_config(sc)
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 @@ am7990_meminit(sc)
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 @@ am7990_read(sc, boff, len)
/* 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 @@ am7990_start(ifp)
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.

4
sys/alpha/tc/if_le_dec.c
View File

@ -1,4 +1,4 @@
/* $Id$ */
/* $Id: if_le_dec.c,v 1.1 1998/08/20 08:27:10 dfr Exp $ */
/* $NetBSD: if_le_dec.c,v 1.8 1997/07/22 04:32:21 jonathan Exp $ */
/*-
@ -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>

6
sys/amd64/conf/GENERIC
View File

@ -15,7 +15,7 @@
# device lines is also present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
# $Id: GENERIC,v 1.174 1999/06/20 03:36:46 jkh Exp $
# $Id: GENERIC,v 1.175 1999/06/29 18:55:53 peter Exp $
machine i386
cpu I386_CPU
@ -197,9 +197,9 @@ pseudo-device tun 1 # Packet tunnel, for ppp(1)
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

10
sys/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.614 1999/07/01 18:39:23 jkh Exp $
# $Id: LINT,v 1.615 1999/07/03 21:31:00 jdp Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -381,7 +381,7 @@ options NETATALK #Appletalk communications protocols
# 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 @@ options NETATALK #Appletalk communications protocols
# 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 token #Generic TokenRing
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 ppp 2 #Point-to-point protocol
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:

2
sys/conf/files
View File

@ -392,7 +392,7 @@ ntfs/ntfs_subr.c optional ntfs
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

12
sys/contrib/dev/oltr/if_oltr.c
View File

@ -30,14 +30,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_oltr.c,v 1.4 1999/04/24 20:24:02 peter Exp $
* $Id: if_oltr.c,v 1.5 1999/05/09 17:07:24 peter Exp $
*/
#include "pci.h"
#include "oltr.h"
#include "opt_inet.h"
#include "bpfilter.h"
#include "bpf.h"
#if (NOLTR + NPCI) > 0
@ -90,7 +90,7 @@ char *AdapterName[] = {
#include <net/iso88025.h>
#include <net/if_media.h>
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -632,7 +632,7 @@ oltr_attach_common(sc)
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 @@ oltr_start(ifp)
goto bad;
}
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m0);
#endif
@ -1351,7 +1351,7 @@ DriverReceiveFrameCompleted(DriverHandle, ByteCount, FragmentCount, FragmentHand
}
ifp->if_ipackets++;
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m0);
#endif

12
sys/dev/ar/if_ar.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.25 1999/03/30 13:28:22 phk Exp $
* $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
*/
/*
@ -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 @@ arattach(struct isa_device *id)
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 @@ arstart(struct ifnet *ifp)
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_get_packets(struct ar_softc *sc)
}
}
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

12
sys/dev/ar/if_ar_isa.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.25 1999/03/30 13:28:22 phk Exp $
* $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
*/
/*
@ -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 @@ arattach(struct isa_device *id)
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 @@ arstart(struct ifnet *ifp)
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_get_packets(struct ar_softc *sc)
}
}
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

12
sys/dev/cs/if_cs.c
View File

@ -27,7 +27,7 @@
*/
/*
* $Id: if_cs.c,v 1.9 1999/01/28 01:59:53 dillon Exp $
* $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
*
* Device driver for Crystal Semiconductor CS8920 based ethernet
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@ -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 @@ cs_attach(struct cs_softc *sc, int unit, int flags)
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 @@ cs_get_packet(struct cs_softc *sc)
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_start(struct ifnet *ifp)
cs_write_mbufs(sc, m);
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
}

12
sys/dev/de/if_de.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
/* $Id: if_de.c,v 1.106 1999/05/10 14:12:26 peter Exp $ */
/* $Id: if_de.c,v 1.107 1999/07/03 20:17:02 peter Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -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
@ -3536,7 +3536,7 @@ tulip_rx_intr(
#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);
@ -3807,7 +3807,7 @@ tulip_tx_intr(
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
@ -5112,7 +5112,7 @@ tulip_attach(
#endif
#endif /* __bsdi__ */
#if NBPFILTER > 0
#if NBPF > 0
TULIP_BPF_ATTACH(sc);
#endif

6
sys/dev/de/if_devar.h
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_devar.h,v 1.31 1998/09/29 22:40:52 matt Exp $ */
/* $Id: if_devar.h,v 1.12 1998/11/06 02:13:14 peter Exp $ */
/* $Id: if_devar.h,v 1.13 1999/05/26 23:05:23 gallatin Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -961,7 +961,7 @@ static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
#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 @@ extern struct cfdriver de_cd;
* 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))

16
sys/dev/ed/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.151 1999/04/16 21:22:20 peter Exp $
* $Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
*/
/*
@ -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 @@ ed_attach(sc, unit, flags)
/*
* 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 @@ ed_start(ifp)
/*
* 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 @@ ed_ioctl(ifp, command, data)
}
}
#if NBPFILTER > 0
#if NBPF > 0
/*
* Promiscuous flag may have changed, so reprogram the RCR.
@ -2752,7 +2752,7 @@ ed_get_packet(sc, buf, len, multicast)
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_get_packet(sc, buf, len, multicast)
*/
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

14
sys/dev/en/midway.c
View File

@ -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 @@ struct en_softc *sc;
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 @@ int chan;
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 @@ int chan;
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 @@ void *arg;
ifp = &sc->enif;
ifp->if_ipackets++;
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf)
BPF_MTAP(ifp, m);
#endif

12
sys/dev/ep/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.78 1999/01/19 00:21:39 peter Exp $
* $Id: if_ep.c,v 1.79 1999/01/31 22:41:51 dufault Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -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_attach(sc)
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 @@ epstart(ifp)
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 @@ epread(sc)
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);

12
sys/dev/ex/if_ex.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.14 1999/01/28 01:59:53 dillon Exp $
* $Id: if_ex.c,v 1.15 1999/05/02 22:01:24 peter Exp $
*/
/*
@ -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 @@ int ex_attach(struct isa_device *dev)
/*
* 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 @@ void ex_start(struct ifnet *ifp)
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 @@ void ex_rx_intr(int unit)
} /* QQQ */
}
#endif
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf != NULL) {
bpf_mtap(ifp, ipkt);

12
sys/dev/fe/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.49 1999/03/03 10:40:26 kato Exp $
* $Id: if_fe.c,v 1.50 1999/05/04 12:59:59 kato Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 3.x
@ -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 @@ fe_attach ( struct isa_device * dev )
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 @@ fe_start ( struct ifnet *ifp )
* 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 @@ fe_get_packet ( struct fe_softc * sc, u_short len )
#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.

16
sys/dev/fxp/if_fxp.c
View File

@ -27,14 +27,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_fxp.c,v 1.68 1999/05/08 21:59:39 dfr Exp $
* $Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
*/
/*
* 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 @@ fxp_attach(parent, self, aux)
*/
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 @@ fxp_attach(device_t dev)
*/
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 @@ fxp_start(ifp)
sc->tx_queued++;
#if NBPFILTER > 0
#if NBPF > 0
/*
* Pass packet to bpf if there is a listener.
*/
@ -1097,12 +1097,12 @@ fxp_intr(arg)
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 ;

32
sys/dev/ie/if_ie.c
View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.59 1999/01/28 01:59:53 dillon Exp $
* $Id: if_ie.c,v 1.60 1999/05/13 12:21:41 bde Exp $
*/
/*
@ -125,7 +125,7 @@ iomem and and with 0xffff.
#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 @@ iomem and and with 0xffff.
#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 @@ ieattach(struct isa_device *dvp)
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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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 @@ iestart(struct ifnet *ifp)
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.

12
sys/dev/iicbus/if_ic.c
View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ic.c,v 1.3 1998/12/07 21:58:16 archie Exp $
* $Id: if_ic.c,v 1.4 1999/05/08 21:59:03 dfr Exp $
*/
/*
@ -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 @@ icattach(device_t dev)
if_attach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_NULL, ICHDRLEN);
#endif
@ -322,7 +322,7 @@ icintr (device_t dev, int event, char *ptr)
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 @@ icoutput(struct ifnet *ifp, struct mbuf *m,
} while ((mm = mm->m_next));
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf) {
struct mbuf m0, *n = m;

12
sys/dev/lnc/if_lnc.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.c,v 1.59 1999/05/06 18:43:57 peter Exp $
* $Id: if_lnc.c,v 1.60 1999/05/09 23:24:47 peter Exp $
*/
/*
@ -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 @@ lnc_rint(struct lnc_softc *sc)
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 @@ lnc_attach_sc(struct lnc_softc *sc, int unit)
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 @@ lnc_start(struct ifnet *ifp)
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

4
sys/dev/lnc/if_lncvar.h
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.h,v 1.9 1998/11/26 00:57:32 paul Exp $
* $Id: if_lnc.h,v 1.10 1999/01/31 00:56:32 paul Exp $
*/
#include <i386/isa/ic/Am7990.h>
@ -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

16
sys/dev/pccard/if_xe.c
View File

@ -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 @@ xe_attach (struct isa_device *dev) {
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 @@ xe_start(struct ifnet *ifp) {
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 @@ xe_start(struct ifnet *ifp) {
#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 @@ xe_card_intr(struct pccard_devinfo *devi) {
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 @@ xe_card_intr(struct pccard_devinfo *devi) {
mbp = NULL;
}
}
#endif /* NBPFILTER > 0 */
#endif /* NBPF > 0 */
if (mbp != NULL) {
mbp->m_pkthdr.len = mbp->m_len = len - ETHER_HDR_LEN;

12
sys/dev/pdq/pdq_ifsubr.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pdq_ifsubr.c,v 1.6 1998/01/08 23:40:28 eivind Exp $
* $Id: pdq_ifsubr.c,v 1.7 1998/02/20 13:11:45 bde Exp $
*
*/
@ -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 @@ pdq_os_receive_pdu(
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 @@ pdq_os_transmit_done(
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 @@ pdq_ifattach(
if_attach(ifp);
fddi_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
PDQ_BPFATTACH(sc, DLT_FDDI, sizeof(struct fddi_header));
#endif
}

18
sys/dev/ppbus/if_plip.c
View File

@ -24,7 +24,7 @@
* SUCH DAMAGE.
*
* From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
* $Id: if_plip.c,v 1.11 1999/02/14 11:59:59 nsouch Exp $
* $Id: if_plip.c,v 1.12 1999/02/14 16:19:16 nsouch Exp $
*/
/*
@ -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 @@ lpattach (struct ppb_device *dev)
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 @@ clpinbyte (int spin, struct ppb_device *dev)
return (ctrecvl[cl] | ctrecvh[c]);
}
#if NBPFILTER > 0
#if NBPF > 0
static void
lptap(struct ifnet *ifp, struct mbuf *m)
{
@ -525,7 +525,7 @@ lpintr (int unit)
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 @@ lpintr (int unit)
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 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
} 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 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
} 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

12
sys/dev/sr/if_sr.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr.c,v 1.22 1999/03/30 13:28:23 phk Exp $
* $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
*/
/*
@ -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 @@ srattach(struct sr_hardc *hc)
if_attach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
#endif
}
@ -1119,7 +1119,7 @@ srstart(struct ifnet *ifp)
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_get_packets(struct sr_softc *sc)
*/
sr_copy_rxbuf(m, sc, len); /* copy from DPRAM */
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m);
#endif

12
sys/dev/sr/if_sr_isa.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr.c,v 1.22 1999/03/30 13:28:23 phk Exp $
* $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
*/
/*
@ -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 @@ srattach(struct sr_hardc *hc)
if_attach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
#endif
}
@ -1119,7 +1119,7 @@ srstart(struct ifnet *ifp)
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_get_packets(struct sr_softc *sc)
*/
sr_copy_rxbuf(m, sc, len); /* copy from DPRAM */
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m);
#endif

14
sys/dev/ti/if_ti.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ti.c,v 1.114 1999/07/05 19:20:31 wpaul Exp $
* $Id: if_ti.c,v 1.8 1999/07/05 20:19:41 wpaul Exp $
*/
/*
@ -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
@ -128,7 +128,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_ti.c,v 1.114 1999/07/05 19:20:31 wpaul Exp $";
"$Id: if_ti.c,v 1.8 1999/07/05 20:19:41 wpaul Exp $";
#endif
/*
@ -1680,7 +1680,7 @@ ti_attach(config_id, unit)
if_attach(ifp);
ether_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@ -1785,7 +1785,7 @@ static void ti_rxeof(sc)
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
@ -2070,7 +2070,7 @@ static void ti_start(ifp)
* 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

22
sys/dev/tx/if_tx.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
/* $Id: if_tx.c,v 1.27 1999/05/10 00:20:46 peter Exp $ */
/* $Id: if_tx.c,v 1.28 1999/07/03 20:17:05 peter Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@ -67,7 +67,7 @@
} \
}
#include "bpfilter.h"
#include "bpf.h"
#include "opt_bdg.h"
#include <sys/param.h>
@ -105,7 +105,7 @@
#include <netns/ns_if.h>
#endif
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
@ -355,7 +355,7 @@ epic_openbsd_attach(
/* 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
@ -552,7 +552,7 @@ epic_freebsd_attach(
if_attach(ifp);
ether_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp,DLT_EN10MB, sizeof(struct ether_header));
#endif
@ -848,7 +848,7 @@ epic_ifstart(struct ifnet * const ifp){
/* Set watchdog timer */
ifp->if_timer = 8;
#if NBPFILTER > 0
#if NBPF > 0
if( ifp->if_bpf )
#if defined(__FreeBSD__)
bpf_mtap( ifp, m0 );
@ -918,15 +918,15 @@ epic_rx_done __P((
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) {
@ -949,7 +949,7 @@ epic_rx_done __P((
}
#endif
#if NBPFILTER > 0
#if NBPF > 0
#ifdef BRIDGE
/*
* This deserves explanation
@ -959,7 +959,7 @@ epic_rx_done __P((
* 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

14
sys/dev/vr/if_vr.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $
* $Id: if_vr.c,v 1.12 1999/07/02 04:17:15 peter Exp $
*/
/*
@ -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
@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $";
"$Id: if_vr.c,v 1.12 1999/07/02 04:17:15 peter Exp $";
#endif
/*
@ -1110,7 +1110,7 @@ vr_attach(config_id, unit)
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 @@ static void vr_rxeof(sc)
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 @@ static void vr_start(ifp)
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.

12
sys/dev/vx/if_vx.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_vx.c,v 1.19 1999/01/12 02:09:31 eivind Exp $
* $Id: if_vx.c,v 1.20 1999/01/27 20:09:20 dillon Exp $
*
*/
@ -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 @@ vxattach(sc)
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 @@ vxstart(ifp)
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 @@ vxread(sc)
/* 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.

14
sys/dev/wi/if_wi.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_wi.c,v 1.56 1999/07/04 14:35:23 wpaul Exp $
* $Id: if_wi.c,v 1.7 1999/07/04 14:40:22 wpaul Exp $
*/
/*
@ -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
@ -116,7 +116,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_wi.c,v 1.56 1999/07/04 14:35:23 wpaul Exp $";
"$Id: if_wi.c,v 1.7 1999/07/04 14:40:22 wpaul Exp $";
#endif
static struct wi_softc wi_softc[NWI];
@ -363,7 +363,7 @@ static int wi_attach(isa_dev)
if_attach(ifp);
ether_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@ -463,7 +463,7 @@ static void wi_rxeof(sc)
ifp->if_ipackets++;
#if NBPFILTER > 0
#if NBPF > 0
/* Handle BPF listeners. */
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
@ -1239,7 +1239,7 @@ static void wi_start(ifp)
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.

12
sys/dev/wl/if_wl.c
View File

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.20 1999/01/12 00:36:31 eivind Exp $ */
/* $Id: if_wl.c,v 1.21 1999/04/27 11:15:02 phk Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -190,7 +190,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#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 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <netinet/if_ether.h>
#endif
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -510,7 +510,7 @@ wlattach(struct isa_device *id)
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 @@ wlstart(struct ifnet *ifp)
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 @@ wlread(int unit, u_short fd_p)
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.

16
sys/dev/xe/if_xe.c
View File

@ -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 @@ xe_attach (struct isa_device *dev) {
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 @@ xe_start(struct ifnet *ifp) {
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 @@ xe_start(struct ifnet *ifp) {
#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 @@ xe_card_intr(struct pccard_devinfo *devi) {
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 @@ xe_card_intr(struct pccard_devinfo *devi) {
mbp = NULL;
}
}
#endif /* NBPFILTER > 0 */
#endif /* NBPF > 0 */
if (mbp != NULL) {
mbp->m_pkthdr.len = mbp->m_len = len - ETHER_HDR_LEN;

6
sys/i386/conf/GENERIC
View File

@ -15,7 +15,7 @@
# device lines is also present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
# $Id: GENERIC,v 1.174 1999/06/20 03:36:46 jkh Exp $
# $Id: GENERIC,v 1.175 1999/06/29 18:55:53 peter Exp $
machine i386
cpu I386_CPU
@ -197,9 +197,9 @@ pseudo-device tun 1 # Packet tunnel, for ppp(1)
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

10
sys/i386/conf/LINT
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.614 1999/07/01 18:39:23 jkh Exp $
# $Id: LINT,v 1.615 1999/07/03 21:31:00 jdp Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -381,7 +381,7 @@ options NETATALK #Appletalk communications protocols
# 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 @@ options NETATALK #Appletalk communications protocols
# 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 token #Generic TokenRing
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 ppp 2 #Point-to-point protocol
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:

10
sys/i386/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
# $Id: LINT,v 1.614 1999/07/01 18:39:23 jkh Exp $
# $Id: LINT,v 1.615 1999/07/03 21:31:00 jdp Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@ -381,7 +381,7 @@ options NETATALK #Appletalk communications protocols
# 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 @@ options NETATALK #Appletalk communications protocols
# 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 token #Generic TokenRing
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 ppp 2 #Point-to-point protocol
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:

6
sys/i386/conf/PCCARD
View File

@ -12,7 +12,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
# $Id: PCCARD,v 1.11 1999/06/17 23:53:20 markm Exp $
# $Id: PCCARD,v 1.12 1999/07/02 04:36:48 peter Exp $
machine i386
cpu I386_CPU
@ -194,9 +194,9 @@ pseudo-device tun 1 # Packet tunnel, for ppp(1)
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

12
sys/i386/isa/if_ar.c
View File

@ -28,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ar.c,v 1.25 1999/03/30 13:28:22 phk Exp $
* $Id: if_ar.c,v 1.26 1999/05/06 18:58:04 peter Exp $
*/
/*
@ -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 @@ arattach(struct isa_device *id)
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 @@ arstart(struct ifnet *ifp)
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_get_packets(struct ar_softc *sc)
}
}
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

12
sys/i386/isa/if_cs.c
View File

@ -27,7 +27,7 @@
*/
/*
* $Id: if_cs.c,v 1.9 1999/01/28 01:59:53 dillon Exp $
* $Id: if_cs.c,v 1.10 1999/04/16 21:22:20 peter Exp $
*
* Device driver for Crystal Semiconductor CS8920 based ethernet
* adapters. By Maxim Bolotin and Oleg Sharoiko, 27-April-1997
@ -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 @@ cs_attach(struct cs_softc *sc, int unit, int flags)
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 @@ cs_get_packet(struct cs_softc *sc)
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_start(struct ifnet *ifp)
cs_write_mbufs(sc, m);
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
}

10
sys/i386/isa/if_cx.c
View File

@ -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 @@ cxattach (struct isa_device *id)
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 @@ cxput (cx_chan_t *c, char b)
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 @@ cxinput (cx_chan_t *c, void *buf, unsigned len)
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.

16
sys/i386/isa/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.151 1999/04/16 21:22:20 peter Exp $
* $Id: if_ed.c,v 1.152 1999/05/09 23:24:45 peter Exp $
*/
/*
@ -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 @@ ed_attach(sc, unit, flags)
/*
* 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 @@ ed_start(ifp)
/*
* 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 @@ ed_ioctl(ifp, command, data)
}
}
#if NBPFILTER > 0
#if NBPF > 0
/*
* Promiscuous flag may have changed, so reprogram the RCR.
@ -2752,7 +2752,7 @@ ed_get_packet(sc, buf, len, multicast)
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_get_packet(sc, buf, len, multicast)
*/
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

12
sys/i386/isa/if_el.c
View File

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.39 1998/12/07 21:58:21 archie Exp $
* $Id: if_el.c,v 1.40 1999/01/12 01:29:42 eivind Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -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 @@ el_attach(struct isa_device *idev)
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 @@ el_start(struct ifnet *ifp)
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 @@ elread(struct el_softc *sc,caddr_t buf,int len)
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.

12
sys/i386/isa/if_ep.c
View File

@ -38,7 +38,7 @@
*/
/*
* $Id: if_ep.c,v 1.78 1999/01/19 00:21:39 peter Exp $
* $Id: if_ep.c,v 1.79 1999/01/31 22:41:51 dufault Exp $
*
* Promiscuous mode added and interrupt logic slightly changed
* to reduce the number of adapter failures. Transceiver select
@ -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_attach(sc)
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 @@ epstart(ifp)
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 @@ epread(sc)
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);

12
sys/i386/isa/if_ex.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ex.c,v 1.14 1999/01/28 01:59:53 dillon Exp $
* $Id: if_ex.c,v 1.15 1999/05/02 22:01:24 peter Exp $
*/
/*
@ -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 @@ int ex_attach(struct isa_device *dev)
/*
* 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 @@ void ex_start(struct ifnet *ifp)
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 @@ void ex_rx_intr(int unit)
} /* QQQ */
}
#endif
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf != NULL) {
bpf_mtap(ifp, ipkt);

12
sys/i386/isa/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.49 1999/03/03 10:40:26 kato Exp $
* $Id: if_fe.c,v 1.50 1999/05/04 12:59:59 kato Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 3.x
@ -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 @@ fe_attach ( struct isa_device * dev )
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 @@ fe_start ( struct ifnet *ifp )
* 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 @@ fe_get_packet ( struct fe_softc * sc, u_short len )
#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.

32
sys/i386/isa/if_ie.c
View File

@ -47,7 +47,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ie.c,v 1.59 1999/01/28 01:59:53 dillon Exp $
* $Id: if_ie.c,v 1.60 1999/05/13 12:21:41 bde Exp $
*/
/*
@ -125,7 +125,7 @@ iomem and and with 0xffff.
#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 @@ iomem and and with 0xffff.
#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 @@ ieattach(struct isa_device *dvp)
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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
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 @@ check_eh(struct ie_softc * ie, struct ether_header * eh, int *to_bpf)
* 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 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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 @@ ie_readframe(int unit, struct ie_softc *ie, int num/* frame number to read */)
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 @@ iestart(struct ifnet *ifp)
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.

14
sys/i386/isa/if_le.c
View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.49 1998/12/30 00:37:42 hoek Exp $
* $Id: if_le.c,v 1.50 1999/05/11 19:54:12 phk Exp $
*/
/*
@ -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 @@ le_attach(
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 @@ le_input(
}
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 @@ le_input(
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 @@ lemac_start(
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

12
sys/i386/isa/if_lnc.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.c,v 1.59 1999/05/06 18:43:57 peter Exp $
* $Id: if_lnc.c,v 1.60 1999/05/09 23:24:47 peter Exp $
*/
/*
@ -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 @@ lnc_rint(struct lnc_softc *sc)
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 @@ lnc_attach_sc(struct lnc_softc *sc, int unit)
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 @@ lnc_start(struct ifnet *ifp)
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

4
sys/i386/isa/if_lnc.h
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_lnc.h,v 1.9 1998/11/26 00:57:32 paul Exp $
* $Id: if_lnc.h,v 1.10 1999/01/31 00:56:32 paul Exp $
*/
#include <i386/isa/ic/Am7990.h>
@ -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

14
sys/i386/isa/if_rdp.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_rdp.c,v 1.2 1998/12/21 18:11:10 joerg Exp $
* $Id: if_rdp.c,v 1.3 1999/01/12 00:36:31 eivind Exp $
*/
/*
@ -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 @@ rdp_attach(struct isa_device *isa_dev)
/*
* 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 @@ rdp_start(struct ifnet *ifp)
/*
* 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 @@ rdp_ioctl(struct ifnet *ifp, IOCTL_CMD_T command, caddr_t data)
}
}
#if NBPFILTER > 0
#if NBPF > 0
/*
* Promiscuous flag may have changed, propagage this
* to the NIC.
@ -1164,7 +1164,7 @@ rdp_get_packet(struct rdp_softc *sc, unsigned len)
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

12
sys/i386/isa/if_sr.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_sr.c,v 1.22 1999/03/30 13:28:23 phk Exp $
* $Id: if_sr.c,v 1.23 1999/05/06 22:14:46 peter Exp $
*/
/*
@ -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 @@ srattach(struct sr_hardc *hc)
if_attach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_PPP, PPP_HEADER_LEN);
#endif
}
@ -1119,7 +1119,7 @@ srstart(struct ifnet *ifp)
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_get_packets(struct sr_softc *sc)
*/
sr_copy_rxbuf(m, sc, len); /* copy from DPRAM */
#if NBPFILTER > 0
#if NBPF > 0
if (ifp->if_bpf)
bpf_mtap(ifp, m);
#endif

14
sys/i386/isa/if_wi.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_wi.c,v 1.56 1999/07/04 14:35:23 wpaul Exp $
* $Id: if_wi.c,v 1.7 1999/07/04 14:40:22 wpaul Exp $
*/
/*
@ -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
@ -116,7 +116,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_wi.c,v 1.56 1999/07/04 14:35:23 wpaul Exp $";
"$Id: if_wi.c,v 1.7 1999/07/04 14:40:22 wpaul Exp $";
#endif
static struct wi_softc wi_softc[NWI];
@ -363,7 +363,7 @@ static int wi_attach(isa_dev)
if_attach(ifp);
ether_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@ -463,7 +463,7 @@ static void wi_rxeof(sc)
ifp->if_ipackets++;
#if NBPFILTER > 0
#if NBPF > 0
/* Handle BPF listeners. */
if (ifp->if_bpf) {
bpf_mtap(ifp, m);
@ -1239,7 +1239,7 @@ static void wi_start(ifp)
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.

12
sys/i386/isa/if_wl.c
View File

@ -1,4 +1,4 @@
/* $Id: if_wl.c,v 1.20 1999/01/12 00:36:31 eivind Exp $ */
/* $Id: if_wl.c,v 1.21 1999/04/27 11:15:02 phk Exp $ */
/*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -190,7 +190,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#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 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <netinet/if_ether.h>
#endif
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -510,7 +510,7 @@ wlattach(struct isa_device *id)
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 @@ wlstart(struct ifnet *ifp)
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 @@ wlread(int unit, u_short fd_p)
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.

16
sys/i386/isa/if_ze.c
View File

@ -47,7 +47,7 @@
*/
/*
* $Id: if_ze.c,v 1.57 1999/05/06 18:12:27 peter Exp $
* $Id: if_ze.c,v 1.58 1999/05/06 18:43:58 peter Exp $
*/
/* XXX don't mix different PCCARD support code. */
@ -64,7 +64,7 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
#include "ze.h"
#if NZE > 0
#include "bpfilter.h"
#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@ -92,7 +92,7 @@ static char const zedummy[] = "code to use the includes of card.h and pcic.h";
#include <netns/ns_if.h>
#endif
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -650,7 +650,7 @@ ze_attach(isa_dev)
/*
* 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 @@ ze_init(unit)
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 @@ ze_start(ifp)
/*
* 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 @@ ze_ioctl(ifp, command, data)
((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 @@ ze_get_packet(sc, buf, len)
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.

12
sys/i386/isa/if_zp.c
View File

@ -34,7 +34,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
* $Id: if_zp.c,v 1.50 1999/03/08 21:21:43 steve Exp $
* $Id: if_zp.c,v 1.51 1999/04/19 06:56:24 imp Exp $
*/
/*-
* TODO:
@ -114,7 +114,7 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h";
#include "zp.h"
#include "bpfilter.h"
#include "bpf.h"
#include "opt_inet.h"
#include "opt_ipx.h"
@ -145,7 +145,7 @@ static char const zpdummy[] = "code to use the includes of card.h and pcic.h";
#include <netns/ns_if.h>
#endif
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#endif
@ -568,7 +568,7 @@ zpattach(isa_dev)
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 @@ zpstart(ifp)
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 @@ zpread(sc)
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);

16
sys/i4b/driver/i4b_ipr.c
View File

@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* ---------------------------------------------------------
*
* $Id: i4b_ipr.c,v 1.51 1999/05/06 08:24:45 hm Exp $
* $Id: i4b_ipr.c,v 1.4 1999/05/20 10:08:58 hm Exp $
*
* last edit-date: [Thu May 6 10:09:20 1999]
*
@ -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 @@ i4biprattach()
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 @@ ipr_rx_data_rdy(int unit)
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 @@ ipr_rx_data_rdy(int unit)
bpf_mtap(sc->sc_if.if_bpf, &mm);
#endif
}
#endif /* NBPFILTER > 0 */
#endif /* NBPF > 0 */
if(IF_QFULL(&ipintrq))
{
@ -1062,7 +1062,7 @@ ipr_tx_queue_empty(int unit)
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 @@ ipr_tx_queue_empty(int unit)
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 */

16
sys/i4b/driver/i4b_isppp.c
View File

@ -34,7 +34,7 @@
* the "cx" driver for Cronyx's HDLC-in-hardware device). This driver
* is only the glue between sppp and i4b.
*
* $Id: i4b_isppp.c,v 1.27 1999/05/03 08:48:25 hm Exp $
* $Id: i4b_isppp.c,v 1.3 1999/05/20 10:09:01 hm Exp $
*
* last edit-date: [Sun May 2 10:52:57 1999]
*
@ -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 @@ i4bispppattach(void)
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 @@ i4bisppp_start(struct ifnet *ifp)
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 @@ i4bisppp_start(struct ifnet *ifp)
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 @@ i4bisppp_rx_data_rdy(int unit)
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 @@ i4bisppp_rx_data_rdy(int unit)
bpf_mtap(sc->sc_if.if_bpf, m);
#endif
#endif /* NBPFILTER > 0 */
#endif /* NBPF > 0 */
s = splimp();

10
sys/modules/fxp/Makefile
View File

@ -1,17 +1,17 @@
# $Id: Makefile,v 1.1 1999/04/16 21:52:27 peter Exp $
# $Id: Makefile,v 1.2 1999/04/18 13:31:23 dfr Exp $
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

12
sys/modules/if_disc/Makefile
View File

@ -1,17 +1,17 @@
# $Id: Makefile,v 1.6 1998/10/16 04:30:44 peter Exp $
# $Id: Makefile,v 1.7 1999/04/28 01:17:58 msmith Exp $
.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

10
sys/modules/if_ppp/Makefile
View File

@ -1,9 +1,9 @@
# $Id: Makefile,v 1.16 1999/01/17 20:53:48 peter Exp $
# $Id: Makefile,v 1.17 1999/04/28 01:18:02 msmith Exp $
.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+= bsd_comp.c
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

12
sys/modules/if_sl/Makefile
View File

@ -1,19 +1,19 @@
# $Id: Makefile,v 1.7 1998/10/16 04:30:45 peter Exp $
# $Id: Makefile,v 1.8 1999/04/28 01:18:05 msmith Exp $
.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

12
sys/modules/if_tun/Makefile
View File

@ -1,19 +1,19 @@
# $Id: Makefile,v 1.8 1999/01/17 20:53:47 peter Exp $
# $Id: Makefile,v 1.9 1999/04/28 01:18:08 msmith Exp $
.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

18
sys/net/bpf.c
View File

@ -37,10 +37,10 @@
*
* @(#)bpf.c 8.2 (Berkeley) 3/28/94
*
* $Id: bpf.c,v 1.50 1999/05/30 16:53:04 phk Exp $
* $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 @@ SYSCTL_INT(_debug, OID_AUTO, bpf_bufsize, CTLFLAG_RW,
* 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 @@ bpfopen(dev, flags, fmt, p)
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 @@ bpfattach(ifp, dlt, hdrlen)
* 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 @@ bpfattach(ifp, dlt, hdrlen)
}
#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_drvinit(unused)
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 @@ bpf_drvinit(unused)
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.
*

8
sys/net/if_disc.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* From: @(#)if_loop.c 8.1 (Berkeley) 6/10/93
* $Id: if_disc.c,v 1.20 1998/06/07 17:12:03 dfr Exp $
* $Id: if_disc.c,v 1.21 1998/12/14 01:59:16 eivind Exp $
*/
/*
@ -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 @@ discattach(dummy)
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 @@ discoutput(ifp, m, dst, rt)
{
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 *));

6
sys/net/if_fddisubr.c
View File

@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
* $Id: if_fddisubr.c,v 1.33 1998/06/21 14:53:23 bde Exp $
* $Id: if_fddisubr.c,v 1.34 1999/01/27 22:42:13 dillon Exp $
*/
#include "opt_atalk.h"
@ -105,7 +105,7 @@ extern u_char aarp_org_code[ 3 ];
extern struct ifqueue pkintrq;
#endif
#include "bpfilter.h"
#include "bpf.h"
#define senderr(e) { error = (e); goto bad;}
@ -309,7 +309,7 @@ fddi_output(ifp, m0, dst, rt0)
break;
}
#if NBPFILTER > 0
#if NBPF > 0
case AF_IMPLINK:
{
fh = mtod(m, struct fddi_header *);

4
sys/net/if_iso88025subr.c
View File

@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_iso88025subr.c,v 1.5 1999/01/09 22:45:58 lile Exp $
* $Id: if_iso88025subr.c,v 1.2 1999/03/10 10:11:43 julian Exp $
*
*/
@ -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

10
sys/net/if_loop.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_loop.c 8.1 (Berkeley) 6/10/93
* $Id: if_loop.c,v 1.37 1998/07/12 16:46:52 dfr Exp $
* $Id: if_loop.c,v 1.38 1999/02/20 21:03:53 dt Exp $
*/
/*
@ -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 @@ loopattach(dummy)
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_simloop(ifp, m, dst, hlen)
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 *));

14
sys/net/if_ppp.c
View File

@ -69,7 +69,7 @@
* Paul Mackerras (paulus@cs.anu.edu.au).
*/
/* $Id: if_ppp.c,v 1.59 1998/06/20 16:28:01 peter Exp $ */
/* $Id: if_ppp.c,v 1.60 1999/04/27 11:17:00 phk Exp $ */
/* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
@ -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 @@ pppattach(dummy)
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 @@ pppoutput(ifp, m0, dst, rtp)
#endif /* PPP_FILTER */
}
#if NBPFILTER > 0
#if NBPF > 0
/*
* See if bpf wants to look at the packet.
*/
@ -1463,7 +1463,7 @@ ppp_inproc(sc, m)
#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);

22
sys/net/if_sl.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if_sl.c 8.6 (Berkeley) 2/1/94
* $Id: if_sl.c,v 1.74 1999/04/27 11:17:02 phk Exp $
* $Id: if_sl.c,v 1.75 1999/07/01 22:14:51 peter Exp $
*/
/*
@ -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 @@ PSEUDO_SET(slattach, if_sl);
* 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 @@ slattach(dummy)
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
}
@ -539,7 +539,7 @@ slstart(tp)
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
@ -584,7 +584,7 @@ slstart(tp)
* 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
@ -613,7 +613,7 @@ slstart(tp)
*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
@ -776,7 +776,7 @@ slinput(c, tp)
register struct mbuf *m;
register int len;
int s;
#if NBPFILTER > 0
#if NBPF > 0
u_char chdr[CHDR_LEN];
#endif
@ -845,7 +845,7 @@ slinput(c, tp)
/* 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
@ -886,7 +886,7 @@ slinput(c, tp)
} else
goto error;
}
#if NBPFILTER > 0
#if NBPF > 0
if (sc->sc_if.if_bpf) {
/*
* Put the SLIP pseudo-"link header" in place.

12
sys/net/if_tun.c
View File

@ -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 @@ tunattach(dummy)
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 @@ tunoutput(ifp, m0, dst, rt)
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 @@ tunoutput(ifp, m0, dst, rt)
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 @@ tunwrite(dev, uio, flag)
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

16
sys/net/if_vlan.c
View File

@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_vlan.c,v 1.6 1999/03/15 01:21:59 wpaul Exp $
* $Id: if_vlan.c,v 1.7 1999/04/07 23:26:43 wpaul Exp $
*/
/*
@ -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 @@ vlaninit(void *dummy)
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 @@ vlan_start(struct ifnet *ifp)
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 @@ vlan_input_tag(struct ether_header *eh, struct mbuf *m, u_int16_t t)
*/
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 @@ vlan_input(struct ether_header *eh, struct mbuf *m)
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

12
sys/pc98/cbus/olpt.c
View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id$
* $Id: olpt.c,v 1.1 1999/06/18 14:48:26 kato Exp $
*/
/*
@ -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 @@ lpattach (struct lpt_softc *sc, int unit)
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 @@ lpintr (int unit)
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 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
} 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

6
sys/pc98/conf/GENERIC
View File

@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
# $Id: GENERIC98,v 1.77 1999/06/18 14:48:18 kato Exp $
# $Id: GENERIC98,v 1.78 1999/07/04 11:53:18 nyan Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@ -262,8 +262,8 @@ 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

6
sys/pc98/conf/GENERIC98
View File

@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
# $Id: GENERIC98,v 1.77 1999/06/18 14:48:18 kato Exp $
# $Id: GENERIC98,v 1.78 1999/07/04 11:53:18 nyan Exp $
# GENERIC98 -- Generic PC98 machine with WD/SCSI disks
@ -262,8 +262,8 @@ 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

16
sys/pc98/pc98/if_ed.c
View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_ed.c,v 1.62 1999/04/18 14:42:17 kato Exp $
* $Id: if_ed.c,v 1.63 1999/05/10 09:06:12 kato Exp $
*/
/*
@ -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 @@ ed_attach(sc, unit, flags)
/*
* 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 @@ ed_start(ifp)
/*
* 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 @@ ed_ioctl(ifp, command, data)
}
}
#if NBPFILTER > 0
#if NBPF > 0
/*
* Promiscuous flag may have changed, so reprogram the RCR.
@ -3502,7 +3502,7 @@ ed_get_packet(sc, buf, len, multicast)
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_get_packet(sc, buf, len, multicast)
*/
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

12
sys/pc98/pc98/olpt.c
View File

@ -46,7 +46,7 @@
* SUCH DAMAGE.
*
* from: unknown origin, 386BSD 0.1
* $Id$
* $Id: olpt.c,v 1.1 1999/06/18 14:48:26 kato Exp $
*/
/*
@ -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 @@ lpattach (struct lpt_softc *sc, int unit)
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 @@ lpintr (int unit)
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 @@ lpoutput (struct ifnet *ifp, struct mbuf *m,
} 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

14
sys/pci/if_al.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_al.c,v 1.4 1999/05/26 22:56:22 wpaul Exp $
* $Id: if_al.c,v 1.5 1999/07/02 04:17:12 peter Exp $
*/
/*
@ -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
@ -90,7 +90,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_al.c,v 1.4 1999/05/26 22:56:22 wpaul Exp $";
"$Id: if_al.c,v 1.5 1999/07/02 04:17:12 peter Exp $";
#endif
/*
@ -1066,7 +1066,7 @@ al_attach(config_id, unit)
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 @@ static void al_rxeof(sc)
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 @@ static void al_start(ifp)
/* 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.

14
sys/pci/if_ax.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ax.c,v 1.9 1999/05/09 17:06:48 peter Exp $
* $Id: if_ax.c,v 1.10 1999/07/02 04:17:12 peter Exp $
*/
/*
@ -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
@ -87,7 +87,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_ax.c,v 1.9 1999/05/09 17:06:48 peter Exp $";
"$Id: if_ax.c,v 1.10 1999/07/02 04:17:12 peter Exp $";
#endif
/*
@ -1308,7 +1308,7 @@ ax_attach(config_id, unit)
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 @@ static void ax_rxeof(sc)
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 @@ static void ax_start(ifp)
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.

12
sys/pci/if_de.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
/* $Id: if_de.c,v 1.106 1999/05/10 14:12:26 peter Exp $ */
/* $Id: if_de.c,v 1.107 1999/07/03 20:17:02 peter Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -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
@ -3536,7 +3536,7 @@ tulip_rx_intr(
#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);
@ -3807,7 +3807,7 @@ tulip_tx_intr(
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
@ -5112,7 +5112,7 @@ tulip_attach(
#endif
#endif /* __bsdi__ */
#if NBPFILTER > 0
#if NBPF > 0
TULIP_BPF_ATTACH(sc);
#endif

6
sys/pci/if_devar.h
View File

@ -1,5 +1,5 @@
/* $NetBSD: if_devar.h,v 1.31 1998/09/29 22:40:52 matt Exp $ */
/* $Id: if_devar.h,v 1.12 1998/11/06 02:13:14 peter Exp $ */
/* $Id: if_devar.h,v 1.13 1999/05/26 23:05:23 gallatin Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
@ -961,7 +961,7 @@ static tulip_softc_t *tulips[TULIP_MAX_DEVICES];
#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 @@ extern struct cfdriver de_cd;
* 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))

16
sys/pci/if_fxp.c
View File

@ -27,14 +27,14 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: if_fxp.c,v 1.68 1999/05/08 21:59:39 dfr Exp $
* $Id: if_fxp.c,v 1.69 1999/05/09 10:45:54 peter Exp $
*/
/*
* 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 @@ fxp_attach(parent, self, aux)
*/
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 @@ fxp_attach(device_t dev)
*/
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 @@ fxp_start(ifp)
sc->tx_queued++;
#if NBPFILTER > 0
#if NBPF > 0
/*
* Pass packet to bpf if there is a listener.
*/
@ -1097,12 +1097,12 @@ fxp_intr(arg)
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 ;

14
sys/pci/if_mx.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_mx.c,v 1.19 1999/06/16 16:27:30 wpaul Exp $
* $Id: if_mx.c,v 1.20 1999/07/02 04:17:13 peter Exp $
*/
/*
@ -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
@ -94,7 +94,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_mx.c,v 1.19 1999/06/16 16:27:30 wpaul Exp $";
"$Id: if_mx.c,v 1.20 1999/07/02 04:17:13 peter Exp $";
#endif
/*
@ -1563,7 +1563,7 @@ mx_attach(config_id, unit)
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 @@ static void mx_rxeof(sc)
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 @@ static void mx_start(ifp)
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.

14
sys/pci/if_pn.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_pn.c,v 1.21 1999/05/28 18:43:10 wpaul Exp $
* $Id: if_pn.c,v 1.22 1999/07/02 04:17:13 peter Exp $
*/
/*
@ -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
@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_pn.c,v 1.21 1999/05/28 18:43:10 wpaul Exp $";
"$Id: if_pn.c,v 1.22 1999/07/02 04:17:13 peter Exp $";
#endif
@ -1211,7 +1211,7 @@ pn_attach(config_id, unit)
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 @@ static void pn_rxeof(sc)
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 @@ static void pn_start(ifp)
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.

14
sys/pci/if_rl.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_rl.c,v 1.17 1999/06/19 20:17:37 wpaul Exp $
* $Id: if_rl.c,v 1.18 1999/07/02 04:17:14 peter Exp $
*/
/*
@ -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
@ -127,7 +127,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_rl.c,v 1.17 1999/06/19 20:17:37 wpaul Exp $";
"$Id: if_rl.c,v 1.18 1999/07/02 04:17:14 peter Exp $";
#endif
/*
@ -1234,7 +1234,7 @@ rl_attach(config_id, unit)
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 @@ static void rl_rxeof(sc)
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 @@ static void rl_start(ifp)
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.

14
sys/pci/if_ti.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_ti.c,v 1.114 1999/07/05 19:20:31 wpaul Exp $
* $Id: if_ti.c,v 1.8 1999/07/05 20:19:41 wpaul Exp $
*/
/*
@ -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
@ -128,7 +128,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_ti.c,v 1.114 1999/07/05 19:20:31 wpaul Exp $";
"$Id: if_ti.c,v 1.8 1999/07/05 20:19:41 wpaul Exp $";
#endif
/*
@ -1680,7 +1680,7 @@ ti_attach(config_id, unit)
if_attach(ifp);
ether_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp, DLT_EN10MB, sizeof(struct ether_header));
#endif
@ -1785,7 +1785,7 @@ static void ti_rxeof(sc)
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
@ -2070,7 +2070,7 @@ static void ti_start(ifp)
* 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

14
sys/pci/if_tl.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_tl.c,v 1.32 1999/05/09 17:07:01 peter Exp $
* $Id: if_tl.c,v 1.33 1999/07/02 04:17:15 peter Exp $
*/
/*
@ -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
@ -221,7 +221,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_tl.c,v 1.32 1999/05/09 17:07:01 peter Exp $";
"$Id: if_tl.c,v 1.33 1999/07/02 04:17:15 peter Exp $";
#endif
/*
@ -1786,7 +1786,7 @@ tl_attach(config_id, unit)
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 @@ static int tl_intvec_rxeof(xsc, type)
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 @@ static void tl_start(ifp)
* 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

22
sys/pci/if_tx.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: if_tx.c,v 1.3 1998/10/10 04:30:09 jason Exp $ */
/* $Id: if_tx.c,v 1.27 1999/05/10 00:20:46 peter Exp $ */
/* $Id: if_tx.c,v 1.28 1999/07/03 20:17:05 peter Exp $ */
/*-
* Copyright (c) 1997 Semen Ustimenko (semen@iclub.nsu.ru)
@ -67,7 +67,7 @@
} \
}
#include "bpfilter.h"
#include "bpf.h"
#include "opt_bdg.h"
#include <sys/param.h>
@ -105,7 +105,7 @@
#include <netns/ns_if.h>
#endif
#if NBPFILTER > 0
#if NBPF > 0
#include <net/bpf.h>
#include <net/bpfdesc.h>
#endif
@ -355,7 +355,7 @@ epic_openbsd_attach(
/* 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
@ -552,7 +552,7 @@ epic_freebsd_attach(
if_attach(ifp);
ether_ifattach(ifp);
#if NBPFILTER > 0
#if NBPF > 0
bpfattach(ifp,DLT_EN10MB, sizeof(struct ether_header));
#endif
@ -848,7 +848,7 @@ epic_ifstart(struct ifnet * const ifp){
/* Set watchdog timer */
ifp->if_timer = 8;
#if NBPFILTER > 0
#if NBPF > 0
if( ifp->if_bpf )
#if defined(__FreeBSD__)
bpf_mtap( ifp, m0 );
@ -918,15 +918,15 @@ epic_rx_done __P((
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) {
@ -949,7 +949,7 @@ epic_rx_done __P((
}
#endif
#if NBPFILTER > 0
#if NBPF > 0
#ifdef BRIDGE
/*
* This deserves explanation
@ -959,7 +959,7 @@ epic_rx_done __P((
* 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

14
sys/pci/if_vr.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $
* $Id: if_vr.c,v 1.12 1999/07/02 04:17:15 peter Exp $
*/
/*
@ -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
@ -97,7 +97,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_vr.c,v 1.11 1999/05/09 17:07:03 peter Exp $";
"$Id: if_vr.c,v 1.12 1999/07/02 04:17:15 peter Exp $";
#endif
/*
@ -1110,7 +1110,7 @@ vr_attach(config_id, unit)
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 @@ static void vr_rxeof(sc)
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 @@ static void vr_start(ifp)
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.

14
sys/pci/if_wb.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_wb.c,v 1.10 1999/05/13 20:36:00 wpaul Exp $
* $Id: if_wb.c,v 1.11 1999/07/02 04:17:16 peter Exp $
*/
/*
@ -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
@ -121,7 +121,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: if_wb.c,v 1.10 1999/05/13 20:36:00 wpaul Exp $";
"$Id: if_wb.c,v 1.11 1999/07/02 04:17:16 peter Exp $";
#endif
/*
@ -1228,7 +1228,7 @@ wb_attach(config_id, unit)
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 @@ static void wb_rxeof(sc)
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 @@ static void wb_start(ifp)
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.

16
sys/pci/if_xl.c
View File

@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_xl.c,v 1.40 1999/06/01 19:04:23 wpaul Exp $
* $Id: if_xl.c,v 1.41 1999/07/02 04:17:16 peter Exp $
*/
/*
@ -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
@ -160,7 +160,7 @@
#if !defined(lint)
static const char rcsid[] =
"$Id: if_xl.c,v 1.40 1999/06/01 19:04:23 wpaul Exp $";
"$Id: if_xl.c,v 1.41 1999/07/02 04:17:16 peter Exp $";
#endif
/*
@ -1791,7 +1791,7 @@ xl_attach(config_id, unit)
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 @@ static void xl_rxeof(sc)
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 @@ static void xl_rxeof(sc)
}
#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 @@ static void xl_start(ifp)
}
prev = cur_tx;
#if NBPFILTER > 0
#if NBPF > 0
/*
* If there's a BPF listener, bounce a copy of this frame
* to him.