problem in building modules-with-world re: cvs commit:src/sys/netinet ip_fw_pfil.c

[Andre Oppermann]

Ruslan Ermilov wrote:
> > > > I have just cvsupped -current and the GENERIC kernel compiles just fine.
> > > >
> > > > Looking at the error message in your log output one might conclude that you
> > > > are missing "option INET" in your kernel config?
> > >
> > > MODULES_WITH_WORLD
> > >
> > > Please read the subject line.  ;)
> >
> > Ok, there seems to be a problem with setting up the environment when doing
> > this.  Why do you build modules with WORLD instead of doing it with the
> > kernel?  This sounds quite dangerous to me when kernel/modules go out of
> > sync.
> >
> > Ruslan, do you have any idea what is going wrong?
> >
> Yes.  You removed far too much in your conversion.  ;)

Yes and no.  The goal was to get a ipfw module that can have IPDIVERT
(requires kernel to have it too) and IPFIREWALL_FORWARD (kernel doesn't
matter, just won't work if kernel doesn't have it) in it.  When building
the modules together with the kernel it works because the opt_* files
are around.  This doesn't seem to be the case when building it with
world.  Isn't there some #define when it is compiled with world?

-- 
Andre


> %%%
> Index: ip_fw2.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/netinet/ip_fw2.c,v
> retrieving revision 1.73
> diff -u -p -r1.73 ip_fw2.c
> --- ip_fw2.c    19 Aug 2004 23:31:40 -0000      1.73
> +++ ip_fw2.c    20 Aug 2004 20:37:14 -0000
> @@ -32,6 +32,7 @@
>   * Implement IP packet firewall (new version)
>   */
> 
> +#if !defined(KLD_MODULE)
>  #include "opt_ipfw.h"
>  #include "opt_ipdn.h"
>  #include "opt_ipdivert.h"
> @@ -40,6 +41,7 @@
>  #ifndef INET
>  #error IPFIREWALL requires INET.
>  #endif /* INET */
> +#endif
> 
>  #define IPFW2  1
>  #if IPFW2
> Index: ip_fw_pfil.c
> ===================================================================
> RCS file: /home/ncvs/src/sys/netinet/ip_fw_pfil.c,v
> retrieving revision 1.5
> diff -u -p -r1.5 ip_fw_pfil.c
> --- ip_fw_pfil.c        20 Aug 2004 00:36:55 -0000      1.5
> +++ ip_fw_pfil.c        20 Aug 2004 20:39:50 -0000
> @@ -26,6 +26,7 @@
>   * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.5 2004/08/20 00:36:55 andre Exp $
>   */
> 
> +#if !defined(KLD_MODULE)
>  #include "opt_ipfw.h"
>  #include "opt_ipdn.h"
>  #include "opt_ipdivert.h"
> @@ -34,9 +35,10 @@
>  #ifndef INET
>  #error IPFIREWALL requires INET.
>  #endif /* INET */
> -#if !defined(KLD_MODULE) && !defined(PFIL_HOOKS)
> +#if !defined(PFIL_HOOKS)
>  #error IPFIREWALL requires PFIL_HOOKS.
>  #endif
> +#endif
> 
>  #include <sys/param.h>
>  #include <sys/systm.h>
> %%%
> 
> Cheers,
> --
> Ruslan Ermilov
> ru at FreeBSD.org
> FreeBSD committer
> 
>   --------------------------------------------------------------------------------
>    Part 1.2Type: application/pgp-signature