Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use pseudo-device ipfilter, not ipl.

This commit is contained in:
mrg 1997-01-07 11:35:01 +00:00
parent eafab1cbd3
commit c71a371532
22 changed files with 57 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/alpha/alpha/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.18 1997/01/06 23:28:09 cgd Exp $ */
/* $NetBSD: conf.c,v 1.19 1997/01/07 11:35:01 mrg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@ -136,7 +136,7 @@ cdev_decl(ss);
#include "uk.h"
cdev_decl(uk);
cdev_decl(fd);
#include "ipl.h"
#include "ipfilter.h"
cdev_decl(ipl);
cdev_decl(prom); /* XXX XXX XXX */
@ -179,7 +179,7 @@ struct cdevsw cdevsw[] =
cdev_scanner_init(NSS,ss), /* 32: SCSI scanner */
cdev_uk_init(NUK,uk), /* 33: SCSI unknown */
cdev_disk_init(NFDC,fd), /* 34: PC-ish floppy disk driver */
cdev_ipl_init(NIPL,ipl), /* 35: ip-filter device */
cdev_ipf_init(NIPFILTER,ipl), /* 35: ip-filter device */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);

6
sys/arch/amiga/amiga/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.41 1997/01/05 21:44:24 veego Exp $ */
/* $NetBSD: conf.c,v 1.42 1997/01/07 11:35:03 mrg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@ -94,7 +94,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
dev_decl(filedesc,open);
#include "bpfilter.h"
#include "tun.h"
#include "ipl.h"
#include "ipfilter.h"
struct cdevsw cdevsw[] =
{
@ -138,7 +138,7 @@ struct cdevsw cdevsw[] =
cdev_scanner_init(NSS,ss), /* 37: SCSI scanner */
cdev_ch_init(NCH,ch), /* 38: SCSI autochanger */
cdev_uk_init(NUK,uk), /* 39: SCSI unknown */
cdev_ipl_init(NIPL,ipl), /* 40: ip-filter device */
cdev_ipf_init(NIPFILTER,ipl), /* 40: ip-filter device */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);

6
sys/arch/amiga/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.66 1997/01/06 09:59:32 veego Exp $
# $NetBSD: GENERIC,v 1.67 1997/01/07 11:35:04 mrg Exp $
#
# GENERIC AMIGA
@ -41,7 +41,7 @@ options INET # IP networking support (Required)
#options CCITT,LLC,HDLC # X.25
#options PPP_BSDCOMP,PPP_DEFLATE # BSD compression for PPP
#options PFIL_HOOKS # pfil(9) packet filter hooks (Required
# if you enable the pseudo-device ipl).
# if you enable the pseudo-device ipfilter).
#
# File systems
@ -250,7 +250,7 @@ pseudo-device sl 1 # slip
pseudo-device ppp 1 # ppp
#pseudo-device tun 1 # network tunnel line discipline
pseudo-device bpfilter 16 # berkeley packet filters
#pseudo-device ipl # ip filter
#pseudo-device ipfilter # ip filter
pseudo-device view 10 # views
pseudo-device pty 16 # pseudo terminals

