[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
More IPF Removal/PF Patches
- To: tech_(_at_)_openbsd_(_dot_)_org
- Subject: More IPF Removal/PF Patches
- From: David Krause <openbsd_(_at_)_davidkrause_(_dot_)_com>
- Date: Wed, 27 Jun 2001 01:01:49 -0500
Here's a patch to remove some more ipf cruft left in the tree and add
a few pf things. There's also a small patch to the www tree.
David
Index: etc/syslog.conf
===================================================================
RCS file: /cvs/src/etc/syslog.conf,v
retrieving revision 1.9
diff -u -r1.9 syslog.conf
--- etc/syslog.conf 2001/06/26 14:53:36 1.9
+++ etc/syslog.conf 2001/06/27 05:49:37
@@ -11,7 +11,7 @@
ftp.info /var/log/xferlog
lpr.debug /var/log/lpd-errs
mail.info /var/log/maillog
-#local0.info /var/log/pflog
+local0.info /var/log/pflog
#uucp.info /var/log/uucp
*.err root
Index: sys/arch/alpha/alpha/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/alpha/alpha/conf.c,v
retrieving revision 1.26
diff -u -r1.26 conf.c
--- sys/arch/alpha/alpha/conf.c 2001/06/26 20:24:10 1.26
+++ sys/arch/alpha/alpha/conf.c 2001/06/27 05:35:46
@@ -109,11 +109,6 @@
cdev_decl(lpt);
cdev_decl(rd);
cdev_decl(raid);
-#ifdef IPFILTER
-#define NIPF 1
-#else
-#define NIPF 0
-#endif
cdev_decl(prom); /* XXX XXX XXX */
cdev_decl(wd);
#include "cy.h"
Index: sys/arch/amiga/include/conf.h
===================================================================
RCS file: /cvs/src/sys/arch/amiga/include/conf.h,v
retrieving revision 1.12
diff -u -r1.12 conf.h
--- sys/arch/amiga/include/conf.h 2000/09/02 13:45:40 1.12
+++ sys/arch/amiga/include/conf.h 2001/06/27 05:35:48
@@ -37,13 +37,6 @@
cdev_decl(grf);
-cdev_decl(ipl);
-#ifdef IPFILTER
-#define NIPF 1
-#else
-#define NIPF 0
-#endif
-
cdev_decl(ite);
cdev_decl(kbd);
Index: sys/arch/i386/conf/DISKLESS
===================================================================
RCS file: /cvs/src/sys/arch/i386/conf/DISKLESS,v
retrieving revision 1.35
diff -u -r1.35 DISKLESS
--- sys/arch/i386/conf/DISKLESS 2001/05/17 00:57:55 1.35
+++ sys/arch/i386/conf/DISKLESS 2001/06/27 05:35:50
@@ -103,8 +103,6 @@
#option ISO,TPIP # OSI
#option EON # OSI tunneling over IP
#option CCITT,LLC,HDLC # X.25
-option IPFILTER # IP packet filter for security
-option IPFILTER_LOG # use /dev/ipl to log IPF
option PPP_BSDCOMP # PPP BSD compression
option PPP_DEFLATE
#option MROUTING # Multicast router
Index: sys/arch/mvmeppc/mvmeppc/conf.c
===================================================================
RCS file: /cvs/src/sys/arch/mvmeppc/mvmeppc/conf.c,v
retrieving revision 1.1
diff -u -r1.1 conf.c
--- sys/arch/mvmeppc/mvmeppc/conf.c 2001/06/26 21:57:52 1.1
+++ sys/arch/mvmeppc/mvmeppc/conf.c 2001/06/27 05:35:55
@@ -146,11 +146,6 @@
cdev_decl(lkm);
-#ifdef IPFILTER
-#define NIPF 1
-#else
-#define NIPF 0
-#endif
#include "ksyms.h"
cdev_decl(ksyms);
@@ -198,7 +193,7 @@
cdev_lkm_dummy(), /* 36 */
cdev_lkm_dummy(), /* 37 */
cdev_lkm_dummy(), /* 38 */
- cdev_gen_ipf(NIPF,ipl), /* 39: IP filter */
+ cdev_pf_init(NPF,pf), /* 39: packet filter */
cdev_random_init(1,random), /* 40: random data source */
cdev_uk_init(NUK,uk), /* 41: unknown SCSI */
cdev_ss_init(NSS,ss), /* 42: SCSI scanner */
Index: sys/arch/sparc/include/conf.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc/include/conf.h,v
retrieving revision 1.10
diff -u -r1.10 conf.h
--- sys/arch/sparc/include/conf.h 1999/07/23 19:11:27 1.10
+++ sys/arch/sparc/include/conf.h 2001/06/27 05:35:57
@@ -76,13 +76,6 @@
cdev_decl(cgfourteen);
-cdev_decl(ipl);
-#ifdef IPFILTER
-#define NIPF 1
-#else
-#define NIPF 0
-#endif
-
bdev_decl(xd);
cdev_decl(xd);
Index: sys/arch/sun3/include/conf.h
===================================================================
RCS file: /cvs/src/sys/arch/sun3/include/conf.h,v
retrieving revision 1.8
diff -u -r1.8 conf.h
--- sys/arch/sun3/include/conf.h 2000/03/02 23:01:45 1.8
+++ sys/arch/sun3/include/conf.h 2001/06/27 05:35:59
@@ -75,13 +75,4 @@
#include "cgfour.h"
cdev_decl(cg4);
-/* IP packet filtering */
-/* open, close, read, ioctl */
-cdev_decl(ipl);
-#ifdef IPFILTER
-#define NIPF 1
-#else
-#define NIPF 0
-#endif
-
cdev_decl(ksyms);
Index: sys/net/if_bridge.c
===================================================================
RCS file: /cvs/src/sys/net/if_bridge.c,v
retrieving revision 1.67
diff -u -r1.67 if_bridge.c
--- sys/net/if_bridge.c 2001/06/26 18:17:53 1.67
+++ sys/net/if_bridge.c 2001/06/27 05:46:03
@@ -1023,12 +1023,6 @@
return;
}
-#if defined(INET) && defined(IPFILTER)
- m = bridge_filter(sc, src_if, &eh, m);
- if (m == NULL)
- return;
-#endif
-
/*
* If the packet is a multicast or broadcast OR if we don't
* know any better, forward it to all interfaces.
Index: donations.html
===================================================================
RCS file: /cvs/www/donations.html,v
retrieving revision 1.288
diff -u -r1.288 donations.html
--- donations.html 2001/06/19 17:23:34 1.288
+++ donations.html 2001/06/27 05:40:51
@@ -621,7 +621,7 @@
<li>Felix Kronlage
<li>Chris Murphy
<li>Chuck Mattern
-<li>Daiv W. Krause
+<li>David W. Krause
<li>Ed Grether
<li>Nathan Binkert
<li><a href="http://www.bottemanne.net";>Aernoudt Bottemanne</a>
Index: faq/faq1.html
===================================================================
RCS file: /cvs/www/faq/faq1.html,v
retrieving revision 1.23
diff -u -r1.23 faq1.html
--- faq/faq1.html 2001/05/05 01:55:32 1.23
+++ faq/faq1.html 2001/06/27 05:40:52
@@ -60,7 +60,7 @@
<li><a href= "../hp300.html">hp300</a>
<li><a href= "../amiga.html">amiga</a>
<li><a href= "../mac68k.html">mac68k</a>
- <li><a href= "../powerpc.html">powerpc</a>
+ <li><a href= "../powerpc.html">powerpc</a> - CD bootable
<li><a href= "../sun3.html">sun3</a>
<li><a href= "../mvme68k.html">mvme68k</a>
<li><a href= "../alpha.html">alpha</a>
Visit your host, monkey.org