From owner-svn-src-all@FreeBSD.ORG Fri Dec 16 09:13:35 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C052106566B; Fri, 16 Dec 2011 09:13:35 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:130:3ffc::401:25]) by mx1.freebsd.org (Postfix) with ESMTP id CE3508FC13; Fri, 16 Dec 2011 09:13:34 +0000 (UTC) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:31::2013:587]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 6509B25D37D1; Fri, 16 Dec 2011 09:13:33 +0000 (UTC) Received: from content-filter.sbone.de (content-filter.sbone.de [IPv6:fde9:577b:c1a9:31::2013:2742]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 623D5BD71C7; Fri, 16 Dec 2011 09:13:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:31::2013:587]) by content-filter.sbone.de (content-filter.sbone.de [fde9:577b:c1a9:31::2013:2742]) (amavisd-new, port 10024) with ESMTP id EMm0v+uRE6Sx; Fri, 16 Dec 2011 09:13:31 +0000 (UTC) Received: from orange-en1.sbone.de (orange-en1.sbone.de [IPv6:fde9:577b:c1a9:31:cabc:c8ff:fecf:e8e3]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 587D9BD71C6; Fri, 16 Dec 2011 09:13:31 +0000 (UTC) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=us-ascii From: "Bjoern A. Zeeb" In-Reply-To: <20111216025851.GA79528@server.vk2pj.dyndns.org> Date: Fri, 16 Dec 2011 09:13:30 +0000 Content-Transfer-Encoding: 7bit Message-Id: References: <201106281157.p5SBvP5g048097@svn.freebsd.org> <20111214014637.GA30470@server.vk2pj.dyndns.org> <20111216025851.GA79528@server.vk2pj.dyndns.org> To: Peter Jeremy X-Mailer: Apple Mail (2.1084) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Dec 2011 09:13:35 -0000 On 16. Dec 2011, at 02:58 , Peter Jeremy wrote: > On 2011-Jun-28 11:57:25 +0000, "Bjoern A. Zeeb" wrote: >> Author: bz >> Date: Tue Jun 28 11:57:25 2011 >> New Revision: 223637 >> URL: http://svn.freebsd.org/changeset/base/223637 >> >> Log: >> Update packet filter (pf) code to OpenBSD 4.5. > > Further to my mail last Wednesday, I've found nested "#ifdef __FreeBSD__" > conditionals in pf_ioctl.c as well - it looks like conditional code was > added to support network stack virtualisation without noting that the > code was already protectd by a "#ifdef __FreeBSD__". I have run unifdef on the code before but didn't want to do a sweeping commit before 9.0 was handled. The virtualization #ifdefs should go anyway from the middle of the code and be done with the #define so that Open could easily pick it up if we'd be at the same level. Expect that this will be dealt with eventually. -- Bjoern A. Zeeb You have to have visions! Stop bit received. Insert coin for new address family.