Re: [NETFILTER]: Introduce nf_inet_address

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 947 bytes --]

David Woodhouse wrote:
> On Tue, 2008-02-19 at 15:45 +0100, Patrick McHardy wrote:
>> That would break iptables compilation, which already includes
>> linux/in.h in some files. I guess the best fix for now is to
>> include netinet/in.h in busybox and long-term clean this up
>> properly.
> 
> It looks like iptables is fairly broken anyway:
> 
> make[1]: Entering directory `/home/dwmw2/working/extras/iptables/devel/iptables-1.4.0'
> Unable to resolve dependency on linux/compiler.h. Try 'make clean'.
> Extensions found:
> make[1]: Leaving directory `/home/dwmw2/working/extras/iptables/devel/iptables-1.4.0'
> error: Bad exit status from /var/tmp/rpm-tmp.32057 (%build)


Yes, that was a bug in the lastest release. We need to
release a 1.4.1 version or something like that, but I'm
not too familiar with the release process, so I haven't
done this so far.

Anyway, I just committed this patch to iptables to remove
the compiler.h inclusions.


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 1192 bytes --]

Index: include/linux/netfilter_ipv6/ip6_tables.h
===================================================================
--- include/linux/netfilter_ipv6/ip6_tables.h	(Revision 7376)
+++ include/linux/netfilter_ipv6/ip6_tables.h	(Arbeitskopie)
@@ -15,7 +15,6 @@
 #ifndef _IP6_TABLES_H
 #define _IP6_TABLES_H
 
-#include <linux/compiler.h>
 #include <linux/netfilter_ipv6.h>
 
 #include <linux/netfilter/x_tables.h>
Index: include/linux/netfilter.h
===================================================================
--- include/linux/netfilter.h	(Revision 7376)
+++ include/linux/netfilter.h	(Arbeitskopie)
@@ -1,8 +1,6 @@
 #ifndef __LINUX_NETFILTER_H
 #define __LINUX_NETFILTER_H
 
-#include <linux/compiler.h>
-
 /* Responses from hook functions. */
 #define NF_DROP 0
 #define NF_ACCEPT 1
Index: include/linux/netfilter_ipv4/ip_tables.h
===================================================================
--- include/linux/netfilter_ipv4/ip_tables.h	(Revision 7376)
+++ include/linux/netfilter_ipv4/ip_tables.h	(Arbeitskopie)
@@ -15,7 +15,6 @@
 #ifndef _IPTABLES_H
 #define _IPTABLES_H
 
-#include <linux/compiler.h>
 #include <linux/netfilter_ipv4.h>
 
 #include <linux/netfilter/x_tables.h>

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

