[brcm-2.4] drop iptables 1.3.8 and switch to to 1.4.3.2, refresh layer7 kernel patches and add packages for libiptc + libxtables

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15501 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/iptables/Makefile

@@ -10,18 +10,9 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
 
-ifeq ($(CONFIG_LINUX_2_4),y)
+PKG_VERSION:=1.4.3.2
-  PKG_VERSION:=1.3.8
+PKG_RELEASE:=1
-  PKG_RELEASE:=4
+PKG_MD5SUM:=545698693b636cfc844aafc6729fd48a
-  PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
-  MAKE_TARGETS:=experimental install-experimental install-devel
-endif
-
-ifeq ($(CONFIG_LINUX_2_6),y)
-  PKG_VERSION:=1.4.3.2
-  PKG_RELEASE:=1
-  PKG_MD5SUM:=545698693b636cfc844aafc6729fd48a
-endif
 
 PKG_VERSION?=<IPTABLES_VERSION>
 
@@ -40,10 +31,27 @@ ifeq ($(DUMP),)
   STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell grep 'NETFILTER' $(LINUX_DIR)/.config | md5s)
 endif
 
+
+define Package/libiptc
+  SECTION:=libs
+  CATEGORY:=Libraries
+  URL:=http://netfilter.org/
+  TITLE:=IPv4/IPv6 firewall - shared libiptc library
+endef
+
+define Package/libxtables
+  SECTION:=libs
+  CATEGORY:=Libraries
+  URL:=http://netfilter.org/
+  TITLE:=IPv4/IPv6 firewall - shared xtables library
+endef
+
+
 define Package/iptables/Default
   SECTION:=net
   CATEGORY:=Base system
   URL:=http://netfilter.org/
+  DEPENDS:=+libiptc +libxtables
 endef
 
 define Package/iptables/Module
@@ -106,7 +114,7 @@ define Package/iptables-mod-filter/description
 endef
 
 define Package/iptables-mod-imq
-$(call Package/iptables/Module, +kmod-ipt-imq @!LINUX_2_6_27)
+$(call Package/iptables/Module, +kmod-ipt-imq)
   TITLE:=IMQ support
 endef
 
@@ -241,15 +249,6 @@ define Build/Prepare
 	$(call Build/Prepare/Default)
 endef
 
-ifeq ($(KERNEL),2.4)
-  define Build/Configure
-	chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test*
-	rm -f $(PKG_BUILD_DIR)/.configured*
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		clean
-  endef
-endif
-
 TARGET_CPPFLAGS := -I$(PKG_BUILD_DIR)/include $(TARGET_CPPFLAGS)
 TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
@@ -287,6 +286,18 @@ define Package/iptables/install
 	)
 endef
 
+
+define Package/libiptc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libiptc.so.0 $(1)/usr/lib/
+endef
+
+define Package/libxtables/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libxtables.so.2 $(1)/usr/lib/
+endef
+
+
 define Package/iptables-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/iptables-{save,restore} $(1)/usr/sbin/
