libnfnetlink.h include generates problems...

libnfnetlink.h include generates problems...

[aton]

in one of my programs, i include the following two files:

#include <linux/netfilter.h>
#include <libnetfilter_queue/libnetfilter_queue.h>

while a few of my header files include each other i get errors from
these nfqueue header:

In file included from /usr/include/sys/uio.h:24,
                 from /usr/include/sys/socket.h:27,
                 from /usr/local/include/libnfnetlink/libnfnetlink.h:19,
                 from
/usr/local/include/libnetfilter_queue/libnetfilter_queue.h:16,
                 from misc.h:14,
                 from packeter.c:9:
/usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
/usr/include/linux/types.h:27: error: previous declaration of 'dev_t'
was here
/usr/include/sys/types.h:72: error: conflicting types for 'mode_t'
/usr/include/linux/types.h:33: error: previous declaration of 'mode_t'
was here
/usr/include/sys/types.h:77: error: conflicting types for 'nlink_t'
/usr/include/linux/types.h:36: error: previous declaration of 'nlink_t'
was here
etc. etc.

i talked to some guys from ##c on freenode, and they said, probably
libnfnetlink.h should not directly include linux/types.h

sorry if this is my mistake, i am not very good at this stuff

greetings, aton

[Patch 0/2] Re: libnfnetlink.h include generates problems...

[Eric Leblond]

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

Hi,

Le lundi 11 juin 2007 à 23:39 +0200, aton a écrit :
> in one of my programs, i include the following two files:
> 
> #include <linux/netfilter.h>
> #include <libnetfilter_queue/libnetfilter_queue.h>
> 
> while a few of my header files include each other i get errors from
> these nfqueue header:
> 
> In file included from /usr/include/sys/uio.h:24,
> /usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
> /usr/include/linux/types.h:27: error: previous declaration of 'dev_t'
> was here
> 
> i talked to some guys from ##c on freenode, and they said, probably
> libnfnetlink.h should not directly include linux/types.h

This seems to be the case as we discus on #netfilter. I'm sending two
patches which fix this issue.

BR,
-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

[Patch 1/2] Re: libnfnetlink.h include generates problems...

[Eric Leblond]

