From owner-svn-src-head@FreeBSD.ORG Fri Dec 16 06:37:28 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDAA8106564A; Fri, 16 Dec 2011 06:37:28 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117]) by mx1.freebsd.org (Postfix) with ESMTP id 3D0638FC16; Fri, 16 Dec 2011 06:37:28 +0000 (UTC) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBG6bNd6031913; Fri, 16 Dec 2011 10:37:23 +0400 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBG6bNnm031912; Fri, 16 Dec 2011 10:37:23 +0400 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Fri, 16 Dec 2011 10:37:23 +0400 From: Gleb Smirnoff To: Peter Jeremy Message-ID: <20111216063723.GD67033@FreeBSD.org> References: <201106281157.p5SBvP5g048097@svn.freebsd.org> <20111214014637.GA30470@server.vk2pj.dyndns.org> <20111216025851.GA79528@server.vk2pj.dyndns.org> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <20111216025851.GA79528@server.vk2pj.dyndns.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, "Bjoern A. Zeeb" , src-committers@FreeBSD.org Subject: Re: svn commit: r223637 - in head: . contrib/pf/authpf contrib/pf/ftp-proxy contrib/pf/man contrib/pf/pfctl contrib/pf/pflogd sbin/pflogd sys/conf sys/contrib/altq/altq sys/contrib/pf/net sys/modules s... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2011 06:37:28 -0000 Peter, On Fri, Dec 16, 2011 at 01:58:51PM +1100, Peter Jeremy wrote: P> On 2011-Jun-28 11:57:25 +0000, "Bjoern A. Zeeb" wrote: P> >Author: bz P> >Date: Tue Jun 28 11:57:25 2011 P> >New Revision: 223637 P> >URL: http://svn.freebsd.org/changeset/base/223637 P> > P> >Log: P> > Update packet filter (pf) code to OpenBSD 4.5. P> P> Further to my mail last Wednesday, I've found nested "#ifdef __FreeBSD__" P> conditionals in pf_ioctl.c as well - it looks like conditional code was P> added to support network stack virtualisation without noting that the P> code was already protectd by a "#ifdef __FreeBSD__". P> P> And cross-checking the $OpenBSD$ tags in the FreeBSD repo against the P> OpenBSD CVSweb throws up consistent off-by-one errors - as an example, P> src/sys/contrib/pf/net/if_pfsync.h in FreeBSD 9.0 states P> "$OpenBSD: if_pfsync.h,v 1.35 2008/06/29 08:42:15 mcbride Exp $" P> but the actual content matches if_pfsync.h v1.36 in OpenBSD CVSweb. P> Is it possible that the pf code was checked out of an OpenBSD repo P> without the correct $OpenBSD$ tag expansion? P> P> This caused me a degree of confusion whilst trying to correlate the P> FreeBSD code with the OpenBSD code to try and update bin/124825 Particular changes were picked from OpenBSD after the r223637, to make pfsync(4) function properly. For example: http://svnweb.freebsd.org/base?view=revision&revision=226663 -- Totus tuus, Glebius.