Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 May 2020 11:43:18 +0200
From:      "Hartmann, O." <ohartmann@walstatt.org>
To:        John Baldwin <jhb@FreeBSD.org>
Cc:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   Re: svn commit: r361633 - in head/sys: net netipsec
Message-ID:  <20200531114318.2b415934@hermann.fritz.box>
In-Reply-To: <202005291922.04TJMemQ098017@repo.freebsd.org>
References:  <202005291922.04TJMemQ098017@repo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--Sig_/K9D9Cgo_rXCeD=+Maiy_5WL
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

On Fri, 29 May 2020 19:22:40 +0000 (UTC)
John Baldwin <jhb@FreeBSD.org> wrote:

> Author: jhb
> Date: Fri May 29 19:22:40 2020
> New Revision: 361633
> URL: https://svnweb.freebsd.org/changeset/base/361633
>=20
> Log:
>   Consistently include opt_ipsec.h for consumers of
> <netipsec/ipsec.h>.=20
>   This fixes ipsec.ko to include all of IPSEC_DEBUG.
>  =20
>   Reviewed by:	imp
>   MFC after:	2 weeks
>   Sponsored by:	Netflix
>   Differential Revision:	https://reviews.freebsd.org/D25046
>=20
> Modified:
>   head/sys/net/if_enc.c
>   head/sys/net/if_ipsec.c
>   head/sys/netipsec/ipsec.h
>   head/sys/netipsec/ipsec_mbuf.c
>   head/sys/netipsec/xform_ah.c
>   head/sys/netipsec/xform_esp.c
>   head/sys/netipsec/xform_ipcomp.c
>=20
> Modified: head/sys/net/if_enc.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/net/if_enc.c	Fri May 29 19:21:35 2020
> (r361632) +++ head/sys/net/if_enc.c	Fri May 29 19:22:40
> 2020	(r361633) @@ -32,6 +32,7 @@
> =20
>  #include "opt_inet.h"
>  #include "opt_inet6.h"
> +#include "opt_ipsec.h"
> =20
>  #include <sys/param.h>
>  #include <sys/systm.h>
>=20
> Modified: head/sys/net/if_ipsec.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/net/if_ipsec.c	Fri May 29 19:21:35 2020
> (r361632) +++ head/sys/net/if_ipsec.c	Fri May 29 19:22:40
> 2020	(r361633) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
> =20
>  #include "opt_inet.h"
>  #include "opt_inet6.h"
> +#include "opt_ipsec.h"
> =20
>  #include <sys/param.h>
>  #include <sys/systm.h>
>=20
> Modified: head/sys/netipsec/ipsec.h
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/netipsec/ipsec.h	Fri May 29 19:21:35 2020
> (r361632) +++ head/sys/netipsec/ipsec.h	Fri May 29 19:22:40
> 2020	(r361633) @@ -39,11 +39,6 @@
>  #ifndef _NETIPSEC_IPSEC_H_
>  #define _NETIPSEC_IPSEC_H_
> =20
> -#if defined(_KERNEL) && !defined(_LKM) && !defined(KLD_MODULE)
> -#include "opt_inet.h"
> -#include "opt_ipsec.h"
> -#endif
> -
>  #include <net/pfkeyv2.h>
>  #include <netipsec/keydb.h>
> =20
>=20
> Modified: head/sys/netipsec/ipsec_mbuf.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/netipsec/ipsec_mbuf.c	Fri May 29 19:21:35
> 2020	(r361632) +++ head/sys/netipsec/ipsec_mbuf.c	Fri
> May 29 19:22:40 2020	(r361633) @@ -32,6 +32,8 @@
>   * IPsec-specific mbuf routines.
>   */
> =20
> +#include "opt_ipsec.h"
> +
>  #include <sys/param.h>
>  #include <sys/systm.h>
>  #include <sys/malloc.h>
>=20
> Modified: head/sys/netipsec/xform_ah.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/netipsec/xform_ah.c	Fri May 29 19:21:35
> 2020	(r361632) +++ head/sys/netipsec/xform_ah.c	Fri May
> 29 19:22:40 2020	(r361633) @@ -38,6 +38,7 @@
>   */
>  #include "opt_inet.h"
>  #include "opt_inet6.h"
> +#include "opt_ipsec.h"
> =20
>  #include <sys/param.h>
>  #include <sys/systm.h>
>=20
> Modified: head/sys/netipsec/xform_esp.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/netipsec/xform_esp.c	Fri May 29 19:21:35
> 2020	(r361632) +++ head/sys/netipsec/xform_esp.c	Fri
> May 29 19:22:40 2020	(r361633) @@ -37,6 +37,7 @@
>   */
>  #include "opt_inet.h"
>  #include "opt_inet6.h"
> +#include "opt_ipsec.h"
> =20
>  #include <sys/param.h>
>  #include <sys/systm.h>
>=20
> Modified: head/sys/netipsec/xform_ipcomp.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/sys/netipsec/xform_ipcomp.c	Fri May 29 19:21:35
> 2020	(r361632) +++ head/sys/netipsec/xform_ipcomp.c	Fri
> May 29 19:22:40 2020	(r361633) @@ -33,6 +33,7 @@
>  /* IP payload compression protocol (IPComp), see RFC 2393 */
>  #include "opt_inet.h"
>  #include "opt_inet6.h"
> +#include "opt_ipsec.h"
> =20
>  #include <sys/param.h>
>  #include <sys/systm.h>
> _______________________________________________
> svn-src-head@freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to
> "svn-src-head-unsubscribe@freebsd.org"


In my case, kernel build (make buildkernel) fails with the comnpiler
error shown below while compiling ipsec kernel module. Kernel has IPSEC
support enabled.

Kind regards,
oh

[...]
--- all_subdir_ipsec ---
--- ipsec_mod.o ---
/usr/src/sys/netipsec/ipsec_mod.c:114:3: error: implicit declaration of
function 'ipsec_support_enable' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods); ^
/usr/src/sys/netipsec/ipsec_mod.c:125:3: error: implicit declaration of
function 'ipsec_support_disable' is invalid in C99
[-Werror,-Wimplicit-function-declaration]
ipsec_support_disable(ipv4_ipsec_support); ^ --- all_subdir_ipwfw ---
Building
/usr/obj/usr/src/amd64.amd64/sys/WALHALL/modules/usr/src/sys/modules/ipwfw/=
ipw_bss/ipw_bss.ko
--- all_subdir_ipsec --- /usr/src/sys/netipsec/ipsec_mod.c:125:3: note:
did you mean 'ipsec_support_enable'?
/usr/src/sys/netipsec/ipsec_mod.c:114:3: note: 'ipsec_support_enable'
declared here ipsec_support_enable(ipv4_ipsec_support, &ipv4_methods);
^ 2 errors generated. *** [ipsec_mod.o] Error code 1

make[4]: stopped in /usr/src/sys/modules/ipsec

--Sig_/K9D9Cgo_rXCeD=+Maiy_5WL
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iHUEARYIAB0WIQSy8IBxAPDkqVBaTJ44N1ZZPba5RwUCXtN8NgAKCRA4N1ZZPba5
R+slAP9mYisSDV9d4PSHyPpmlYx/nhzyAcRXcFYhHsYkF1Iq4AEAjCGyYeezL8Wy
gIA6nPAr2lcW2uhz2YaHQyufT+CnfQc=
=NBKq
-----END PGP SIGNATURE-----

--Sig_/K9D9Cgo_rXCeD=+Maiy_5WL--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20200531114318.2b415934>