From owner-svn-src-projects@freebsd.org Sat Jun 25 21:39:22 2016 Return-Path: Delivered-To: svn-src-projects@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 CE763B82CC6 for ; Sat, 25 Jun 2016 21:39:22 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (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 9DE0B1867; Sat, 25 Jun 2016 21:39:22 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5PLdLpH030183; Sat, 25 Jun 2016 21:39:21 GMT (envelope-from bz@FreeBSD.org) Received: (from bz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5PLdLNR030179; Sat, 25 Jun 2016 21:39:21 GMT (envelope-from bz@FreeBSD.org) Message-Id: <201606252139.u5PLdLNR030179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org using -f From: "Bjoern A. Zeeb" Date: Sat, 25 Jun 2016 21:39:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r302203 - projects/vnet/sys/contrib/ipfilter/netinet X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jun 2016 21:39:22 -0000 Author: bz Date: Sat Jun 25 21:39:21 2016 New Revision: 302203 URL: https://svnweb.freebsd.org/changeset/base/302203 Log: Make ipfilter user space parts compile as well. Sponsored by: The FreeBSD Foundation Modified: projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c projects/vnet/sys/contrib/ipfilter/netinet/ip_proxy.c projects/vnet/sys/contrib/ipfilter/netinet/ip_rules.c projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c Modified: projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c ============================================================================== --- projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Jun 25 20:31:20 2016 (r302202) +++ projects/vnet/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c Sat Jun 25 21:39:21 2016 (r302203) @@ -62,6 +62,9 @@ static const char rcsid[] = "@(#)$Id$"; #else #define CURVNET_SET(arg) #define CURVNET_RESTORE() +#define VNET_DEFINE(_t, _v) _t _v +#define VNET_DECLARE(_t, _v) extern _t _v +#define VNET(arg) arg #endif #if defined(__osf__) # include Modified: projects/vnet/sys/contrib/ipfilter/netinet/ip_proxy.c ============================================================================== --- projects/vnet/sys/contrib/ipfilter/netinet/ip_proxy.c Sat Jun 25 20:31:20 2016 (r302202) +++ projects/vnet/sys/contrib/ipfilter/netinet/ip_proxy.c Sat Jun 25 21:39:21 2016 (r302203) @@ -64,6 +64,15 @@ struct file; # include #endif #include +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL) +#include +#else +#define CURVNET_SET(arg) +#define CURVNET_RESTORE() +#define VNET_DEFINE(_t, _v) _t _v +#define VNET_DECLARE(_t, _v) extern _t _v +#define VNET(arg) arg +#endif #ifdef sun # include #endif Modified: projects/vnet/sys/contrib/ipfilter/netinet/ip_rules.c ============================================================================== --- projects/vnet/sys/contrib/ipfilter/netinet/ip_rules.c Sat Jun 25 20:31:20 2016 (r302202) +++ projects/vnet/sys/contrib/ipfilter/netinet/ip_rules.c Sat Jun 25 21:39:21 2016 (r302203) @@ -32,6 +32,15 @@ #endif #if defined(__FreeBSD__) && (__FreeBSD_version > 220000) # include +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL) +#include +#else +#define CURVNET_SET(arg) +#define CURVNET_RESTORE() +#define VNET_DEFINE(_t, _v) _t _v +#define VNET_DECLARE(_t, _v) extern _t _v +#define VNET(arg) arg +#endif #else # include #endif /* FreeBSD */ Modified: projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c ============================================================================== --- projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c Sat Jun 25 20:31:20 2016 (r302202) +++ projects/vnet/sys/contrib/ipfilter/netinet/mlfk_ipl.c Sat Jun 25 21:39:21 2016 (r302203) @@ -7,6 +7,12 @@ * See the IPFILTER.LICENCE file for details on licencing. */ +#if defined(KERNEL) || defined(_KERNEL) +# undef KERNEL +# undef _KERNEL +# define KERNEL 1 +# define _KERNEL 1 +#endif #include #include @@ -20,6 +26,15 @@ # include # include #endif +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL) +#include +#else +#define CURVNET_SET(arg) +#define CURVNET_RESTORE() +#define VNET_DEFINE(_t, _v) _t _v +#define VNET_DECLARE(_t, _v) extern _t _v +#define VNET(arg) arg +#endif #include #include #include