Date: Sat, 25 Jun 2016 21:39:21 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r302203 - projects/vnet/sys/contrib/ipfilter/netinet Message-ID: <201606252139.u5PLdLNR030179@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <netinet/tcp_timer.h> 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 <sys/queue.h> #endif #include <net/if.h> +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL) +#include <net/vnet.h> +#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 <net/af.h> #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 <sys/sockio.h> +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL) +#include <net/vnet.h> +#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 <sys/ioctl.h> #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 <sys/param.h> #include <sys/systm.h> @@ -20,6 +26,15 @@ # include <sys/selinfo.h> # include <sys/jail.h> #endif +#if defined(__FreeBSD_version) && (__FreeBSD_version >= 800000) && defined(_KERNEL) +#include <net/vnet.h> +#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 <net/if.h> #include <netinet/in_systm.h> #include <netinet/in.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606252139.u5PLdLNR030179>