From owner-p4-projects@FreeBSD.ORG Thu Apr 19 14:01:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D593216A402; Thu, 19 Apr 2007 14:01:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5808216A406; Thu, 19 Apr 2007 14:01:52 +0000 (UTC) (envelope-from max@love2party.net) Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.126.177]) by mx1.freebsd.org (Postfix) with ESMTP id E12D413C480; Thu, 19 Apr 2007 14:01:51 +0000 (UTC) (envelope-from max@love2party.net) Received: from [88.64.184.8] (helo=amd64.laiers.local) by mrelayeu.kundenserver.de (node=mrelayeu8) with ESMTP (Nemesis), id 0ML31I-1HeX0c3ymy-0005uv; Thu, 19 Apr 2007 15:49:15 +0200 From: Max Laier Organization: FreeBSD To: Marko Zec Date: Thu, 19 Apr 2007 15:49:07 +0200 User-Agent: KMail/1.9.5 References: <200704190739.l3J7dFng023292@repoman.freebsd.org> In-Reply-To: <200704190739.l3J7dFng023292@repoman.freebsd.org> X-Face: ,,8R(x[kmU]tKN@>gtH1yQE4aslGdu+2]; R]*pL,U>^H?)gW@49@wdJ`H<=?utf-8?q?=25=7D*=5FBD=0A=09U=5For=3D=5CmOZf764=26nYj=3DJYbR1PW0ud?=>|!~,,CPC.1-D$FG@0h3#'5"k{V]a~.<=?utf-8?q?mZ=7D44=23Se=7Em=0A=09Fe=7E=5C=5DX5B=5D=5Fxj?=(ykz9QKMw_l0C2AQ]}Ym8)fU MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1607217.gSfsnSrB6R"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <200704191549.13955.max@love2party.net> X-Provags-ID: V01U2FsdGVkX18U7QrOIDtHBSzCPXruglGRAh7oSlUDLCfm9Oe 6xIBN3pp9ybjy9EaKpoSxHVhwhk4Njjgi6/DXBPEMQCNB4Tg0+ x6Dr+Zot7jRFBiwg/6r0g== Cc: Perforce Change Reviews Subject: Re: PERFORCE change 118399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Apr 2007 14:01:53 -0000 --nextPart1607217.gSfsnSrB6R Content-Type: text/plain; charset="iso-8859-6" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Thursday 19 April 2007 09:39, Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D118399 > > Change 118399 by zec@zec_tca51 on 2007/04/19 07:38:43 > > Fix to allow compilation with nooptions VIMAGE. > > Affected files ... > > .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 edit > > Differences ... > > =3D=3D=3D=3D //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#5 > (text+ko) =3D=3D=3D=3D > > @@ -401,10 +401,14 @@ > callout_reset(&V_pf_expire_to, my_timeout[PFTM_INTERVAL] * hz, > pf_purge_timeout, curvnet); > > -if (curvnet =3D=3D &vnet_0) { > +#ifdef VIMAGE > + if (curvnet =3D=3D &vnet_0) { > +#endif > pf_normalize_init(); > pf_pfil_hooked =3D 0; > -} > +#ifdef VIMAGE > + } > +#endif I don't quite understand this one. I'd believe that pf_pfil_hooked should= =20 be virtualized as well. Otherwise you can only enable/hook all instances=20 at once. > bzero(&V_pf_status, sizeof(V_pf_status)); > /* XXX do our best to avoid a conflict */ =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 --nextPart1607217.gSfsnSrB6R Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQBGJ3NZXyyEoT62BG0RAohuAJ0VnhsPm20LFxQXESZEWZBMFWEPZwCeMMVH a1bts9w7/jrRpq90KIYnyvc= =sAWa -----END PGP SIGNATURE----- --nextPart1607217.gSfsnSrB6R--