[netfilter-cvslog] r7022 - in trunk/iptables: extensions include/linux/netfilter

kaber at trash.net kaber at trash.net
Wed Sep 5 15:47:59 CEST 2007


Author: kaber at trash.net
Date: 2007-09-05 15:47:58 +0200 (Wed, 05 Sep 2007)
New Revision: 7022

Added:
   trunk/iptables/include/linux/netfilter/xt_string.h
Removed:
   trunk/iptables/extensions/.string-testx
Modified:
   trunk/iptables/extensions/Makefile
Log:
Build string match unconditionally


Deleted: trunk/iptables/extensions/.string-testx
===================================================================
--- trunk/iptables/extensions/.string-testx	2007-09-05 13:47:05 UTC (rev 7021)
+++ trunk/iptables/extensions/.string-testx	2007-09-05 13:47:58 UTC (rev 7022)
@@ -1,3 +0,0 @@
-#! /bin/sh
-[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_string.h ] ||		\
-[ -f $KERNEL_DIR/include/linux/netfilter/xt_string.h ] && echo string

Modified: trunk/iptables/extensions/Makefile
===================================================================
--- trunk/iptables/extensions/Makefile	2007-09-05 13:47:05 UTC (rev 7021)
+++ trunk/iptables/extensions/Makefile	2007-09-05 13:47:58 UTC (rev 7022)
@@ -7,7 +7,7 @@
 #
 PF_EXT_SLIB:=ah addrtype conntrack ecn icmp iprange owner policy realm tos ttl unclean DNAT ECN LOG MASQUERADE MIRROR NETMAP REDIRECT REJECT SAME SNAT TOS TTL ULOG
 PF6_EXT_SLIB:=eui64 hl icmp6 owner policy HL LOG
-PFX_EXT_SLIB:=connbytes connmark connlimit comment dscp esp hashlimit helper length limit mac mark multiport physdev pkttype quota sctp state statistic standard tcp tcpmss udp CLASSIFY CONNMARK DSCP MARK NFLOG NFQUEUE NOTRACK TCPMSS TRACE
+PFX_EXT_SLIB:=connbytes connmark connlimit comment dscp esp hashlimit helper length limit mac mark multiport physdev pkttype quota sctp state statistic standard string tcp tcpmss udp CLASSIFY CONNMARK DSCP MARK NFLOG NFQUEUE NOTRACK TCPMSS TRACE
 
 ifeq ($(DO_SELINUX), 1)
 PF_EXT_SE_SLIB:=

Added: trunk/iptables/include/linux/netfilter/xt_string.h
===================================================================
--- trunk/iptables/include/linux/netfilter/xt_string.h	                        (rev 0)
+++ trunk/iptables/include/linux/netfilter/xt_string.h	2007-09-05 13:47:58 UTC (rev 7022)
@@ -0,0 +1,18 @@
+#ifndef _XT_STRING_H
+#define _XT_STRING_H
+
+#define XT_STRING_MAX_PATTERN_SIZE 128
+#define XT_STRING_MAX_ALGO_NAME_SIZE 16
+
+struct xt_string_info
+{
+	u_int16_t from_offset;
+	u_int16_t to_offset;
+	char	  algo[XT_STRING_MAX_ALGO_NAME_SIZE];
+	char 	  pattern[XT_STRING_MAX_PATTERN_SIZE];
+	u_int8_t  patlen;
+	u_int8_t  invert;
+	struct ts_config __attribute__((aligned(8))) *config;
+};
+
+#endif /*_XT_STRING_H*/




More information about the netfilter-cvslog mailing list