David Woodhouse wrote:
> On Fri, 2008-02-22 at 16:52 +0900, David Woodhouse wrote:
>> It looks like iptables is fairly broken anyway:
>>
>> make[1]: Entering directory
>> `/home/dwmw2/working/extras/iptables/devel/iptables-1.4.0'
>> Unable to resolve dependency on linux/compiler.h. Try 'make clean'.
> 
> And if I move away the contents of the local include/linux/ directory
> and replace it with proper headers generated by 'make
> headers_install' (which won't be trying to include compiler.h), then I
> get more failures:
> 
> Unable to resolve dependency on ../include/linux/netfilter/xt_u32.h. Try 'make clean'.
> Unable to resolve dependency on linux/netfilter/xt_time.h. Try 'make clean'.
> Unable to resolve dependency on linux/netfilter/xt_quota.h. Try 'make clean'.
> Unable to resolve dependency on ../include/linux/netfilter/xt_connlimit.h. Try 'make clean'.
> Unable to resolve dependency on linux/netfilter_ipv6/ip6t_mh.h. Try 'make clean'.
> Unable to resolve dependency on linux/netfilter/nf_nat.h. Try 'make clean'.


Yes, the dependency tracking has always been a bit strange/broken.
The next release will use autoconf, which will hopefully behave
better.

Re: [NETFILTER]: Introduce nf_inet_address

[Pablo Neira Ayuso]

Patrick McHardy wrote:
> Yes, that was a bug in the lastest release. We need to
> release a 1.4.1 version or something like that, but I'm
> not too familiar with the release process, so I haven't
> done this so far.

I can schedule one for this weekend, just send me an ACK.

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

Pablo Neira Ayuso wrote:
> Patrick McHardy wrote:
>> Yes, that was a bug in the lastest release. We need to
>> release a 1.4.1 version or something like that, but I'm
>> not too familiar with the release process, so I haven't
>> done this so far.
> 
> I can schedule one for this weekend, just send me an ACK.


That would be great. I think we had another issue in 1.4.0 with
some header files, but I can't remeber the details.

Jan, I recall we talked about this some time ago, do you remember?

Re: [NETFILTER]: Introduce nf_inet_address

[Jan Engelhardt]

On Feb 22 2008 16:44, Patrick McHardy wrote:
> Pablo Neira Ayuso wrote:
>> Patrick McHardy wrote:
>> > Yes, that was a bug in the lastest release. We need to
>> > release a 1.4.1 version or something like that, but I'm
>> > not too familiar with the release process, so I haven't
>> > done this so far.
>> 
>> I can schedule one for this weekend, just send me an ACK.
>
>
> That would be great. I think we had another issue in 1.4.0 with
> some header files, but I can't remeber the details.
>
> Jan, I recall we talked about this some time ago, do you remember?

I dunno, in Xtables 1.5.1 all header problems (minus
the "uint32_t all" in nf_inet_addr) are resolved I believe.
The thing even compiles without a kernel source now.

Re: [NETFILTER]: Introduce nf_inet_address

[Pablo Neira Ayuso]

Patrick McHardy wrote:
> Pablo Neira Ayuso wrote:
>> Patrick McHardy wrote:
>>> Yes, that was a bug in the lastest release. We need to
>>> release a 1.4.1 version or something like that, but I'm
>>> not too familiar with the release process, so I haven't
>>> done this so far.
>>
>> I can schedule one for this weekend, just send me an ACK.
> 
> 
> That would be great. I think we had another issue in 1.4.0 with
> some header files, but I can't remeber the details.
> 
> Jan, I recall we talked about this some time ago, do you remember?

Was it related with kernel 2.4.x compilation?

-- 
"Los honestos son inadaptados sociales" -- Les Luthiers

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

Pablo Neira Ayuso wrote:
> Patrick McHardy wrote:
>> Pablo Neira Ayuso wrote:
>>> Patrick McHardy wrote:
>>>> Yes, that was a bug in the lastest release. We need to
>>>> release a 1.4.1 version or something like that, but I'm
>>>> not too familiar with the release process, so I haven't
>>>> done this so far.
>>> I can schedule one for this weekend, just send me an ACK.
>>
>> That would be great. I think we had another issue in 1.4.0 with
>> some header files, but I can't remeber the details.
>>
>> Jan, I recall we talked about this some time ago, do you remember?
> 
> Was it related with kernel 2.4.x compilation?


Yes, I just found the old mail, the error was:

In file included from include/linux/netfilter/nf_nat.h:4,
                  from extensions/libipt_DNAT.c:9:
include/linux/netfilter/nf_conntrack_tuple.h:29: error: syntax error 
before "__be32"

Re: [NETFILTER]: Introduce nf_inet_address

[David Woodhouse]

On Fri, 2008-02-22 at 16:44 +0100, Patrick McHardy wrote:
> Pablo Neira Ayuso wrote:
> > Patrick McHardy wrote:
> >> Yes, that was a bug in the lastest release. We need to
> >> release a 1.4.1 version or something like that, but I'm
> >> not too familiar with the release process, so I haven't
> >> done this so far.
> > 
> > I can schedule one for this weekend, just send me an ACK.
> 
> 
> That would be great. I think we had another issue in 1.4.0 with
> some header files, but I can't remeber the details.

If you are going to include header files in the release (which makes a
certain amount of sense), it would be best if those are simply the
result of the kernel's 'make headers_install', without any manual
changes.

-- 
dwmw2

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

David Woodhouse wrote:
> On Fri, 2008-02-22 at 16:44 +0100, Patrick McHardy wrote:
>> Pablo Neira Ayuso wrote:
>>> Patrick McHardy wrote:
>>>> Yes, that was a bug in the lastest release. We need to
>>>> release a 1.4.1 version or something like that, but I'm
>>>> not too familiar with the release process, so I haven't
>>>> done this so far.
>>> I can schedule one for this weekend, just send me an ACK.
>>
>> That would be great. I think we had another issue in 1.4.0 with
>> some header files, but I can't remeber the details.
> 
> If you are going to include header files in the release (which makes a
> certain amount of sense), it would be best if those are simply the
> result of the kernel's 'make headers_install', without any manual
> changes.


Yes, the kernel headers need to be fixed as well to not include
linux/compiler.h outside of #ifdef __KERNEL__. I'll take care
of that.

Re: [NETFILTER]: Introduce nf_inet_address

[David Woodhouse]

On Mon, 2008-02-25 at 13:12 +0100, Patrick McHardy wrote:
> 
> Yes, the kernel headers need to be fixed as well to not include
> linux/compiler.h outside of #ifdef __KERNEL__. I'll take care
> of that.

No. When you run 'make headers_install' that's already taken care of.

-- 
dwmw2

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

David Woodhouse wrote:
> On Mon, 2008-02-25 at 13:12 +0100, Patrick McHardy wrote:
>> Yes, the kernel headers need to be fixed as well to not include
>> linux/compiler.h outside of #ifdef __KERNEL__. I'll take care
>> of that.
> 
> No. When you run 'make headers_install' that's already taken care of.


Right, I missed that. In that case the current headers should match
the kernel headers (with the compiler.h part removed).

Re: [NETFILTER]: Introduce nf_inet_address

[David Woodhouse]

On Mon, 2008-02-25 at 13:20 +0100, Patrick McHardy wrote:
> 
> Right, I missed that. In that case the current headers should match
> the kernel headers (with the compiler.h part removed).

They don't. When you run 'make headers_install' there are some missing.

-- 
dwmw2

Re: [NETFILTER]: Introduce nf_inet_address

[Patrick McHardy]

David Woodhouse wrote:
> On Mon, 2008-02-25 at 13:20 +0100, Patrick McHardy wrote:
>> Right, I missed that. In that case the current headers should match
>> the kernel headers (with the compiler.h part removed).
> 
> They don't. When you run 'make headers_install' there are some missing.


We don't need all of them, but I'll do a proper resync. Thanks.

Re: [NETFILTER]: Introduce nf_inet_address

[David Woodhouse]

On Mon, 2008-02-25 at 13:23 +0100, Patrick McHardy wrote:
> David Woodhouse wrote:
> > On Mon, 2008-02-25 at 13:20 +0100, Patrick McHardy wrote:
> >> Right, I missed that. In that case the current headers should match
> >> the kernel headers (with the compiler.h part removed).
> > 
> > They don't. When you run 'make headers_install' there are some missing.
> 
> 
> We don't need all of them, but I'll do a proper resync. Thanks.

I think we need some of them -- when I just dropped the results of 'make
headers_install' into the iptables build directory, it complained of a
number of them being missing (which I showed a few days ago).

Ideally, the contents of the include/linux/ directory in the iptables
tree would be identical to what you get in usr/include/linux/netfilter*
after running 'make headers_install'.

-- 
dwmw2