[netfilter-cvslog] r4104 - in trunk/iptables: extensions
include/linux/netfilter_ipv4 include/linux/netfilter_ipv6
laforge at netfilter.org
laforge at netfilter.org
Sun Jul 10 17:06:22 CEST 2005
Author: laforge at netfilter.org
Date: 2005-07-10 17:06:21 +0200 (Sun, 10 Jul 2005)
New Revision: 4104
Removed:
trunk/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h
Modified:
trunk/iptables/extensions/libip6t_LOG.c
trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h
Log:
fix various missing header file / #define issues on old kernels. I've now tested compilation with kernels starting 2.4.17
Modified: trunk/iptables/extensions/libip6t_LOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_LOG.c 2005-07-10 14:38:37 UTC (rev 4103)
+++ trunk/iptables/extensions/libip6t_LOG.c 2005-07-10 15:06:21 UTC (rev 4104)
@@ -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. */
Modified: trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h
===================================================================
--- trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h 2005-07-10 14:38:37 UTC (rev 4103)
+++ trunk/iptables/include/linux/netfilter_ipv4/ipt_conntrack.h 2005-07-10 15:06:21 UTC (rev 4104)
@@ -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)
Deleted: trunk/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h
===================================================================
--- trunk/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h 2005-07-10 14:38:37 UTC (rev 4103)
+++ trunk/iptables/include/linux/netfilter_ipv6/ip6t_LOG.h 2005-07-10 15:06:21 UTC (rev 4104)
@@ -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*/
More information about the netfilter-cvslog
mailing list