6
sys/arch/arm32/arm32/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.17 1997/01/06 02:44:10 mark Exp $ */
/* $NetBSD: conf.c,v 1.18 1997/01/07 11:35:06 mrg Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@ -217,7 +217,7 @@ cdev_decl(cpu);
cdev_decl(iic);
#include "rtc.h"
cdev_decl(rtc);
#include "ipl.h"
#include "ipfilter.h"
/* Character devices */
@ -268,7 +268,7 @@ struct cdevsw cdevsw[] = {
cdev_rtc_init(NRTC, rtc), /* 43: RTC driver */
cdev_lkm_dummy(), /* 44: */
cdev_lkm_dummy(), /* 45: */
cdev_ipl_init(NIPL,ipl), /* 46: ip-filter device */
cdev_ipf_init(NIPFILTER,ipl), /* 46: ip-filter device */
cdev_lkm_dummy(), /* 47: */
cdev_lkm_dummy(), /* 48: */
cdev_lkm_dummy(), /* 49: */

2
sys/arch/arm32/conf/GENERIC
View File

@ -212,7 +212,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl 1 # ip filter
#pseudo-device ipfilter 1 # ip filter
pseudo-device pty 32 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

2
sys/arch/arm32/conf/PHARM
View File

@ -182,7 +182,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl 1 # ip filter
#pseudo-device ipfilter 1 # ip filter
pseudo-device pty 32 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

2
sys/arch/arm32/conf/RC7500
View File

@ -197,7 +197,7 @@ pseudo-device bpfilter 8 # packet filter
#pseudo-device sl 2 # CSLIP
#pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl 1 # ip filter
#pseudo-device ipfilter 1 # ip filter
pseudo-device pty 32 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

2
sys/arch/arm32/conf/REMY
View File

@ -331,7 +331,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl 1 # ip filter
#pseudo-device ipfilter 1 # ip filter
pseudo-device pty 32 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

2
sys/arch/arm32/conf/SA110
View File

@ -205,7 +205,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl 1 # ip filter
#pseudo-device ipfilter 1 # ip filter
pseudo-device pty 32 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

2
sys/arch/arm32/conf/VOYAGER
View File

@ -209,7 +209,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl 1 # ip filter
#pseudo-device ipfilter 1 # ip filter
pseudo-device pty 32 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

4
sys/arch/hp300/conf/BASALT
View File

@ -1,4 +1,4 @@
# $NetBSD: BASALT,v 1.11 1997/01/06 08:47:43 thorpej Exp $
# $NetBSD: BASALT,v 1.12 1997/01/07 11:35:11 mrg Exp $
#
# Kernel for basalt.og.org - thorpej's HP380 file server.
#
@ -91,4 +91,4 @@ pseudo-device vnd 4 # vnode pseudo-disks
pseudo-device ite # terminal emulation on grf
pseudo-device loop # loopback network interface
pseudo-device ether # basic ethernet support
pseudo-device ipl # IP Filter
pseudo-device ipfilter # IP Filter

4
sys/arch/hp300/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.17 1997/01/06 08:48:36 thorpej Exp $
# $NetBSD: GENERIC,v 1.18 1997/01/07 11:35:12 mrg Exp $
#
# Generic kernel - one size fits all.
#
@ -133,4 +133,4 @@ pseudo-device ccd 4 # concatenated disk devices
pseudo-device ite # terminal emulation on grf
pseudo-device loop # loopback network interface
pseudo-device ether # basic ethernet support
pseudo-device ipl # IP Filter package
pseudo-device ipfilter # IP Filter package

6
sys/arch/hp300/hp300/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.35 1997/01/05 21:29:49 thorpej Exp $ */
/* $NetBSD: conf.c,v 1.36 1997/01/07 11:35:13 mrg Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@ -137,7 +137,7 @@ dev_decl(filedesc,open);
cdev_decl(bpf);
#include "tun.h"
cdev_decl(tun);
#include "ipl.h"
#include "ipfilter.h"
struct cdevsw cdevsw[] =
{
@ -159,7 +159,7 @@ struct cdevsw cdevsw[] =
cdev_tty_init(NDCM,dcm), /* 15: 4-port serial */
cdev_tape_init(NMT,mt), /* 16: magnetic reel tape */
cdev_disk_init(NCCD,ccd), /* 17: concatenated disk */
cdev_ipl_init(NIPL,ipl), /* 18: ip-filter device */
cdev_ipf_init(NIPFILTER,ipl), /* 18: ip-filter device */
cdev_disk_init(NVND,vnd), /* 19: vnode disk driver */
cdev_tape_init(NST,st), /* 20: SCSI tape */
cdev_fd_init(1,filedesc), /* 21: file descriptor pseudo-device */

6
sys/arch/i386/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.65 1997/01/07 08:01:32 veego Exp $
# $NetBSD: GENERIC,v 1.66 1997/01/07 11:35:14 mrg Exp $
#
# GENERIC -- everything that's currently supported
#
@ -81,7 +81,7 @@ options ISO,TPIP # OSI
options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
#options PFIL_HOOKS # pfil(9) packet filter hooks (Required
# if you enable the pseudo-device ipl).
# if you enable the pseudo-device ipfilter)
config netbsd swap generic
options GENERIC
@ -215,7 +215,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
#pseudo-device ipl # ip filter
#pseudo-device ipfilter # ip filter
pseudo-device pty 64 # pseudo-terminals
pseudo-device tb 1 # tablet line discipline

6
sys/arch/i386/i386/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.84 1997/01/07 07:57:31 veego Exp $ */
/* $NetBSD: conf.c,v 1.85 1997/01/07 11:35:15 mrg Exp $ */
/*
* Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved.
@ -177,7 +177,7 @@ cdev_decl(ccd);
cdev_decl(joy);
#include "apm.h"
cdev_decl(apm);
#include "ipl.h"
#include "ipfilter.h"
struct cdevsw cdevsw[] =
{
@ -229,7 +229,7 @@ struct cdevsw cdevsw[] =
#else
cdev_notdef(), /* 43 */
#endif
cdev_ipl_init(NIPL,ipl), /* 44: ip-filter device */
cdev_ipf_init(NIPFILTER,ipl), /* 44: ip-filter device */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);

