From owner-svn-src-all@FreeBSD.ORG Tue Feb 17 21:50:55 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB385A2B; Tue, 17 Feb 2015 21:50:55 +0000 (UTC) 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 498909F9; Tue, 17 Feb 2015 21:50:54 +0000 (UTC) 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 t1HLoqY3065165 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 18 Feb 2015 00:50:52 +0300 (MSK) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebius.int.ru (8.14.9/8.14.9/Submit) id t1HLoqNE065164; Wed, 18 Feb 2015 00:50:52 +0300 (MSK) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to glebius@FreeBSD.org using -f Date: Wed, 18 Feb 2015 00:50:52 +0300 From: Gleb Smirnoff To: Sergey Kandaurov Subject: Re: svn commit: r278831 - head/sys/netpfil/pf Message-ID: <20150217215052.GT15484@FreeBSD.org> References: <201502160338.t1G3cRlX042385@svn.freebsd.org> <20150217173134.GZ1953@funkthat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, John-Mark Gurney , src-committers@freebsd.org, svn-src-all@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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: Tue, 17 Feb 2015 21:50:56 -0000 On Wed, Feb 18, 2015 at 01:40:36AM +0400, Sergey Kandaurov wrote: S> On 17 February 2015 at 20:31, John-Mark Gurney wrote: S> > Gleb Smirnoff wrote this message on Mon, Feb 16, 2015 at 03:38 +0000: S> >> Author: glebius S> >> Date: Mon Feb 16 03:38:27 2015 S> >> New Revision: 278831 S> >> URL: https://svnweb.freebsd.org/changeset/base/278831 S> >> S> >> Log: S> >> Update the pf fragment handling code to closer match recent OpenBSD. S> >> That partially fixes IPv6 fragment handling. Thanks to Kristof for S> >> working on that. S> >> S> >> Submitted by: Kristof Provost S> >> Tested by: peter S> >> Differential Revision: D1765 S> > S> > Looks like pf_flush_fragments still called in !INET case, though only S> > defined for INET case: S> > /scratch/tmp/jmg/src.head/sys/modules/pf/../../netpfil/pf/pf_norm.c:385:3: error: implicit declaration of function 'pf_flush_fragments' is invalid in C99 [-Werror,-Wimplicit-function-declaration] S> > pf_flush_fragments(); S> > S> > when compiling LINT-NOINET kernel.. S> S> With the changes attached I got all three kernels with both cc compiled S> (tested on MINI w/ MODULES_OVERRIDE=pf). Basically, S> - pf_flush_fragments is improperly INET-only S> - pf_find_fragment is properly declared, but its body is under INET S> - pf_refragment6 / pf_reassemble6 are properly under INET6, S> which is also under INET (the latter is wrong). S> - bonus: some functions may be / were static'ized. Thanks, looks very close to patch that I'm build testing now. -- Totus tuus, Glebius.