Date: Wed, 17 Oct 2007 23:57:10 +0200 From: Max Laier <max@love2party.net> To: freebsd-current@freebsd.org Cc: "Victor M. Blood" <freebsd@masm.elcom.ru> Subject: Re: ipfilter cannot be build within because warning's are present Message-ID: <200710172357.18221.max@love2party.net> In-Reply-To: <359284519.20071018014832@masm.elcom.ru> References: <359284519.20071018014832@masm.elcom.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart1417222.lJKD1DpSHP
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Wednesday 17 October 2007, Victor M. Blood wrote:
> Hi, All.
>
> I try to use options in kernel instead of a module build of the
> ipfilter and got error then kernel builds.
>
> I'm edit files: fil.c, ip_auth.h, ip_auth.h, ip_log.c ip_compat.h and
> correct #ifdef statament :) no more warnings...
ipf is likely broken anyway. See thread: "7.0 CURRENT, need help with=20
panic: Trying sleep, but thread marked as sleeping prohibited" on this ML=20
a few days back. That this warning went unnoticed tells you something,=20
too.
> --- sys/contrib/ipfilter/netinet/ip_log.c.orig 2007-10-18
> 01:28:36.000000000 +0400 +++ sys/contrib/ipfilter/netinet/ip_log.c =20
> 2007-10-18 01:30:47.000000000 +0400 @@ -49,7 +49,7 @@
> # undef _KERNEL
> # undef KERNEL
> #endif
> -#if __FreeBSD_version >=3D 220000 && defined(_KERNEL)
> +#if (defined(__FreeBSD_version) && (__FreeBSD_version >=3D 220000)) &&
> defined(_KERNEL) # include <sys/fcntl.h>
> # include <sys/filio.h>
> #else
> @@ -58,12 +58,14 @@
> #include <sys/time.h>
> #if defined(_KERNEL)
> # include <sys/systm.h>
> -# if defined(NetBSD) && (__NetBSD_Version__ >=3D 104000000)
> +# if (defined(NetBSD) && (__NetBSD_Version__ >=3D 104000000))
> # include <sys/proc.h>
> # endif
> #endif /* _KERNEL */
> #if !SOLARIS && !defined(__hpux) && !defined(linux)
> -# if (NetBSD > 199609) || (OpenBSD > 199603) || (__FreeBSD_version >=3D
> 300000) +# if (defined(NetBSD) && (NetBSD > 199609)) || \
> + (defined(OpenBSD) && (OpenBSD > 199603)) || \
> + (defined(__FreeBSD_version) && (__FreeBSD_version >=3D 300000))
> # include <sys/dirent.h>
> # else
> # include <sys/dir.h>
> --- sys/contrib/ipfilter/netinet/fil.c.orig 2007-10-18
> 01:27:16.000000000 +0400 +++ sys/contrib/ipfilter/netinet/fil.c=20
> 2007-10-18 01:30:38.000000000 +0400 @@ -2509,7 +2509,7 @@
> } else
> #endif
> {
> -#if (OpenBSD >=3D 200311) && defined(_KERNEL)
> +#if (defined(OpenBSD) && (OpenBSD >=3D 200311)) && defined(_KERNEL)
> ip->ip_len =3D ntohs(ip->ip_len);
> ip->ip_off =3D ntohs(ip->ip_off);
> #endif
> @@ -2772,7 +2772,7 @@
> RWLOCK_EXIT(&ipf_global);
>
> #ifdef _KERNEL
> -# if OpenBSD >=3D 200311
> +# if (defined(OpenBSD) && (OpenBSD >=3D 200311))
> if (FR_ISPASS(pass) && (v =3D=3D 4)) {
> ip =3D fin->fin_ip;
> ip->ip_len =3D ntohs(ip->ip_len);
> --- sys/contrib/ipfilter/netinet/ip_auth.c.orig 2007-10-18
> 01:28:03.000000000 +0400 +++ sys/contrib/ipfilter/netinet/ip_auth.c =20
> 2007-10-18 01:30:30.000000000 +0400 @@ -50,7 +50,7 @@
> # include <sys/stream.h>
> # include <sys/kmem.h>
> #endif
> -#if (_BSDI_VERSION >=3D 199802) || (__FreeBSD_version >=3D 400000)
> +#if (defined(_BSDI_VERSION) && (_BSDI_VERSION >=3D 199802)) ||
> (defined(__FreeBSD_version) &&(__FreeBSD_version >=3D 400000)) # include
> <sys/queue.h>
> #endif
> #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(bsdi)
> --- sys/contrib/ipfilter/netinet/ip_compat.h.orig 2007-10-18
> 01:29:24.000000000 +0400 +++ sys/contrib/ipfilter/netinet/ip_compat.h =20
> 2007-10-18 01:30:56.000000000 +0400 @@ -34,7 +34,7 @@
> #ifndef SOLARIS
> #define SOLARIS (defined(sun) && (defined(__svr4__) ||
> defined(__SVR4))) #endif
> -#if SOLARIS2 >=3D 8
> +#if (defined(SOLARIS2) && (SOLARIS2 >=3D 8))
> # ifndef USE_INET6
> # define USE_INET6
> # endif
=2D-=20
/"\ Best regards, | mlaier@freebsd.org
\ / Max Laier | ICQ #67774661
X http://pf4freebsd.love2party.net/ | mlaier@EFnet
/ \ ASCII Ribbon Campaign | Against HTML Mail and News
--nextPart1417222.lJKD1DpSHP
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.4 (FreeBSD)
iD8DBQBHFoU+XyyEoT62BG0RAmHyAJ48POCBRNe+UMHEJBH8CfMQ3WjYSQCeM1h+
zL5YcyLAEhLJJxK/GH4ZvKI=
=edGc
-----END PGP SIGNATURE-----
--nextPart1417222.lJKD1DpSHP--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710172357.18221.max>