18
sys/arch/pica/pica/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.6 1996/09/07 12:40:37 mycroft Exp $ */
/* $NetBSD: conf.c,v 1.7 1997/01/07 11:35:16 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -144,19 +144,7 @@ cdev_decl(pc);
cdev_decl(pms);
cdev_decl(cd);
dev_decl(filedesc,open);
/* open, close, read, ioctl */
cdev_decl(ipl);
#define cdev_gen_ipf(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \
(dev_type_mmap((*))) enodev, 0 }
#ifdef IPFILTER
#define NIPF 1
#else
#define NIPF 0
#endif
#include "ipfilter.h"
struct cdevsw cdevsw[] =
{
@ -193,7 +181,7 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 28: */
cdev_notdef(), /* 29: */
cdev_notdef(), /* 30: */
cdev_gen_ipf(NIPF,ipl), /* 31: IP filter log */
cdev_ipf_init(NIPFILTER,ipl), /* 31: ip-filter device */
};
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);

4
sys/arch/sparc/conf/GENERIC
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC,v 1.37 1997/01/06 07:35:39 mrg Exp $
# $NetBSD: GENERIC,v 1.38 1997/01/07 11:35:18 mrg Exp $
include "arch/sparc/conf/std.sparc"
@ -289,4 +289,4 @@ pseudo-device bpfilter 16 # Berkeley Packet Filter
pseudo-device vnd 4 # disk-like interface to files
pseudo-device ccd 4 # concatenated and striped disks
#pseudo-device strip 1 # radio clock
#pseudo-device ipl # ip filter
#pseudo-device ipfilter # ip filter

6
sys/arch/sparc/sparc/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.47 1997/01/05 21:32:15 mrg Exp $ */
/* $NetBSD: conf.c,v 1.48 1997/01/07 11:35:19 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@ -80,7 +80,7 @@
#include "xd.h"
#include "xy.h"
#include "md.h"
#include "ipl.h"
#include "ipfilter.h"
struct bdevsw bdevsw[] =
{
@ -139,7 +139,7 @@ struct cdevsw cdevsw[] =
cdev_fb_init(1,fb), /* 22: /dev/fb indirect driver */
cdev_disk_init(NCCD,ccd), /* 23: concatenated disk driver */
cdev_fd_init(1,filedesc), /* 24: file descriptor pseudo-device */
cdev_ipl_init(NIPL,ipl), /* 25: ip-filter device */
cdev_ipf_init(NIPFILTER,ipl), /* 25: ip-filter device */
cdev_notdef(), /* 26 */
cdev_fb_init(NBWTWO,bwtwo), /* 27: /dev/bwtwo */
cdev_notdef(), /* 28 */

