From b8a0a100a68098c0329735b5724d9c0b425e72eb Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 5 Sep 2007 13:47:58 +0000 Subject: Build string match unconditionally --- extensions/.string-testx | 3 --- extensions/Makefile | 2 +- include/linux/netfilter/xt_string.h | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 4 deletions(-) delete mode 100755 extensions/.string-testx create mode 100644 include/linux/netfilter/xt_string.h diff --git a/extensions/.string-testx b/extensions/.string-testx deleted file mode 100755 index b8de540f..00000000 --- a/extensions/.string-testx +++ /dev/null @@ -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 diff --git a/extensions/Makefile b/extensions/Makefile index 48e36bdf..63f8accd 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -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:= diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h new file mode 100644 index 00000000..3b3419f2 --- /dev/null +++ b/include/linux/netfilter/xt_string.h @@ -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*/ -- cgit v1.2.3