Re: [PATCH 2/7] Introduce nf_inet_address

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Dec 17 2007 13:28, Patrick McHardy wrote:
>
> Userspace has to deal with these types, they're already used
> in many other structures. I've already added the necessary
> defines or typedefs to the iptables headers some time ago.

Yeah, but these defines were missing from libiptc, so I copied
them there (see patch).

> We should probably just include <linux/types.h> to fix it
> though. Could you give that a try?

It works, so please use this one:
===

Remove our own definitions of the Linux types and use <linux/types.h>
instead. libiptc needs it too, or otherwise will choke on union
nf_inet_addr.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx>

---
 include/libiptc/libip6tc.h |    1 +
 include/libiptc/libiptc.h  |    1 +
 include/xtables.h          |    6 +-----
 3 files changed, 3 insertions(+), 5 deletions(-)

Index: iptables-modules/include/libiptc/libip6tc.h
===================================================================
--- iptables-modules.orig/include/libiptc/libip6tc.h
+++ iptables-modules/include/libiptc/libip6tc.h
@@ -2,6 +2,7 @@
 #define _LIBIP6TC_H
 /* Library which manipulates firewall rules. Version 0.2. */
 
+#include <linux/types.h>
 #include <libiptc/ipt_kernel_headers.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
Index: iptables-modules/include/libiptc/libiptc.h
===================================================================
--- iptables-modules.orig/include/libiptc/libiptc.h
+++ iptables-modules/include/libiptc/libiptc.h
@@ -2,6 +2,7 @@
 #define _LIBIPTC_H
 /* Library which manipulates filtering rules. */
 
+#include <linux/types.h>
 #include <libiptc/ipt_kernel_headers.h>
 #include <linux/netfilter_ipv4/ip_tables.h>
 
Index: iptables-modules/include/xtables.h
===================================================================
--- iptables-modules.orig/include/xtables.h
+++ iptables-modules/include/xtables.h
@@ -2,6 +2,7 @@
 #define _XTABLES_H
 
 #include <sys/types.h>
+#include <linux/types.h>
 #include <linux/netfilter/x_tables.h>
 #include <libiptc/libxtc.h>
 
@@ -234,9 +235,4 @@ extern const char *program_name, *progra
   extern void init_extensions(void);
 #endif
 
-#define __be32	u_int32_t
-#define __le32	u_int32_t
-#define __be16	u_int16_t
-#define __le16	u_int16_t
-
 #endif /* _XTABLES_H */
-
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Netfitler Users]     [LARTC]     [Bugtraq]     [Yosemite Forum]

  Powered by Linux