From 1eb0081027ee567e822b24377ea614e66c408ff2 Mon Sep 17 00:00:00 2001 From: Martin Josefsson Date: Wed, 26 May 2004 15:58:07 +0000 Subject: Fix 64bit kernel / 32bit userspace issue. Sync header with kernel. --- include/linux/netfilter_ipv4/ipt_SAME.h | 11 ++++++----- include/linux/netfilter_ipv4/ipt_ULOG.h | 10 +++++++++- 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'include/linux/netfilter_ipv4') diff --git a/include/linux/netfilter_ipv4/ipt_SAME.h b/include/linux/netfilter_ipv4/ipt_SAME.h index 428b2137..89ba22fa 100644 --- a/include/linux/netfilter_ipv4/ipt_SAME.h +++ b/include/linux/netfilter_ipv4/ipt_SAME.h @@ -8,12 +8,13 @@ struct ipt_same_info { unsigned char info; - - unsigned int rangesize; - - unsigned int ipnum; - + u_int32_t rangesize; + u_int32_t ipnum; +#ifdef KERNEL_64_USERSPACE_32 + u_int64_t placeholder; +#else u_int32_t *iparray; +#endif /* hangs off end. */ struct ip_nat_range range[IPT_SAME_MAX_RANGE]; diff --git a/include/linux/netfilter_ipv4/ipt_ULOG.h b/include/linux/netfilter_ipv4/ipt_ULOG.h index 86a99ee7..f267ab8e 100644 --- a/include/linux/netfilter_ipv4/ipt_ULOG.h +++ b/include/linux/netfilter_ipv4/ipt_ULOG.h @@ -1,4 +1,4 @@ -/* Header file for IP tables userspace logging, Version 1.8 +/* Header file for IP tables userspace logging, Version 1.8 * * (C) 2000-2002 by Harald Welte * @@ -11,6 +11,9 @@ #define NETLINK_NFLOG 5 #endif +#define ULOG_DEFAULT_NLGROUP 1 +#define ULOG_DEFAULT_QTHRESHOLD 1 + #define ULOG_MAC_LEN 80 #define ULOG_PREFIX_LEN 32 @@ -23,8 +26,13 @@ /* private data structure for each rule with a ULOG target */ struct ipt_ulog_info { unsigned int nl_group; +#ifdef KERNEL_64_USERSPACE_32 + unsigned long long copy_range; + unsigned long long qthreshold; +#else size_t copy_range; size_t qthreshold; +#endif char prefix[ULOG_PREFIX_LEN]; }; -- cgit v1.2.3