diff options
| author | Harald Welte <laforge@gnumonks.org> | 2005-07-10 15:06:21 +0000 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2005-07-10 15:06:21 +0000 |
| commit | 893b688a2a73363c8cebe4bac0c1368178fce2fd (patch) | |
| tree | ee8d2f4f6d075be4957b2869868af7332d10bd2f | |
| parent | 63d68bf3a1e86e2c96e520f71c34519112c66453 (diff) | |
fix various missing header file / #define issues on old kernels. I've now tested compilation with kernels starting 2.4.17v1.3.2
| -rw-r--r-- | extensions/libip6t_LOG.c | 6 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ipt_conntrack.h | 17 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6t_LOG.h | 16 |
3 files changed, 23 insertions, 16 deletions
diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c index 53860573..a9c8965d 100644 --- a/extensions/libip6t_LOG.c +++ b/extensions/libip6t_LOG.c @@ -9,6 +9,12 @@ #include <linux/netfilter_ipv6/ip6_tables.h> #include <linux/netfilter_ipv6/ip6t_LOG.h> +#ifndef IP6T_LOG_UID /* Old kernel */ +#define IP6T_LOG_UID 0x08 +#undef IP6T_LOG_MASK +#define IP6T_LOG_MASK 0x0f +#endif + #define LOG_DEFAULT_LEVEL LOG_WARNING /* Function which prints out usage message. */ diff --git a/include/linux/netfilter_ipv4/ipt_conntrack.h b/include/linux/netfilter_ipv4/ipt_conntrack.h index de1c81ff..eba410d7 100644 --- a/include/linux/netfilter_ipv4/ipt_conntrack.h +++ b/include/linux/netfilter_ipv4/ipt_conntrack.h @@ -5,6 +5,23 @@ #ifndef _IPT_CONNTRACK_H #define _IPT_CONNTRACK_H +#include <linux/netfilter_ipv4/ip_conntrack.h> + +/* backwards compatibility crap. only exists in userspace - HW */ +#include <linux/version.h> +#ifndef KERNEL_VERSION +#define KERNEL_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c)) +#endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,18) +#define IPS_EXPECTED (1 << 0) +#define IPS_SEEN_REPLY (1 << 1) +#define IPS_ASSURED (1 << 2) +#define IP_CT_DIR_ORIGINAL 0 +#define IP_CT_DIR_REPLY 1 +#define IP_CT_DIR_MAX 2 +#endif + #define IPT_CONNTRACK_STATE_BIT(ctinfo) (1 << ((ctinfo)%IP_CT_IS_REPLY+1)) #define IPT_CONNTRACK_STATE_INVALID (1 << 0) diff --git a/include/linux/netfilter_ipv6/ip6t_LOG.h b/include/linux/netfilter_ipv6/ip6t_LOG.h deleted file mode 100644 index 42996a43..00000000 --- a/include/linux/netfilter_ipv6/ip6t_LOG.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _IP6T_LOG_H -#define _IP6T_LOG_H - -#define IP6T_LOG_TCPSEQ 0x01 /* Log TCP sequence numbers */ -#define IP6T_LOG_TCPOPT 0x02 /* Log TCP options */ -#define IP6T_LOG_IPOPT 0x04 /* Log IP options */ -#define IP6T_LOG_UID 0x08 /* Log UID owning local socket */ -#define IP6T_LOG_MASK 0x0f - -struct ip6t_log_info { - unsigned char level; - unsigned char logflags; - char prefix[30]; -}; - -#endif /*_IPT_LOG_H*/ |