X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/14cb88d92095e4fb8e791fa518bc94df19dc226c..6df4474fb28ac44f63a662aa5d068022381283e5:/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch

diff --git a/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch b/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch
index ac6b1a484..a62d87f61 100644
--- a/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch
+++ b/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
---- iptables.old/extensions/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
+diff -Nur a/libxt_layer7.c b/libxt_layer7.c
+--- a/extensions/libxt_layer7.c	1970-01-01 01:00:00.000000000 +0100
++++ b/extensions/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. 
@@ -89,12 +89,12 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +			/* sanity check.  First non-comment non-blank 
 +			line must be the same as the file name. */
 +			if(strcmp(line, protoname))
-+				exit_error(OTHER_PROBLEM, 
++				xtables_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, 
++				 xtables_error(PARAMETER_PROBLEM, 
 +					"Protocol name in %s too long!", filename);
 +			strncpy(info->protocol, line, MAX_PROTOCOL_LEN);
 +
@@ -103,18 +103,18 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +		else if(datatype == pattern)
 +		{
 +			if(strlen(line) >= MAX_PATTERN_LEN)
-+				 exit_error(PARAMETER_PROBLEM, "Pattern in %s too long!", filename);
++				 xtables_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");
++			xtables_error(OTHER_PROBLEM, "Internal error");
 +	}
 +
 +	if(datatype != done)
-+		exit_error(OTHER_PROBLEM, "Failed to get all needed data from %s", filename);
++		xtables_error(OTHER_PROBLEM, "Failed to get all needed data from %s", filename);
 +
 +	if(line) free(line);
 +	fclose(f);
@@ -133,7 +133,7 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +                case 'A' ... 'F':
 +                        return c - 'A' + 10;
 +                default:
-+                        exit_error(OTHER_PROBLEM, "hex2dec: bad value!\n");
++                        xtables_error(OTHER_PROBLEM, "hex2dec: bad value!\n");
 +                        return 0;
 +        }
 +}
@@ -210,7 +210,7 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +	if (n < 0)
 +	{
 +            perror("scandir");
-+	    exit_error(OTHER_PROBLEM, "Couldn't open %s\n", dirname);
++	    xtables_error(OTHER_PROBLEM, "Couldn't open %s\n", dirname);
 +	}
 +        else 
 +	{
@@ -267,7 +267,7 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +		int c = snprintf(filename, MAX_FN_LEN, "%s/%s/%s.pat", dir, subdirs[n], s);
 +
 +		if(c > MAX_FN_LEN)
-+			exit_error(OTHER_PROBLEM, 
++			xtables_error(OTHER_PROBLEM, 
 +				"Filename beginning with %s is too long!\n", filename);
 +
 +		/* read in the pattern from the file */
@@ -280,7 +280,7 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +	}
 +
 +	if(!done)
-+		exit_error(OTHER_PROBLEM, 
++		xtables_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
@@ -305,7 +305,7 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +
 +	case 'd':
 +		if(strlen(argv[optind-1]) >= MAX_FN_LEN)
-+			exit_error(PARAMETER_PROBLEM, "directory name too long\n");
++			xtables_error(PARAMETER_PROBLEM, "directory name too long\n");
 +
 +		strncpy(l7dir, argv[optind-1], MAX_FN_LEN);
 +
@@ -323,7 +323,7 @@ diff -Nur iptables.old/extensions/libxt_layer7.c iptables.new/extensions/libxt_l
 +static void final_check(unsigned int flags)
 +{
 +	if (!flags)
-+		exit_error(PARAMETER_PROBLEM,
++		xtables_error(PARAMETER_PROBLEM,
 +			   "LAYER7 match: You must specify `--l7proto'");
 +}
 +
@@ -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
---- iptables.old/extensions/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
+diff -Nur a/libxt_layer7.man b/libxt_layer7.man
+--- a/extensions/libxt_layer7.man	1970-01-01 01:00:00.000000000 +0100
++++ b/extensions/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