6
sys/arch/vax/vax/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.26 1997/01/05 18:50:28 ragge Exp $ */
/* $NetBSD: conf.c,v 1.27 1997/01/07 11:35:20 mrg Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@ -326,7 +326,7 @@ cdev_decl(qv);
#include "qd.h"
cdev_decl(qd);
#include "ipl.h"
#include "ipfilter.h"
cdev_decl(ipl);
#if defined(INGRES)
@ -398,7 +398,7 @@ struct cdevsw cdevsw[] =
cdev_audio_init(NNP,np), /* 39: NP Intelligent Board */
cdev_graph_init(NQV,qv), /* 40: QVSS graphic display */
cdev_graph_init(NQD,qd), /* 41: QDSS graphic display */
cdev_ipl_init(NIPL,ipl), /* 42: Packet filter */
cdev_ipf_init(NIPFILTER,ipl), /* 42: Packet filter */
cdev_ingres_init(NII,ii), /* 43: Ingres device */
cdev_notdef(), /* 44 was Datakit */
cdev_notdef(), /* 45 was Datakit */

14
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.108 1997/01/05 22:16:51 veego Exp $
# $NetBSD: files,v 1.109 1997/01/07 11:35:21 mrg Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -101,7 +101,7 @@ pseudo-device ppp: ifnet
pseudo-device tun: ifnet
pseudo-device bpfilter: ifnet
pseudo-device strip: ifnet
pseudo-device ipl: ifnet
pseudo-device ipfilter: ifnet
# XXX machine-independent SCSI files should live somewhere here, maybe
@ -301,11 +301,11 @@ file netinet/tcp_subr.c inet
file netinet/tcp_timer.c inet
file netinet/tcp_usrreq.c inet
file netinet/udp_usrreq.c inet
file netinet/ip_fil.c ipl needs-flag
file netinet/fil.c ipl
file netinet/ip_nat.c ipl
file netinet/ip_frag.c ipl
file netinet/ip_state.c ipl
file netinet/ip_fil.c ipfilter needs-flag
file netinet/fil.c ipfilter
file netinet/ip_nat.c ipfilter
file netinet/ip_frag.c ipfilter
file netinet/ip_state.c ipfilter
file netiso/clnp_debug.c iso
file netiso/clnp_er.c iso
file netiso/clnp_frag.c iso

12
sys/conf/files.oldconf
View File

@ -1,4 +1,4 @@
# $NetBSD: files.oldconf,v 1.78 1997/01/06 08:41:19 thorpej Exp $
# $NetBSD: files.oldconf,v 1.79 1997/01/07 11:35:22 mrg Exp $
#
adosfs/adlookup.c optional adosfs
adosfs/adutil.c optional adosfs
@ -190,11 +190,11 @@ netinet/tcp_subr.c optional inet
netinet/tcp_timer.c optional inet
netinet/tcp_usrreq.c optional inet
netinet/udp_usrreq.c optional inet
netinet/ip_fil.c optional ipl device-driver
netinet/fil.c optional ipl
netinet/ip_nat.c optional ipl
netinet/ip_frag.c optional ipl
netinet/ip_state.c optional ipl
netinet/ip_fil.c optional ipfilter device-driver
netinet/fil.c optional ipfilter
netinet/ip_nat.c optional ipfilter
netinet/ip_frag.c optional ipfilter
netinet/ip_state.c optional ipfilter
netiso/clnp_debug.c optional iso
netiso/clnp_er.c optional iso
netiso/clnp_frag.c optional iso

4
sys/sys/conf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.h,v 1.43 1997/01/05 13:41:50 mrg Exp $ */
/* $NetBSD: conf.h,v 1.44 1997/01/07 11:35:24 mrg Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -303,7 +303,7 @@ extern struct cdevsw cdevsw[];
0, dev_init(c,n,poll), dev_init(c,n,mmap) }
/* open, close, read, ioctl */
#define cdev_ipl_init(c,n) { \
#define cdev_ipf_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
(dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \