From owner-svn-src-head@freebsd.org Tue Jul 28 11:20:54 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 243949AD4EC; Tue, 28 Jul 2015 11:20:54 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id A0A3A1CF8; Tue, 28 Jul 2015 11:20:53 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebius.int.ru (localhost [127.0.0.1]) by cell.glebius.int.ru (8.14.9/8.14.9) with ESMTP id t6SBKpQo084837 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 28 Jul 2015 14:20:51 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id t6SBKpnf084836; Tue, 28 Jul 2015 14:20:51 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 28 Jul 2015 14:20:51 +0300 From: Gleb Smirnoff To: Renato Botelho Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r285945 - head/sys/netpfil/pf Message-ID: <20150728112051.GT72729@FreeBSD.org> References: <201507281031.t6SAVZnu046387@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201507281031.t6SAVZnu046387@repo.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 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: Tue, 28 Jul 2015 11:20:54 -0000 Renato, On Tue, Jul 28, 2015 at 10:31:35AM +0000, Renato Botelho wrote: R> Author: garga (ports committer) R> Date: Tue Jul 28 10:31:34 2015 R> New Revision: 285945 R> URL: https://svnweb.freebsd.org/changeset/base/285945 R> R> Log: R> Respect pf rule log option before log dropped packets with IP options or R> dangerous v6 headers R> R> Reviewed by: gnn, eri R> Approved by: gnn R> Obtained from: pfSense R> MFC after: 3 days R> Sponsored by: Netgate R> Differential Revision: https://reviews.freebsd.org/D3222 R> R> Modified: R> head/sys/netpfil/pf/pf.c R> R> Modified: head/sys/netpfil/pf/pf.c R> ============================================================================== R> --- head/sys/netpfil/pf/pf.c Tue Jul 28 09:36:26 2015 (r285944) R> +++ head/sys/netpfil/pf/pf.c Tue Jul 28 10:31:34 2015 (r285945) R> @@ -5895,7 +5895,8 @@ done: R> !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) { R> action = PF_DROP; R> REASON_SET(&reason, PFRES_IPOPTIONS); R> - log = 1; R> + if (r->log) R> + log = 1; R> DPFPRINTF(PF_DEBUG_MISC, R> ("pf: dropping packet with ip options\n")); R> } R> @@ -6329,7 +6330,8 @@ done: R> !((s && s->state_flags & PFSTATE_ALLOWOPTS) || r->allow_opts)) { R> action = PF_DROP; R> REASON_SET(&reason, PFRES_IPOPTIONS); R> - log = 1; R> + if (r->log) R> + log = 1; R> DPFPRINTF(PF_DEBUG_MISC, R> ("pf: dropping packet with dangerous v6 headers\n")); R> } Why not simply: log = r->log; ? That would also match the style of the function, since it already has: log = s->log; -- Totus tuus, Glebius.