From owner-svn-src-head@freebsd.org Fri May 10 15:31:30 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FDD615A5554; Fri, 10 May 2019 15:31:30 +0000 (UTC) (envelope-from gallatin@cs.duke.edu) Received: from duke.cs.duke.edu (duke.cs.duke.edu [152.3.140.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7DA3755D9; Fri, 10 May 2019 15:31:29 +0000 (UTC) (envelope-from gallatin@cs.duke.edu) Received: from [192.168.200.4] (c-71-56-186-158.hsd1.va.comcast.net [71.56.186.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: gallatin) by duke.cs.duke.edu (Postfix) with ESMTPSA id 97D50270025C; Fri, 10 May 2019 11:31:22 -0400 (EDT) DMARC-Filter: OpenDMARC Filter v1.3.1 duke.cs.duke.edu 97D50270025C DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=cs.duke.edu; s=mail0816; t=1557502282; bh=qaFk2Vzc6wcd9n5JTnvelYNCbwwERo4Mc1KslPMq8lI=; h=Subject:To:From:Date:From; b=aBhOv8UxCZWJbVCZTZBgDd1tprIePciI9CgK3g7n8+IVQstrwRd9YSW+9XJ6r/KdZ /C5oNReOXNUmvWDvwwEMD4MGyv/UyV6Xgp/02RJkjxu2JQIZrR/6SZiFnPPBzHVYAn diMG28R929eqznUoKa6oVcD2YSf0RziSmHBVIteG8/Z0XYuUjeZzCj7m87FDmp5aY9 uZPs+AxFRMrRGrdFX+1bx001jqkWcZjGXFtFfJFePNSmursCQW5RtfgzCYAjSBnJrX yLc7VrHomz9nnvmzgeU0LtwtDyDYa0gGJWr+XYoOE7LdOhoVeb7SXtSMNGBADQB8q4 hXP1xj3TtgKvA== Subject: Re: svn commit: r347410 - in head: . sys/amd64/conf sys/arm/conf sys/arm64/conf sys/i386/conf sys/powerpc/conf sys/riscv/conf sys/sparc64/conf To: Slawa Olhovchenkov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, kp@freebsd.org References: <201905092238.x49McFCO015665@repo.freebsd.org> <20190510124458.GB65054@zxy.spb.ru> From: Andrew Gallatin Message-ID: <0842eef5-5f1f-c25a-a470-a424c536f1ed@cs.duke.edu> Date: Fri, 10 May 2019 11:31:21 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190510124458.GB65054@zxy.spb.ru> Content-Type: multipart/mixed; boundary="------------FA406BCE8D96BE8CAE3E7A66" Content-Language: en-US X-Rspamd-Queue-Id: C7DA3755D9 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.85 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.85)[-0.854,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 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, 10 May 2019 15:31:30 -0000 This is a multi-part message in MIME format. --------------FA406BCE8D96BE8CAE3E7A66 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2019-05-10 08:44, Slawa Olhovchenkov wrote: > pf have ifdef for IPSEC, but don't have support IPSEC_SUPPORT > (netpfil/pf/if_pfsync.c). > Thanks for pointing this out. It seems like IPSEC_SUPPORT would work for this. I've made a patch, and it compiles and the pf module loads. However, I have no knowledge of how to test it. Is this something that you use, and which you can test? Thanks, Drew --------------FA406BCE8D96BE8CAE3E7A66 Content-Type: text/x-patch; name="pf.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="pf.diff" diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 45b1e090f95c..cc06637b862e 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -308,7 +308,7 @@ static void pfsync_bulk_update(void *); static void pfsync_bulk_fail(void *); static void pfsync_detach_ifnet(struct ifnet *); -#ifdef IPSEC +#ifdef IPSEC_SUPPORT static void pfsync_update_net_tdb(struct pfsync_tdb *); #endif static struct pfsync_bucket *pfsync_get_bucket(struct pfsync_softc *, @@ -1228,7 +1228,7 @@ pfsync_in_tdb(struct pfsync_pkt *pkt, struct mbuf *m, int offset, int count) { int len = count * sizeof(struct pfsync_tdb); -#if defined(IPSEC) +#if defined(IPSEC_SUPPORT) struct pfsync_tdb *tp; struct mbuf *mp; int offp; @@ -1249,7 +1249,7 @@ pfsync_in_tdb(struct pfsync_pkt *pkt, struct mbuf *m, int offset, int count) return (len); } -#if defined(IPSEC) +#if defined(IPSEC_SUPPORT) /* Update an in-kernel tdb. Silently fail if no tdb is found. */ static void pfsync_update_net_tdb(struct pfsync_tdb *pt) --------------FA406BCE8D96BE8CAE3E7A66--