@@ -324,6 +335,10 @@ L7_INSTALL:=\
 	$(INSTALL_DIR) $$(1)/etc/l7-protocols; \
 	$(CP) files/l7/*.pat $$(1)/etc/l7-protocols/
 
+
+$(eval $(call BuildPackage,libiptc))
+$(eval $(call BuildPackage,libxtables))
+
 $(eval $(call BuildPackage,iptables))
 $(eval $(call BuildPackage,iptables-utils))
 $(eval $(call BuildPlugin,iptables-mod-conntrack,$(IPT_CONNTRACK-m)))

package/iptables/patches/1.3.8/002-layer7_2.17.patch

@@ -1,425 +0,0 @@
-Index: iptables-1.3.8/extensions/.layer7-test
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/.layer7-test
-@@ -0,0 +1,2 @@
-+#! /bin/sh
-+[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_layer7.h ] && echo layer7
-Index: iptables-1.3.8/extensions/libipt_layer7.c
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/libipt_layer7.c
-@@ -0,0 +1,394 @@
-+/* 
-+   Shared library add-on to iptables to add layer 7 matching support. 
-+  
-+   By Matthew Strait <quadong@users.sf.net>, Oct 2003.
-+
-+   http://l7-filter.sf.net 
-+
-+   This program is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU General Public License
-+   as published by the Free Software Foundation; either version
-+   2 of the License, or (at your option) any later version.
-+   http://www.gnu.org/licenses/gpl.txt
-+
-+   Based on libipt_string.c (C) 2000 Emmanuel Roger <winfield@freegates.be>
-+*/
-+
-+#define _GNU_SOURCE
-+#include <stdio.h>
-+#include <netdb.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <getopt.h>
-+#include <ctype.h>
-+#include <dirent.h>
-+
-+#include <iptables.h>
-+#include <linux/netfilter_ipv4/ipt_layer7.h>
-+
-+#define MAX_FN_LEN 256
-+
-+static char l7dir[MAX_FN_LEN] = "\0";
-+
-+/* Function which prints out usage message. */
-+static void help(void)
-+{
-+	printf(
-+	"LAYER7 match v%s options:\n"
-+	"--l7dir <directory>  : Look for patterns here instead of /etc/l7-protocols/\n"
-+	"                       (--l7dir must be specified before --l7proto if used!)\n"
-+	"--l7proto [!] <name> : Match the protocol defined in /etc/l7-protocols/name.pat\n",
-+	IPTABLES_VERSION);
-+	fputc('\n', stdout);
-+}
-+
-+static struct option opts[] = {
-+	{ .name = "l7proto", .has_arg = 1, .flag = 0, .val = '1' },
-+	{ .name = "l7dir",   .has_arg = 1, .flag = 0, .val = '2' },
-+	{ .name = 0 }
-+};
-+
-+/* reads filename, puts protocol info into layer7_protocol_info, number of protocols to numprotos */
-+int parse_protocol_file(char * filename, const unsigned char * protoname, struct ipt_layer7_info *info)
-+{
-+	FILE * f;
-+	char * line = NULL;
-+	size_t len = 0;
-+
-+	enum { protocol, pattern, done } datatype = protocol;
-+
-+	f = fopen(filename, "r");
-+
-+	if(!f)
-+		return 0;
-+
-+	while(getline(&line, &len, f) != -1)
-+	{
-+		if(strlen(line) < 2 || line[0] == '#')
-+			continue;
-+
-+		/* strip the pesky newline... */
-+		if(line[strlen(line) - 1] == '\n')
-+			line[strlen(line) - 1] = '\0';
-+
-+		if(datatype == protocol)
-+		{
-+			/* Ignore everything on the line beginning with the 
-+			first space or tab . For instance, this allows the 
-+			protocol line in http.pat to be "http " (or 
-+			"http I am so cool") instead of just "http". */
-+			if(strchr(line, ' ')){
-+				char * space = strchr(line, ' ');
-+				space[0] = '\0';
-+			}
-+			if(strchr(line, '\t')){
-+				char * space = strchr(line, '\t');
-+				space[0] = '\0';
-+			}
-+
-+			/* sanity check.  First non-comment non-blank 
-+			line must be the same as the file name. */
-+			if(strcmp(line, protoname))
-+				exit_error(OTHER_PROBLEM, 
-+					"Protocol name (%s) doesn't match file name (%s).  Bailing out\n",
-+					line, filename);
-+
-+			if(strlen(line) >= MAX_PROTOCOL_LEN)
-+				 exit_error(PARAMETER_PROBLEM, 
-+					"Protocol name in %s too long!", filename);
-+			strncpy(info->protocol, line, MAX_PROTOCOL_LEN);
-+
-+			datatype = pattern; 
-+		}
-+		else if(datatype == pattern)
-+		{
-+			if(strlen(line) >= MAX_PATTERN_LEN)
-+				 exit_error(PARAMETER_PROBLEM, "Pattern in %s too long!", filename);
-+			strncpy(info->pattern, line, MAX_PATTERN_LEN);
-+			
-+			datatype = done;			
-+			break;
-+		}
-+		else
-+			exit_error(OTHER_PROBLEM, "Internal error");
-+	}
-+
-+	if(datatype != done)
-+		exit_error(OTHER_PROBLEM, "Failed to get all needed data from %s", filename);
-+
-+	if(line) free(line);
-+	fclose(f);
-+
-+	return 1;
-+
-+/*
-+	fprintf(stderr, "protocol: %s\npattern: %s\n\n", 
-+			info->protocol,
-+			info->pattern);
-+*/
-+}
-+
-+static int hex2dec(char c)
-+{
-+        switch (c)
-+        {
-+                case '0' ... '9':
-+                        return c - '0';
-+                case 'a' ... 'f':
-+                        return c - 'a' + 10;
-+                case 'A' ... 'F':
-+                        return c - 'A' + 10;
-+                default:
-+                        exit_error(OTHER_PROBLEM, "hex2dec: bad value!\n");
-+                        return 0;
-+        }
-+}
-+
-+/* takes a string with \xHH escapes and returns one with the characters 
-+they stand for */
-+static char * pre_process(char * s)
-+{
-+	char * result = malloc(strlen(s) + 1);
-+	int sindex = 0, rindex = 0;
-+        while( sindex < strlen(s) )
-+        {
-+            if( sindex + 3 < strlen(s) &&
-+                s[sindex] == '\\' && s[sindex+1] == 'x' && 
-+                isxdigit(s[sindex + 2]) && isxdigit(s[sindex + 3]) ) 
-+                {
-+                        /* carefully remember to call tolower here... */
-+                        result[rindex] = tolower( hex2dec(s[sindex + 2])*16 +
-+                                                  hex2dec(s[sindex + 3] ) );
-+
-+			switch ( result[rindex] )
-+			{
-+			case 0x24:
-+			case 0x28:
-+			case 0x29:
-+			case 0x2a:
-+			case 0x2b:
-+			case 0x2e:
-+			case 0x3f:
-+			case 0x5b:
-+			case 0x5c:
-+			case 0x5d:
-+			case 0x5e:
-+			case 0x7c:
-+				fprintf(stderr, 
-+					"Warning: layer7 regexp contains a control character, %c, in hex (\\x%c%c).\n"
-+					"I recommend that you write this as %c or \\%c, depending on what you meant.\n",
-+					result[rindex], s[sindex + 2], s[sindex + 3], result[rindex], result[rindex]);
-+				break;
-+			case 0x00:
-+				fprintf(stderr, 
-+					"Warning: null (\\x00) in layer7 regexp.  A null terminates the regexp string!\n");
-+				break;
-+			default:
-+				break;
-+			}
-+
-+
-+                        sindex += 3; /* 4 total */
-+                }
-+                else
-+                        result[rindex] = tolower(s[sindex]);
-+
-+		sindex++; 
-+		rindex++;
-+        }
-+	result[rindex] = '\0';
-+
-+	return result;
-+}
-+
-+#define MAX_SUBDIRS 128
-+char ** readl7dir(char * dirname)
-+{
-+        DIR             * scratchdir;
-+        struct dirent   ** namelist;
-+	char ** subdirs = malloc(MAX_SUBDIRS * sizeof(char *));
-+
-+        int n, d = 1;
-+	subdirs[0] = "";
-+
-+        n = scandir(dirname, &namelist, 0, alphasort);
-+
-+	if (n < 0)
-+	{
-+            perror("scandir");
-+	    exit_error(OTHER_PROBLEM, "Couldn't open %s\n", dirname);
-+	}
-+        else 
-+	{
-+            	while(n--) 
-+		{
-+			char fulldirname[MAX_FN_LEN];
-+
-+			snprintf(fulldirname, MAX_FN_LEN, "%s/%s", dirname, namelist[n]->d_name);
-+
-+                	if((scratchdir = opendir(fulldirname)) != NULL)
-+			{
-+				closedir(scratchdir);
-+
-+				if(!strcmp(namelist[n]->d_name, ".") || 
-+				   !strcmp(namelist[n]->d_name, ".."))
-+					/* do nothing */ ;
-+				else
-+				{
-+					subdirs[d] = malloc(strlen(namelist[n]->d_name) + 1);
-+					strcpy(subdirs[d], namelist[n]->d_name);
-+					d++;
-+					if(d >= MAX_SUBDIRS - 1)
-+					{
-+						fprintf(stderr, 
-+						  "Too many subdirectories, skipping the rest!\n");
-+						break;
-+					}
-+				}
-+			}
-+                	free(namelist[n]);
-+            	}
-+            	free(namelist);
-+        }
-+	
-+	subdirs[d] = NULL;
-+
-+	return subdirs;
-+}
-+
-+static void
-+parse_layer7_protocol(const unsigned char *s, struct ipt_layer7_info *info)
-+{
-+	char filename[MAX_FN_LEN];
-+	char * dir = NULL;
-+	char ** subdirs;
-+	int n = 0, done = 0;
-+
-+	if(strlen(l7dir) > 0)
-+		dir = l7dir;
-+	else
-+		dir = "/etc/l7-protocols";
-+
-+	subdirs = readl7dir(dir);
-+
-+	while(subdirs[n] != NULL)
-+	{
-+		int c = snprintf(filename, MAX_FN_LEN, "%s/%s/%s.pat", dir, subdirs[n], s);
-+
-+		//fprintf(stderr, "Trying to find pattern in %s ... ", filename);
-+
-+		if(c > MAX_FN_LEN)
-+		{
-+			exit_error(OTHER_PROBLEM, 
-+				"Filename beginning with %s is too long!\n", filename);
-+		}
-+
-+		/* read in the pattern from the file */
-+		if(parse_protocol_file(filename, s, info))
-+		{
-+			//fprintf(stderr, "found\n");
-+			done = 1;
-+			break;
-+		}
-+		
-+		//fprintf(stderr, "not found\n");
-+
-+		n++;
-+	}
-+
-+	if(!done)
-+		exit_error(OTHER_PROBLEM, 
-+			"Couldn't find a pattern definition file for %s.\n", s);
-+
-+	/* process \xHH escapes and tolower everything. (our regex lib has no
-+	case insensitivity option.) */
-+	strncpy(info->pattern, pre_process(info->pattern), MAX_PATTERN_LEN);
-+}
-+
-+/* Function which parses command options; returns true if it ate an option */
-+static int parse(int c, char **argv, int invert, unsigned int *flags,
-+      const struct ipt_entry *entry, unsigned int *nfcache,
-+      struct ipt_entry_match **match)
-+{
-+	struct ipt_layer7_info *layer7info = 
-+		(struct ipt_layer7_info *)(*match)->data;
-+
-+	switch (c) {
-+	case '1':
-+		check_inverse(optarg, &invert, &optind, 0);
-+		parse_layer7_protocol(argv[optind-1], layer7info);
-+		if (invert)
-+			layer7info->invert = 1;
-+		*flags = 1;
-+		break;
-+
-+	case '2':
-+		/* not going to use this, but maybe we need to strip a ! anyway (?) */
-+		check_inverse(optarg, &invert, &optind, 0);
-+
-+		if(strlen(argv[optind-1]) >= MAX_FN_LEN)
-+			exit_error(PARAMETER_PROBLEM, "directory name too long\n");
-+
-+		strncpy(l7dir, argv[optind-1], MAX_FN_LEN);
-+
-+		*flags = 1;
-+		break;
-+
-+	default:
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+/* Final check; must have specified --l7proto */
-+static void final_check(unsigned int flags)
-+{
-+	if (!flags)
-+		exit_error(PARAMETER_PROBLEM,
-+			   "LAYER7 match: You must specify `--l7proto'");
-+}
-+
-+static void print_protocol(char s[], int invert, int numeric)
-+{
-+	fputs("l7proto ", stdout);
-+	if (invert) fputc('!', stdout);
-+	printf("%s ", s);
-+}
-+
-+/* Prints out the matchinfo. */
-+static void print(const struct ipt_ip *ip,
-+      const struct ipt_entry_match *match,
-+      int numeric)
-+{
-+	printf("LAYER7 ");
-+
-+	print_protocol(((struct ipt_layer7_info *)match->data)->protocol,
-+		  ((struct ipt_layer7_info *)match->data)->invert, numeric);
-+}
-+/* Saves the union ipt_matchinfo in parsable form to stdout. */
-+static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
-+{
-+        const struct ipt_layer7_info *info =
-+            (const struct ipt_layer7_info*) match->data;
-+
-+        printf("--l7proto %s%s ", (info->invert)   ? "! ": "", info->protocol);
-+}
-+
-+static struct iptables_match layer7 = { 
-+    .name          = "layer7",
-+    .version       = IPTABLES_VERSION,
-+    .size          = IPT_ALIGN(sizeof(struct ipt_layer7_info)),
-+    .userspacesize = IPT_ALIGN(sizeof(struct ipt_layer7_info)),
-+    .help          = &help,
-+    .parse         = &parse,
-+    .final_check   = &final_check,
-+    .print         = &print,
-+    .save          = &save,
-+    .extra_opts    = opts
-+};
-+
-+void _init(void)
-+{
-+	register_match(&layer7);
-+}
-Index: iptables-1.3.8/extensions/libipt_layer7.man
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/libipt_layer7.man
-@@ -0,0 +1,14 @@
-+This module matches packets based on the application layer data of 
-+their connections.  It uses regular expression matching to compare 
-+the application layer data to regular expressions found it the layer7 
-+configuration files.  This is an experimental module which can be found at 
-+http://l7-filter.sf.net.  It takes two options.
-+.TP
-+.BI "--l7proto " "\fIprotocol\fP"
-+Match the specified protocol.  The protocol name must match a file 
-+name in /etc/l7-protocols/ or one of its first-level child directories.
-+.TP
-+.BI "--l7dir " "\fIdirectory\fP"
-+Use \fIdirectory\fP instead of /etc/l7-protocols/.  This option must be 
-+specified before --l7proto.
-+

package/iptables/patches/1.3.8/003-layer7_2.17_pktmatch.patch

@@ -1,42 +0,0 @@
-Index: iptables-1.3.8/extensions/libipt_layer7.c
-===================================================================
---- iptables-1.3.8.orig/extensions/libipt_layer7.c
-+++ iptables-1.3.8/extensions/libipt_layer7.c
-@@ -37,7 +37,8 @@ static void help(void)
- 	"LAYER7 match v%s options:\n"
- 	"--l7dir <directory>  : Look for patterns here instead of /etc/l7-protocols/\n"
- 	"                       (--l7dir must be specified before --l7proto if used!)\n"
--	"--l7proto [!] <name> : Match the protocol defined in /etc/l7-protocols/name.pat\n",
-+	"--l7proto [!] <name> : Match the protocol defined in /etc/l7-protocols/name.pat\n"
-+	"--l7pkt              : Skip connection tracking and match individual packets\n",
- 	IPTABLES_VERSION);
- 	fputc('\n', stdout);
- }
-@@ -45,6 +46,7 @@ static void help(void)
- static struct option opts[] = {
- 	{ .name = "l7proto", .has_arg = 1, .flag = 0, .val = '1' },
- 	{ .name = "l7dir",   .has_arg = 1, .flag = 0, .val = '2' },
-+	{ .name = "l7pkt",   .has_arg = 0, .flag = 0, .val = '3' },
- 	{ .name = 0 }
- };
- 
-@@ -333,6 +335,9 @@ static int parse(int c, char **argv, int
- 
- 		*flags = 1;
- 		break;
-+	case '3':
-+		layer7info->pkt = 1;
-+		break;
- 
- 	default:
- 		return 0;
-@@ -365,6 +370,9 @@ static void print(const struct ipt_ip *i
- 
- 	print_protocol(((struct ipt_layer7_info *)match->data)->protocol,
- 		  ((struct ipt_layer7_info *)match->data)->invert, numeric);
-+
-+	if (((struct ipt_layer7_info *)match->data)->pkt)
-+		printf("l7pkt ");
- }
- /* Saves the union ipt_matchinfo in parsable form to stdout. */
- static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)

