From 893b688a2a73363c8cebe4bac0c1368178fce2fd Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 10 Jul 2005 15:06:21 +0000 Subject: fix various missing header file / #define issues on old kernels. I've now tested compilation with kernels starting 2.4.17 --- include/linux/netfilter_ipv4/ipt_conntrack.h | 17 +++++++++++++++++ include/linux/netfilter_ipv6/ip6t_LOG.h | 16 ---------------- 2 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 include/linux/netfilter_ipv6/ip6t_LOG.h (limited to 'include/linux') 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 + +/* backwards compatibility crap. only exists in userspace - HW */ +#include +#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*/ -- cgit v1.2.3