[-- Attachment #1.1: Type: text/plain, Size: 88 bytes --]

Hi,

Here's the patch for libnfnetlink.

BR,
-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #1.2: libnfnetlink.diff --]
[-- Type: text/x-patch, Size: 413 bytes --]

Index: include/libnfnetlink/libnfnetlink.h
===================================================================
--- include/libnfnetlink/libnfnetlink.h	(révision 6853)
+++ include/libnfnetlink/libnfnetlink.h	(copie de travail)
@@ -16,7 +16,6 @@
 #endif
 
 #include <sys/socket.h>	/* for sa_family_t */
-#include <linux/types.h>
 #include <linux/netlink.h>
 #include <libnfnetlink/linux_nfnetlink.h>
 

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [Patch 1/2] Re: libnfnetlink.h include generates problems...

[Pablo Neira Ayuso]

Eric Leblond wrote:
> Here's the patch for libnfnetlink.

Both applied. Thanks Eric.

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

Re: [Patch 0/2] Re: libnfnetlink.h include generates problems...

[Eric Leblond]

[-- Attachment #1.1: Type: text/plain, Size: 93 bytes --]

Hi,

Here's the patch for libnetilter_queue.

BR,
-- 
Eric Leblond <eric@inl.fr>
INL

[-- Attachment #1.2: libnetfilter_queue.diff --]
[-- Type: text/x-patch, Size: 473 bytes --]

Index: include/libnetfilter_queue/linux_nfnetlink_queue.h
===================================================================
--- include/libnetfilter_queue/linux_nfnetlink_queue.h	(révision 6872)
+++ include/libnetfilter_queue/linux_nfnetlink_queue.h	(copie de travail)
@@ -5,7 +5,6 @@
 #define aligned_u64 unsigned long long __attribute__((aligned(8)))
 #endif
 
-#include <linux/types.h>
 #include <libnfnetlink/linux_nfnetlink.h>
 
 enum nfqnl_msg_types {

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: libnfnetlink.h include generates problems...

[Pablo Neira Ayuso]

aton wrote:
> in one of my programs, i include the following two files:
> 
> #include <linux/netfilter.h>
> #include <libnetfilter_queue/libnetfilter_queue.h>
> 
> while a few of my header files include each other i get errors from
> these nfqueue header:
> 
> In file included from /usr/include/sys/uio.h:24,
>                  from /usr/include/sys/socket.h:27,
>                  from /usr/local/include/libnfnetlink/libnfnetlink.h:19,
>                  from
> /usr/local/include/libnetfilter_queue/libnetfilter_queue.h:16,
>                  from misc.h:14,
>                  from packeter.c:9:
> /usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
> /usr/include/linux/types.h:27: error: previous declaration of 'dev_t'
> was here
> /usr/include/sys/types.h:72: error: conflicting types for 'mode_t'
> /usr/include/linux/types.h:33: error: previous declaration of 'mode_t'
> was here
> /usr/include/sys/types.h:77: error: conflicting types for 'nlink_t'
> /usr/include/linux/types.h:36: error: previous declaration of 'nlink_t'
> was here
> etc. etc.
> 
> i talked to some guys from ##c on freenode, and they said, probably
> libnfnetlink.h should not directly include linux/types.h

What version of libnfnetlink are you using? This problem is supposed to
be fixed already in 0.0.25.

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris

Re: libnfnetlink.h include generates problems...

[aton]

Pablo Neira Ayuso schrieb:
> aton wrote:
>> in one of my programs, i include the following two files:
>>
>> #include <linux/netfilter.h>
>> #include <libnetfilter_queue/libnetfilter_queue.h>
>>
>> while a few of my header files include each other i get errors from
>> these nfqueue header:
>>
>> In file included from /usr/include/sys/uio.h:24,
>>                  from /usr/include/sys/socket.h:27,
>>                  from /usr/local/include/libnfnetlink/libnfnetlink.h:19,
>>                  from
>> /usr/local/include/libnetfilter_queue/libnetfilter_queue.h:16,
>>                  from misc.h:14,
>>                  from packeter.c:9:
>> /usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
>> /usr/include/linux/types.h:27: error: previous declaration of 'dev_t'
>> was here
>> /usr/include/sys/types.h:72: error: conflicting types for 'mode_t'
>> /usr/include/linux/types.h:33: error: previous declaration of 'mode_t'
>> was here
>> /usr/include/sys/types.h:77: error: conflicting types for 'nlink_t'
>> /usr/include/linux/types.h:36: error: previous declaration of 'nlink_t'
>> was here
>> etc. etc.
>>
>> i talked to some guys from ##c on freenode, and they said, probably
>> libnfnetlink.h should not directly include linux/types.h
> 
> What version of libnfnetlink are you using? This problem is supposed to
> be fixed already in 0.0.25.
> 

i am using libnfnetlink-0.0.25 and libnetfilter_queue-0.0.13.
i compiled it myself and did not use the packaged version of the gentoo
portage system

Re: libnfnetlink.h include generates problems...

[Pablo Neira Ayuso]

aton wrote:
> Pablo Neira Ayuso schrieb:
>> aton wrote:
>>> in one of my programs, i include the following two files:
>>>
>>> #include <linux/netfilter.h>
>>> #include <libnetfilter_queue/libnetfilter_queue.h>
>>>
>>> while a few of my header files include each other i get errors from
>>> these nfqueue header:
>>>
>>> In file included from /usr/include/sys/uio.h:24,
>>>                  from /usr/include/sys/socket.h:27,
>>>                  from /usr/local/include/libnfnetlink/libnfnetlink.h:19,
>>>                  from
>>> /usr/local/include/libnetfilter_queue/libnetfilter_queue.h:16,
>>>                  from misc.h:14,
>>>                  from packeter.c:9:
>>> /usr/include/sys/types.h:62: error: conflicting types for 'dev_t'
>>> /usr/include/linux/types.h:27: error: previous declaration of 'dev_t'
>>> was here
>>> /usr/include/sys/types.h:72: error: conflicting types for 'mode_t'
>>> /usr/include/linux/types.h:33: error: previous declaration of 'mode_t'
>>> was here
>>> /usr/include/sys/types.h:77: error: conflicting types for 'nlink_t'
>>> /usr/include/linux/types.h:36: error: previous declaration of 'nlink_t'
>>> was here
>>> etc. etc.
>>>
>>> i talked to some guys from ##c on freenode, and they said, probably
>>> libnfnetlink.h should not directly include linux/types.h
>> What version of libnfnetlink are you using? This problem is supposed to
>> be fixed already in 0.0.25.
> 
> i am using libnfnetlink-0.0.25 and libnetfilter_queue-0.0.13.
> i compiled it myself and did not use the packaged version of the gentoo
> portage system

ACK. I'll apply Eric's patches asap.

-- 
The dawn of the fourth age of Linux firewalling is coming; a time of 
great struggle and heroic deeds -- J.Kadlecsik got inspired by J.Morris