package/iptables/patches/1.3.8/004-drop_multiport_v0_support.patch

@@ -1,222 +0,0 @@
-Index: iptables-1.3.8/extensions/libipt_multiport.c
-===================================================================
---- iptables-1.3.8.orig/extensions/libipt_multiport.c
-+++ iptables-1.3.8/extensions/libipt_multiport.c
-@@ -8,24 +8,6 @@
- /* To ensure that iptables compiles with an old kernel */
- #include "../include/linux/netfilter_ipv4/ipt_multiport.h"
- 
--/* Function which prints out usage message. */
--static void
--help(void)
--{
--	printf(
--"multiport v%s options:\n"
--" --source-ports port[,port,port...]\n"
--" --sports ...\n"
--"				match source port(s)\n"
--" --destination-ports port[,port,port...]\n"
--" --dports ...\n"
--"				match destination port(s)\n"
--" --ports port[,port,port]\n"
--"				match both source and destination port(s)\n"
--" NOTE: this kernel does not support port ranges in multiport.\n",
--IPTABLES_VERSION);
--}
--
- static void
- help_v1(void)
- {
-@@ -70,26 +52,6 @@ proto_to_name(u_int8_t proto)
- 	}
- }
- 
--static unsigned int
--parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto)
--{
--	char *buffer, *cp, *next;
--	unsigned int i;
--
--	buffer = strdup(portstring);
--	if (!buffer) exit_error(OTHER_PROBLEM, "strdup failed");
--
--	for (cp=buffer, i=0; cp && i<IPT_MULTI_PORTS; cp=next,i++)
--	{
--		next=strchr(cp, ',');
--		if (next) *next++='\0';
--		ports[i] = parse_port(cp, proto);
--	}
--	if (cp) exit_error(PARAMETER_PROBLEM, "too many ports specified");
--	free(buffer);
--	return i;
--}
--
- static void
- parse_multi_ports_v1(const char *portstring, 
- 		     struct ipt_multiport_v1 *multiinfo,
-@@ -156,58 +118,6 @@ check_proto(const struct ipt_entry *entr
- 			   "multiport only works with TCP, UDP, UDPLITE, SCTP and DCCP");
- }
- 
--/* Function which parses command options; returns true if it
--   ate an option */
--static int
--parse(int c, char **argv, int invert, unsigned int *flags,
--      const struct ipt_entry *entry,
--      unsigned int *nfcache,
--      struct ipt_entry_match **match)
--{
--	const char *proto;
--	struct ipt_multiport *multiinfo
--		= (struct ipt_multiport *)(*match)->data;
--
--	switch (c) {
--	case '1':
--		check_inverse(argv[optind-1], &invert, &optind, 0);
--		proto = check_proto(entry);
--		multiinfo->count = parse_multi_ports(argv[optind-1],
--						     multiinfo->ports, proto);
--		multiinfo->flags = IPT_MULTIPORT_SOURCE;
--		break;
--
--	case '2':
--		check_inverse(argv[optind-1], &invert, &optind, 0);
--		proto = check_proto(entry);
--		multiinfo->count = parse_multi_ports(argv[optind-1],
--						     multiinfo->ports, proto);
--		multiinfo->flags = IPT_MULTIPORT_DESTINATION;
--		break;
--
--	case '3':
--		check_inverse(argv[optind-1], &invert, &optind, 0);
--		proto = check_proto(entry);
--		multiinfo->count = parse_multi_ports(argv[optind-1],
--						     multiinfo->ports, proto);
--		multiinfo->flags = IPT_MULTIPORT_EITHER;
--		break;
--
--	default:
--		return 0;
--	}
--
--	if (invert)
--		exit_error(PARAMETER_PROBLEM,
--			   "multiport does not support invert");
--
--	if (*flags)
--		exit_error(PARAMETER_PROBLEM,
--			   "multiport can only have one option");
--	*flags = 1;
--	return 1;
--}
--
- static int
- parse_v1(int c, char **argv, int invert, unsigned int *flags,
- 	 const struct ipt_entry *entry,
-@@ -284,43 +194,6 @@ print_port(u_int16_t port, u_int8_t prot
- 		printf("%s", service);
- }
- 
--/* Prints out the matchinfo. */
--static void
--print(const struct ipt_ip *ip,
--      const struct ipt_entry_match *match,
--      int numeric)
--{
--	const struct ipt_multiport *multiinfo
--		= (const struct ipt_multiport *)match->data;
--	unsigned int i;
--
--	printf("multiport ");
--
--	switch (multiinfo->flags) {
--	case IPT_MULTIPORT_SOURCE:
--		printf("sports ");
--		break;
--
--	case IPT_MULTIPORT_DESTINATION:
--		printf("dports ");
--		break;
--
--	case IPT_MULTIPORT_EITHER:
--		printf("ports ");
--		break;
--
--	default:
--		printf("ERROR ");
--		break;
--	}
--
--	for (i=0; i < multiinfo->count; i++) {
--		printf("%s", i ? "," : "");
--		print_port(multiinfo->ports[i], ip->proto, numeric);
--	}
--	printf(" ");
--}
--
- static void
- print_v1(const struct ipt_ip *ip,
- 	 const struct ipt_entry_match *match,
-@@ -364,34 +237,6 @@ print_v1(const struct ipt_ip *ip,
- 	printf(" ");
- }
- 
--/* Saves the union ipt_matchinfo in parsable form to stdout. */
--static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
--{
--	const struct ipt_multiport *multiinfo
--		= (const struct ipt_multiport *)match->data;
--	unsigned int i;
--
--	switch (multiinfo->flags) {
--	case IPT_MULTIPORT_SOURCE:
--		printf("--sports ");
--		break;
--
--	case IPT_MULTIPORT_DESTINATION:
--		printf("--dports ");
--		break;
--
--	case IPT_MULTIPORT_EITHER:
--		printf("--ports ");
--		break;
--	}
--
--	for (i=0; i < multiinfo->count; i++) {
--		printf("%s", i ? "," : "");
--		print_port(multiinfo->ports[i], ip->proto, 1);
--	}
--	printf(" ");
--}
--
- static void save_v1(const struct ipt_ip *ip, 
- 		    const struct ipt_entry_match *match)
- {
-@@ -427,19 +272,20 @@ static void save_v1(const struct ipt_ip 
- 	printf(" ");
- }
- 
-+
- static struct iptables_match multiport = { 
- 	.next		= NULL,
- 	.name		= "multiport",
--	.revision	= 0,
- 	.version	= IPTABLES_VERSION,
--	.size		= IPT_ALIGN(sizeof(struct ipt_multiport)),
--	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_multiport)),
--	.help		= &help,
-+	.revision	= 0,
-+	.size		= IPT_ALIGN(sizeof(struct ipt_multiport_v1)),
-+	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_multiport_v1)),
-+	.help		= &help_v1,
- 	.init		= &init,
--	.parse		= &parse,
-+	.parse		= &parse_v1,
- 	.final_check	= &final_check,
--	.print		= &print,
--	.save		= &save,
-+	.print		= &print_v1,
-+	.save		= &save_v1,
- 	.extra_opts	= opts
- };
- 

