Author: zbyniu Date: Thu Mar 26 13:18:24 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.4.3
---- Files affected:
SOURCES:
iptables-layer7.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/iptables-layer7.patch
diff -u SOURCES/iptables-layer7.patch:1.3 SOURCES/iptables-layer7.patch:1.4
--- SOURCES/iptables-layer7.patch:1.3 Wed May 21 23:49:11 2008
+++ SOURCES/iptables-layer7.patch Thu Mar 26 14:18:19 2009
@@ -102,12 +102,12 @@
+ /* 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);
+
@@ -116,18 +116,18 @@
+ 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);
@@ -152,7 +152,7 @@
+ 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;
+ }
+}
@@ -229,7 +229,7 @@
+ 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
+ {
@@ -292,7 +292,7 @@
+
+ if(c > MAX_FN_LEN)
+ {
-+ exit_error(OTHER_PROBLEM,
++ xtables_error(OTHER_PROBLEM,
+ "Filename beginning with %s is too long!\n",
filename);
+ }
+
@@ -310,7 +310,7 @@
+ }
+
+ 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
@@ -328,7 +328,7 @@
+
+ switch (c) {
+ case '1':
-+ check_inverse(optarg, &invert, &optind, 0);
++ xtables_check_inverse(optarg, &invert, &optind, 0);
+ parse_layer7_protocol(argv[optind-1], layer7info);
+ if (invert)
+ layer7info->invert = 1;
@@ -337,10 +337,10 @@
+
+ case '2':
+ /* not going to use this, but maybe we need to strip a ! anyway
(?) */
-+ check_inverse(optarg, &invert, &optind, 0);
++ xtables_check_inverse(optarg, &invert, &optind, 0);
+
+ 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);
+
@@ -358,7 +358,7 @@
+static void final_check(unsigned int flags)
+{
+ if (!flags)
-+ exit_error(PARAMETER_PROBLEM,
++ xtables_error(PARAMETER_PROBLEM,
+ "LAYER7 match: You must specify `--l7proto'");
+}
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-layer7.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
