From owner-freebsd-net@FreeBSD.ORG Sat Feb 4 15:47:33 2006
Return-Path: <owner-freebsd-net@FreeBSD.ORG>
X-Original-To: freebsd-net@freebsd.org
Delivered-To: freebsd-net@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id AD5A816A428;
Sat, 4 Feb 2006 15:47:33 +0000 (GMT)
(envelope-from max@love2party.net)
Received: from moutng.kundenserver.de (moutng.kundenserver.de
[212.227.126.183])
by mx1.FreeBSD.org (Postfix) with ESMTP id 5989743DBA;
Sat, 4 Feb 2006 15:16:00 +0000 (GMT)
(envelope-from max@love2party.net)
Received: from [84.163.215.92] (helo=amd64.laiers.local)
by mrelayeu.kundenserver.de (node=mrelayeu5) with ESMTP (Nemesis),
id 0ML25U-1F5P8S3aE3-0001U1; Sat, 04 Feb 2006 16:15:37 +0100
From: Max Laier <max@love2party.net>
Organization: FreeBSD
To: freebsd-net@freebsd.org
Date: Sat, 4 Feb 2006 16:16:49 +0100
User-Agent: KMail/1.9.1
References: <20060201005658.A70005@xorpc.icir.org>
<20060202124328.GK29980@comp.chem.msu.su>
<200602021437.38385.max@love2party.net>
In-Reply-To: <200602021437.38385.max@love2party.net>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="nextPart4197274.ZzDGzHRBr5";
protocol="application/pgp-signature"; micalg=pgp-sha1
Content-Transfer-Encoding: 7bit
Message-Id: <200602041616.57224.max@love2party.net>
X-Provags-ID: kundenserver.de abuse@kundenserver.de
login:61c499deaeeba3ba5be80f48ecc83056
Cc: Yar Tikhiy <yar@comp.chem.msu.su>, Hajimu UMEMOTO <ume@freebsd.org>,
Luigi Rizzo <rizzo@icir.org>
Subject: Re: if_bridge.ko requires INET6...
X-BeenThere: freebsd-net@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Networking and TCP/IP with FreeBSD <freebsd-net.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
<mailto:freebsd-net-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-net>
List-Post: <mailto:freebsd-net@freebsd.org>
List-Help: <mailto:freebsd-net-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-net>,
<mailto:freebsd-net-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Feb 2006 15:47:34 -0000
--nextPart4197274.ZzDGzHRBr5
Content-Type: multipart/mixed;
boundary="Boundary-01=_kVM5D5hFKlRPKy7"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--Boundary-01=_kVM5D5hFKlRPKy7
Content-Type: text/plain;
charset="iso-8859-6"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Thursday 02 February 2006 14:37, Max Laier wrote:
> On Thursday 02 February 2006 13:43, Yar Tikhiy wrote:
> > > This needs to be fixed in pf then.
> >
> > Max Laier and I discussed this issue once, and Max had concern
> > over possible performance degradation that might result from
> > calling pflog functions through pointers to be set by a separate
> > pflog module. We can skip touching the pf module in RELENG_6 for
> > now and leave the issue to after 6.1-RELEASE is out.
>
> I have convinced myself that we should really use a function pointer here=
=2E=20
> I will try to commit a sollution to HEAD over the weekend. If you are
> MFC'ing the changes *now*, I'd appreciate if you could spare out pf, but I
> am willing to MFC the changes before 6.1 if testing goes well.
Here it is. I'd appreciate feedback. pflog_packet() uses a lot of complex=
=20
types which makes it necessary to include pfvar.h. This is ugly, but I don=
't=20
know how to work around this.
=2D-=20
/"\ Best regards, | mlaier@freebsd.org
\ / Max Laier | ICQ #67774661
X http://pf4freebsd.love2party.net/ | mlaier@EFnet
/ \ ASCII Ribbon Campaign | Against HTML Mail and News
--Boundary-01=_kVM5D5hFKlRPKy7
Content-Type: text/x-diff;
charset="iso-8859-6";
name="pflog_module.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="pflog_module.diff"
Index: contrib/pf/net/if_pflog.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/pf/net/if_pflog.c,v
retrieving revision 1.18
diff -u -r1.18 if_pflog.c
=2D-- contrib/pf/net/if_pflog.c 5 Dec 2005 11:58:31 -0000 1.18
+++ contrib/pf/net/if_pflog.c 4 Feb 2006 15:09:11 -0000
@@ -376,9 +376,15 @@
case MOD_LOAD:
LIST_INIT(&pflog_list);
if_clone_attach(&pflog_cloner);
+ PF_LOCK();
+ pflog_packet_ptr =3D pflog_packet;
+ PF_UNLOCK();
break;
=20
case MOD_UNLOAD:
+ PF_LOCK();
+ pflog_packet_ptr =3D NULL;
+ PF_UNLOCK();
if_clone_detach(&pflog_cloner);
break;
=20
@@ -400,4 +406,5 @@
=20
DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY=
);
MODULE_VERSION(pflog, PFLOG_MODVER);
+MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER);
#endif /* __FreeBSD__ */
Index: contrib/pf/net/if_pflog.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/pf/net/if_pflog.h,v
retrieving revision 1.6
diff -u -r1.6 if_pflog.h
=2D-- contrib/pf/net/if_pflog.h 10 Jun 2005 16:49:03 -0000 1.6
+++ contrib/pf/net/if_pflog.h 4 Feb 2006 15:08:59 -0000
@@ -70,10 +70,24 @@
=20
#ifdef _KERNEL
=20
+#ifdef __FreeBSD__
+/* XXX */
+#include <net/pfvar.h>
+
+typedef int pflog_packet_t(struct pfi_kif *, struct mbuf *, sa_family_t,
+ u_int8_t, u_int8_t, struct pf_rule *, struct pf_rule *,
+ struct pf_ruleset *);
+extern pflog_packet_t *pflog_packet_ptr;
+#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) do { \
+ if (pflog_packet_ptr !=3D NULL) \
+ pflog_packet_ptr(i,a,b,c,d,e,f,g); \
+} while (0)
+#else
#if NPFLOG > 0
#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) pflog_packet(i,a,b,c,d,e,f,g)
#else
#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) ((void)0)
#endif /* NPFLOG > 0 */
+#endif /* __FreeBSD__ */
#endif /* _KERNEL */
#endif /* _NET_IF_PFLOG_H_ */
Index: contrib/pf/net/pf_ioctl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/contrib/pf/net/pf_ioctl.c,v
retrieving revision 1.22
diff -u -r1.22 pf_ioctl.c
=2D-- contrib/pf/net/pf_ioctl.c 5 Dec 2005 11:58:31 -0000 1.22
+++ contrib/pf/net/pf_ioctl.c 4 Feb 2006 15:09:30 -0000
@@ -108,6 +108,10 @@
#include <net/if_pfsync.h>
#endif /* NPFSYNC > 0 */
=20
+#ifdef __FreeBSD__
+#include <net/if_pflog.h>
+#endif
+
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet/in_pcb.h>
@@ -230,6 +234,7 @@
=20
static volatile int pf_pfil_hooked =3D 0;
struct mtx pf_task_mtx;
+pflog_packet_t *pflog_packet_ptr =3D NULL;
=20
void
init_pf_mutex(void)
Index: modules/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/modules/Makefile,v
retrieving revision 1.472
diff -u -r1.472 Makefile
=2D-- modules/Makefile 31 Jan 2006 23:11:35 -0000 1.472
+++ modules/Makefile 3 Feb 2006 22:57:36 -0000
@@ -180,6 +180,7 @@
pcn \
${_pecoff} \
${_pf} \
+ ${_pflog} \
plip \
${_pmc} \
portalfs \
@@ -307,6 +308,7 @@
=20
.if !defined(NO_PF) || defined(ALL_MODULES)
_pf=3D pf
+_pflog=3D pflog
.endif
=20
.if ${MACHINE_ARCH} =3D=3D "i386"
Index: modules/pf/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /usr/store/mlaier/fcvs/src/sys/modules/pf/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
=2D-- modules/pf/Makefile 14 Oct 2005 23:30:14 -0000 1.8
+++ modules/pf/Makefile 3 Feb 2006 22:46:23 -0000
@@ -6,7 +6,6 @@
=20
KMOD=3D pf
SRCS =3D pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c=
\
=2D if_pflog.c \
in4_cksum.c \
opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
=20
@@ -15,7 +14,6 @@
.if !defined(KERNBUILDDIR)
opt_pf.h:
echo "#define DEV_PF 1" > opt_pf.h
=2D echo "#define DEV_PFLOG 1" >> opt_pf.h
=20
opt_inet.h:
echo "#define INET 1" > opt_inet.h
Index: modules/pflog/Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: modules/pflog/Makefile
diff -N modules/pflog/Makefile
=2D-- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/pflog/Makefile 3 Feb 2006 22:48:31 -0000
@@ -0,0 +1,29 @@
+# $FreeBSD: src/sys/modules/pf/Makefile,v 1.8 2005/10/14 23:30:14 yar Exp $
+
+.PATH: ${.CURDIR}/../../contrib/pf/net
+.PATH: ${.CURDIR}/../../contrib/pf/netinet
+.PATH: ${.CURDIR}/../../netinet
+
+KMOD=3D pflog
+SRCS =3D if_pflog.c \
+ opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h
+
+CFLAGS+=3D -I${.CURDIR}/../../contrib/pf
+
+.if !defined(KERNBUILDDIR)
+opt_pf.h:
+ echo "#define DEV_PFLOG 1" > opt_pf.h
+
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
+.if !defined(NO_INET6)
+opt_inet6.h:
+ echo "#define INET6 1" > opt_inet6.h
+.endif
+
+opt_bpf.h:
+ echo "#define DEV_BPF 1" > opt_bpf.h
+.endif
+
+.include <bsd.kmod.mk>
--Boundary-01=_kVM5D5hFKlRPKy7--
--nextPart4197274.ZzDGzHRBr5
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQBD5MVpXyyEoT62BG0RArKdAJ9FcvWSTOXhfnTdV+v0N7cKwWAgtACfdk7q
RDFehxFbPrkNNb8oFiuxuKE=
=+B4R
-----END PGP SIGNATURE-----
--nextPart4197274.ZzDGzHRBr5--