package/iptables/patches/1.3.8/005-imq1.patch

@@ -1,228 +0,0 @@
-Index: iptables-1.3.8/extensions/.IMQ-test6
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/.IMQ-test6
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+# True if IMQ target patch is applied.
-+[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
-Index: iptables-1.3.8/extensions/libip6t_IMQ.c
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/libip6t_IMQ.c
-@@ -0,0 +1,101 @@
-+/* Shared library add-on to iptables to add IMQ target support. */
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <getopt.h>
-+
-+#include <ip6tables.h>
-+#include <linux/netfilter_ipv6/ip6_tables.h>
-+#include <linux/netfilter_ipv6/ip6t_IMQ.h>
-+
-+/* Function which prints out usage message. */
-+static void
-+help(void)
-+{
-+	printf(
-+"IMQ target v%s options:\n"
-+"  --todev <N>		enqueue to imq<N>, defaults to 0\n", 
-+IPTABLES_VERSION);
-+}
-+
-+static struct option opts[] = {
-+	{ "todev", 1, 0, '1' },
-+	{ 0 }
-+};
-+
-+/* Initialize the target. */
-+static void
-+init(struct ip6t_entry_target *t, unsigned int *nfcache)
-+{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)t->data;
-+
-+	mr->todev = 0;
-+	*nfcache |= NFC_UNKNOWN;
-+}
-+
-+/* Function which parses command options; returns true if it
-+   ate an option */
-+static int
-+parse(int c, char **argv, int invert, unsigned int *flags,
-+      const struct ip6t_entry *entry,
-+      struct ip6t_entry_target **target)
-+{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)(*target)->data;
-+	
-+	switch(c) {
-+	case '1':
-+		if (check_inverse(optarg, &invert, NULL, 0))
-+			exit_error(PARAMETER_PROBLEM,
-+				   "Unexpected `!' after --todev");
-+		mr->todev=atoi(optarg);
-+		break;
-+	default:
-+		return 0;
-+	}
-+	return 1;
-+}
-+
-+static void
-+final_check(unsigned int flags)
-+{
-+}
-+
-+/* Prints out the targinfo. */
-+static void
-+print(const struct ip6t_ip6 *ip,
-+      const struct ip6t_entry_target *target,
-+      int numeric)
-+{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
-+
-+	printf("IMQ: todev %u ", mr->todev);
-+}
-+
-+/* Saves the union ipt_targinfo in parsable form to stdout. */
-+static void
-+save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
-+{
-+	struct ip6t_imq_info *mr = (struct ip6t_imq_info*)target->data;
-+
-+	printf("--todev %u", mr->todev);
-+}
-+
-+static struct ip6tables_target imq = {
-+	.next		= NULL,
-+	.name		= "IMQ",
-+	.version	= IPTABLES_VERSION,
-+	.size		= IP6T_ALIGN(sizeof(struct ip6t_imq_info)),
-+	.userspacesize	= IP6T_ALIGN(sizeof(struct ip6t_imq_info)),
-+	.help		= &help,
-+	.init		= &init,
-+	.parse		= &parse,
-+	.final_check	= &final_check,
-+	.print		= &print,
-+	.save		= &save,
-+	.extra_opts	= opts
-+};
-+
-+static __attribute__((constructor)) void _init(void)
-+{
-+	register_target6(&imq);
-+}
-Index: iptables-1.3.8/extensions/.IMQ-test
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/.IMQ-test
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+# True if IMQ target patch is applied.
-+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
-Index: iptables-1.3.8/extensions/libipt_IMQ.c
-===================================================================
---- /dev/null
-+++ iptables-1.3.8/extensions/libipt_IMQ.c
-@@ -0,0 +1,101 @@
-+/* Shared library add-on to iptables to add IMQ target support. */
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <getopt.h>
-+
-+#include <iptables.h>
-+#include <linux/netfilter_ipv4/ip_tables.h>
-+#include <linux/netfilter_ipv4/ipt_IMQ.h>
-+
-+/* Function which prints out usage message. */
-+static void
-+help(void)
-+{
-+	printf(
-+"IMQ target v%s options:\n"
-+"  --todev <N>		enqueue to imq<N>, defaults to 0\n", 
-+IPTABLES_VERSION);
-+}
-+
-+static struct option opts[] = {
-+	{ "todev", 1, 0, '1' },
-+	{ 0 }
-+};
-+
-+/* Initialize the target. */
-+static void
-+init(struct ipt_entry_target *t, unsigned int *nfcache)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)t->data;
-+
-+	mr->todev = 0;
-+	*nfcache |= NFC_UNKNOWN;
-+}
-+
-+/* Function which parses command options; returns true if it
-+   ate an option */
-+static int
-+parse(int c, char **argv, int invert, unsigned int *flags,
-+      const struct ipt_entry *entry,
-+      struct ipt_entry_target **target)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)(*target)->data;
-+	
-+	switch(c) {
-+	case '1':
-+		if (check_inverse(optarg, &invert, NULL, 0))
-+			exit_error(PARAMETER_PROBLEM,
-+				   "Unexpected `!' after --todev");
-+		mr->todev=atoi(optarg);
-+		break;
-+	default:
-+		return 0;
-+	}
-+	return 1;
-+}
-+
-+static void
-+final_check(unsigned int flags)
-+{
-+}
-+
-+/* Prints out the targinfo. */
-+static void
-+print(const struct ipt_ip *ip,
-+      const struct ipt_entry_target *target,
-+      int numeric)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
-+
-+	printf("IMQ: todev %u ", mr->todev);
-+}
-+
-+/* Saves the union ipt_targinfo in parsable form to stdout. */
-+static void
-+save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
-+{
-+	struct ipt_imq_info *mr = (struct ipt_imq_info*)target->data;
-+
-+	printf("--todev %u", mr->todev);
-+}
-+
-+static struct iptables_target imq = {
-+	.next		= NULL,
-+	.name		= "IMQ",
-+	.version	= IPTABLES_VERSION,
-+	.size		= IPT_ALIGN(sizeof(struct ipt_imq_info)),
-+	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_imq_info)),
-+	.help		= &help,
-+	.init		= &init,
-+	.parse		= &parse,
-+	.final_check	= &final_check,
-+	.print		= &print,
-+	.save		= &save,
-+	.extra_opts	= opts
-+};
-+
-+static __attribute__((constructor)) void _init(void)
-+{
-+	register_target(&imq);
-+}

package/iptables/patches/1.3.8/006-ipt_conntrack.patch

@@ -1,11 +0,0 @@
---- ./include/linux/netfilter_ipv4/ipt_conntrack.h.orig	2008-09-27 10:26:49.000000000 -0400
-+++ ./include/linux/netfilter_ipv4/ipt_conntrack.h	2008-09-27 01:15:57.000000000 -0400
-@@ -52,7 +52,7 @@
- 	struct {
- 		u_int32_t ip;
- 		union {
--			u_int16_t all;
-+			u_int32_t all;
- 		} u;
- 
- 		/* The protocol. */

package/iptables/patches/1.4.3.2/002-layer7_2.17.patch

@@ -1,6 +1,6 @@
-diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_layer7.c
+diff -Nur a/libxt_layer7.c b/libxt_layer7.c
---- iptables.old/extensions/libxt_layer7.c	1970-01-01 01:00:00.000000000 +0100
+--- a/libxt_layer7.c	1970-01-01 01:00:00.000000000 +0100
-+++ iptables.new/extensions/libxt_layer7.c	2008-08-22 16:00:52.000000000 +0200
++++ b/libxt_layer7.c	2008-08-22 16:00:52.000000000 +0200
 @@ -0,0 +1,368 @@
 +/* 
 +   Shared library add-on to iptables for layer 7 matching support. 
@@ -370,9 +370,9 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +{
 +	xtables_register_match(&layer7);
 +}
-diff -Nur iptables.old/extensions/libxt_layer7.man iptables.new/extensions/libxt_layer7.man
+diff -Nur a/libxt_layer7.man b/libxt_layer7.man
---- iptables.old/extensions/libxt_layer7.man	1970-01-01 01:00:00.000000000 +0100
+--- a/libxt_layer7.man	1970-01-01 01:00:00.000000000 +0100
-+++ iptables.new/extensions/libxt_layer7.man	2008-08-22 16:00:52.000000000 +0200
++++ b/libxt_layer7.man	2008-08-22 16:00:52.000000000 +0200
 @@ -0,0 +1,14 @@
 +This module matches packets based on the application layer data of 
 +their connections.  It uses regular expression matching to compare 

package/iptables/patches/1.4.3.2/005-imq1.patch

@@ -1,26 +1,25 @@
---- iptables-1.4.1-rc3.orig/extensions/.IMQ-test	1970-01-01 10:00:00.000000000 +1000
+--- /dev/null
-+++ iptables-1.4.1-rc3/extensions/.IMQ-test	2008-06-08 22:41:49.000000000 +1000
++++ b/extensions/.IMQ-test
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +# True if IMQ target patch is applied.
 +[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ipt_IMQ.h ] && echo IMQ
-diff -pruN iptables-1.4.1-rc3.orig/extensions/.IMQ-test6 iptables-1.4.1-rc3/extensions/.IMQ-test6
+--- /dev/null
---- iptables-1.4.1-rc3.orig/extensions/.IMQ-test6	1970-01-01 10:00:00.000000000 +1000
++++ b/extensions/.IMQ-test6
-+++ iptables-1.4.1-rc3/extensions/.IMQ-test6	2008-06-08 22:41:49.000000000 +1000
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +# True if IMQ target patch is applied.
 +[ -f $KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_IMQ.h ] && echo IMQ
-diff -pruN iptables-1.4.1-rc3.orig/extensions/libip6t_IMQ.c iptables-1.4.1-rc3/extensions/libip6t_IMQ.c
+--- /dev/null
---- iptables-1.4.1-rc3.orig/extensions/libip6t_IMQ.c	1970-01-01 10:00:00.000000000 +1000
++++ b/extensions/libip6t_IMQ.c
-+++ iptables-1.4.1-rc3/extensions/libip6t_IMQ.c	2008-06-08 22:46:57.000000000 +1000
+@@ -0,0 +1,90 @@
-@@ -0,0 +1,89 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <getopt.h>
 +
++#include <xtables.h>
 +#include <ip6tables.h>
 +#include <linux/netfilter_ipv6/ip6_tables.h>
 +#include <linux/netfilter_ipv6/ip6t_IMQ.h>
@@ -57,8 +56,8 @@ diff -pruN iptables-1.4.1-rc3.orig/extensions/libip6t_IMQ.c iptables-1.4.1-rc3/e
 +	
 +	switch(c) {
 +	case '1':
-+		if (check_inverse(optarg, &invert, NULL, 0))
++		if (xtables_check_inverse(optarg, &invert, NULL, 0))
-+			exit_error(PARAMETER_PROBLEM,
++			xtables_error(PARAMETER_PROBLEM,
 +				   "Unexpected `!' after --todev");
 +		mr->todev=atoi(optarg);
 +		break;
@@ -104,16 +103,16 @@ diff -pruN iptables-1.4.1-rc3.orig/extensions/libip6t_IMQ.c iptables-1.4.1-rc3/e
 +{
 +	xtables_register_target(&imq);
 +}
-diff -pruN iptables-1.4.1-rc3.orig/extensions/libipt_IMQ.c iptables-1.4.1-rc3/extensions/libipt_IMQ.c
+--- /dev/null
---- iptables-1.4.1-rc3.orig/extensions/libipt_IMQ.c	1970-01-01 10:00:00.000000000 +1000
++++ b/extensions/libipt_IMQ.c
-+++ iptables-1.4.1-rc3/extensions/libipt_IMQ.c	2008-06-08 22:46:25.000000000 +1000
+@@ -0,0 +1,89 @@
-@@ -0,0 +1,88 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>
 +#include <string.h>
 +#include <stdlib.h>
 +#include <getopt.h>
 +
++#include <xtables.h>
 +#include <iptables.h>
 +#include <linux/netfilter_ipv4/ip_tables.h>
 +#include <linux/netfilter_ipv4/ipt_IMQ.h>
@@ -149,8 +148,8 @@ diff -pruN iptables-1.4.1-rc3.orig/extensions/libipt_IMQ.c iptables-1.4.1-rc3/ex
 +	
 +	switch(c) {
 +	case '1':
-+		if (check_inverse(optarg, &invert, NULL, 0))
++		if (xtables_check_inverse(optarg, &invert, NULL, 0))
-+			exit_error(PARAMETER_PROBLEM,
++			xtables_error(PARAMETER_PROBLEM,
 +				   "Unexpected `!' after --todev");
 +		mr->todev=atoi(optarg);
 +		break;

target/linux/generic-2.4/patches/602-netfilter_layer7_2.21.patch

@@ -1,8 +1,6 @@
-Index: linux-2.4.35.4/Documentation/Configure.help
+--- a/Documentation/Configure.help
-===================================================================
++++ b/Documentation/Configure.help
---- linux-2.4.35.4.orig/Documentation/Configure.help
+@@ -29207,6 +29207,18 @@
-+++ linux-2.4.35.4/Documentation/Configure.help
-@@ -29207,6 +29207,18 @@ CONFIG_SOUND_WM97XX
    
    If unsure, say N.
  
@@ -21,11 +19,9 @@ Index: linux-2.4.35.4/Documentation/Configure.help
  #
  # A couple of things I keep forgetting:
  #   capitalize: AppleTalk, Ethernet, DOS, DMA, FAT, FTP, Internet,
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
+--- a/include/linux/netfilter_ipv4/ip_conntrack.h
-===================================================================
++++ b/include/linux/netfilter_ipv4/ip_conntrack.h
---- linux-2.4.35.4.orig/include/linux/netfilter_ipv4/ip_conntrack.h
+@@ -207,6 +207,17 @@
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
-@@ -207,6 +207,17 @@ struct ip_conntrack
  	} nat;
  #endif /* CONFIG_IP_NF_NAT_NEEDED */
  
@@ -43,11 +39,9 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ip_conntrack.h
  };
  
  /* get master conntrack via master expectation */
-Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
++++ b/include/linux/netfilter_ipv4/ipt_layer7.h
-@@ -0,0 +1,27 @@
+@@ -0,0 +1,26 @@
 +/*
 +  By Matthew Strait <quadong@users.sf.net>, Dec 2003.
 +  http://l7-filter.sf.net
@@ -69,17 +63,14 @@ Index: linux-2.4.35.4/include/linux/netfilter_ipv4/ipt_layer7.h
 +
 +struct ipt_layer7_info {
 +    char protocol[MAX_PROTOCOL_LEN];
++    char invert:1;
 +    char pattern[MAX_PATTERN_LEN];
-+    u_int8_t invert;
-+    u_int8_t pkt;
 +};
 +
 +#endif /* _IPT_LAYER7_H */
-Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
+--- a/net/ipv4/netfilter/Config.in
-===================================================================
++++ b/net/ipv4/netfilter/Config.in
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Config.in
+@@ -44,6 +44,9 @@
-+++ linux-2.4.35.4/net/ipv4/netfilter/Config.in
-@@ -44,6 +44,9 @@ if [ "$CONFIG_IP_NF_IPTABLES" != "n" ]; 
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
      dep_tristate '  Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
      dep_tristate '  Owner match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_OWNER $CONFIG_IP_NF_IPTABLES
@@ -89,11 +80,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Config.in
    fi
  # The targets
    dep_tristate '  Packet filtering' CONFIG_IP_NF_FILTER $CONFIG_IP_NF_IPTABLES 
-Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
+--- a/net/ipv4/netfilter/Makefile
-===================================================================
++++ b/net/ipv4/netfilter/Makefile
---- linux-2.4.35.4.orig/net/ipv4/netfilter/Makefile
+@@ -87,6 +87,7 @@
-+++ linux-2.4.35.4/net/ipv4/netfilter/Makefile
-@@ -87,6 +87,7 @@ obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_s
  obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
  obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
  obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
@@ -101,11 +90,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/Makefile
  
  # targets
  obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
+--- a/net/ipv4/netfilter/ip_conntrack_core.c
-===================================================================
++++ b/net/ipv4/netfilter/ip_conntrack_core.c
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_core.c
+@@ -346,6 +346,14 @@
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
-@@ -346,6 +346,14 @@ destroy_conntrack(struct nf_conntrack *n
  		}
  		kfree(ct->master);
  	}
@@ -120,11 +107,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_core.c
  	WRITE_UNLOCK(&ip_conntrack_lock);
  
  	if (master)
-Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
-===================================================================
++++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
---- linux-2.4.35.4.orig/net/ipv4/netfilter/ip_conntrack_standalone.c
+@@ -107,6 +107,13 @@
-+++ linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
-@@ -107,6 +107,13 @@ print_conntrack(char *buffer, struct ip_
  		len += sprintf(buffer + len, "[ASSURED] ");
  	len += sprintf(buffer + len, "use=%u ",
  		       atomic_read(&conntrack->ct_general.use));
@@ -138,11 +123,9 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ip_conntrack_standalone.c
  	len += sprintf(buffer + len, "\n");
  
  	return len;
-Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
++++ b/net/ipv4/netfilter/ipt_layer7.c
-@@ -0,0 +1,595 @@
+@@ -0,0 +1,570 @@
 +/*
 +  Kernel module to match application layer (OSI layer 7)
 +  data in connections.
@@ -441,34 +424,26 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
 +	}
 +}
 +
-+static int add_datastr(char *target, int offset, char *app_data, int len)
++/* add the new app data to the conntrack.  Return number of bytes added. */
++static int add_data(struct ip_conntrack * master_conntrack,
++			char * app_data, int appdatalen)
 +{
 +	int length = 0, i;
++	int oldlength = master_conntrack->layer7.app_data_len;
 +
 +	/* Strip nulls. Make everything lower case (our regex lib doesn't
 +	do case insensitivity).  Add it to the end of the current data. */
-+	for(i = 0; i < maxdatalen-offset-1 && i < len; i++) {
++	for(i = 0; i < maxdatalen-oldlength-1 && i < appdatalen; i++) {
 +		if(app_data[i] != '\0') {
-+ 			target[length+offset] = 
++			master_conntrack->layer7.app_data[length+oldlength] =
 +				/* the kernel version of tolower mungs 'upper ascii' */
 +				isascii(app_data[i])? tolower(app_data[i]) : app_data[i];
 +			length++;
 +		}
 +	}
 +
-+	target[length+offset] = '\0';
++	master_conntrack->layer7.app_data[length+oldlength] = '\0';
-+
++	master_conntrack->layer7.app_data_len = length + oldlength;
-+	return length;
-+}
-+
-+/* add the new app data to the conntrack.  Return number of bytes added. */
-+static int add_data(struct ip_conntrack * master_conntrack, 
-+			char * app_data, int appdatalen)
-+{
-+	int length;
-+	
-+	length = add_datastr(master_conntrack->layer7.app_data, master_conntrack->layer7.app_data_len, app_data, appdatalen);
-+	master_conntrack->layer7.app_data_len += length;
 +
 +	return length;
 +}
@@ -481,7 +456,7 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
 +	struct ipt_layer7_info * info = (struct ipt_layer7_info *)matchinfo;
 +	enum ip_conntrack_info master_ctinfo, ctinfo;
 +	struct ip_conntrack *master_conntrack, *conntrack;
-+	unsigned char *app_data, *tmp_data;  
++	unsigned char * app_data;
 +	unsigned int pattern_result, appdatalen;
 +	regexp * comppattern;
 +
@@ -511,8 +486,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
 +	}
 +
 +	/* if we've classified it or seen too many packets */
-+	if(!info->pkt && (TOTAL_PACKETS > num_packets || 
++	if(TOTAL_PACKETS > num_packets ||
-+		master_conntrack->layer7.app_proto)) {
++	   master_conntrack->layer7.app_proto) {
 +
 +		pattern_result = match_no_append(conntrack, master_conntrack, ctinfo, master_ctinfo, info);
 +
@@ -543,23 +518,6 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
 +	comppattern = compile_and_cache(info->pattern, info->protocol);
 +	UNLOCK_BH(&list_lock);
 +
-+	if (info->pkt) {
-+		tmp_data = kmalloc(maxdatalen, GFP_ATOMIC);
-+		if(!tmp_data){
-+			if (net_ratelimit())
-+				printk(KERN_ERR "layer7: out of memory in match, bailing.\n");
-+			return info->invert;
-+		}
-+		
-+		tmp_data[0] = '\0';
-+		add_datastr(tmp_data, 0, app_data, appdatalen);
-+		pattern_result = ((comppattern && regexec(comppattern, tmp_data)) ? 1 : 0);
-+		kfree(tmp_data);
-+		tmp_data = NULL;
-+		
-+		return (pattern_result ^ info->invert);
-+	}
-+	
 +	/* On the first packet of a connection, allocate space for app data */
 +	WRITE_LOCK(&ct_lock);
 +	if(TOTAL_PACKETS == 1 && !skb->cb[0] && !master_conntrack->layer7.app_data) {
@@ -738,10 +696,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/ipt_layer7.c
 +
 +module_init(init);
 +module_exit(fini);
-Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
++++ b/net/ipv4/netfilter/regexp/regexp.c
 @@ -0,0 +1,1195 @@
 +/*
 + * regcomp and regexec -- regsub and regerror are elsewhere
@@ -1938,10 +1894,8 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.c
 +#endif
 +
 +
-Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
++++ b/net/ipv4/netfilter/regexp/regexp.h
 @@ -0,0 +1,40 @@
 +/*
 + * Definitions etc. for regexp(3) routines.
@@ -1983,20 +1937,16 @@ Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regexp.h
 +void regerror(char *s);
 +
 +#endif
-Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regmagic.h
++++ b/net/ipv4/netfilter/regexp/regmagic.h
 @@ -0,0 +1,5 @@
 +/*
 + * The first byte of the regexp internal "program" is actually this magic
 + * number; the start node begins in the second byte.
 + */
 +#define	MAGIC	0234
-Index: linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c
-===================================================================
 --- /dev/null
-+++ linux-2.4.35.4/net/ipv4/netfilter/regexp/regsub.c
++++ b/net/ipv4/netfilter/regexp/regsub.c
 @@ -0,0 +1,95 @@
 +/*
 + * regsub