Author: zbyniu Date: Wed May 21 21:49:16 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for xtables (iptables 1.4.1)
---- Files affected:
SOURCES:
iptables-layer7.patch (1.2 -> 1.3) , iptables-old-1.3.7.patch (1.2 -> 1.3) ,
iptables-account.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/iptables-layer7.patch
diff -u SOURCES/iptables-layer7.patch:1.2 SOURCES/iptables-layer7.patch:1.3
--- SOURCES/iptables-layer7.patch:1.2 Sun Feb 3 00:58:19 2008
+++ SOURCES/iptables-layer7.patch Wed May 21 23:49:11 2008
@@ -7,7 +7,7 @@
diff -Nurp iptables-1.3.8/extensions/libipt_layer7.c
iptables-1.3.8-layer7/extensions/libipt_layer7.c
--- iptables-1.3.8/extensions/libipt_layer7.c 1969-12-31 18:00:00.000000000
-0600
+++ iptables-1.3.8-layer7/extensions/libipt_layer7.c 2007-07-04
19:23:04.000000000 -0500
-@@ -0,0 +1,394 @@
+@@ -0,0 +1,397 @@
+/*
+ Shared library add-on to iptables to add layer 7 matching support.
+
@@ -40,6 +40,9 @@
+
+static char l7dir[MAX_FN_LEN] = "\0";
+
++int parse_protocol_file(char * filename, const char * protoname, struct
xt_layer7_info *info);
++char ** readl7dir(char * dirname);
++
+/* Function which prints out usage message. */
+static void help(void)
+{
@@ -48,7 +51,7 @@
+ "--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);
++ XTABLES_VERSION);
+ fputc('\n', stdout);
+}
+
@@ -385,9 +388,9 @@
+ printf("--l7proto %s%s ", (info->invert) ? "! ": "",
info->protocol);
+}
+
-+static struct iptables_match layer7 = {
++static struct xtables_match layer7 = {
+ .name = "layer7",
-+ .version = IPTABLES_VERSION,
++ .version = XTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct xt_layer7_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct xt_layer7_info)),
+ .help = &help,
@@ -400,7 +403,7 @@
+
+void _init(void)
+{
-+ register_match(&layer7);
++ xtables_register_match(&layer7);
+}
diff -Nurp iptables-1.3.8/extensions/libipt_layer7.man
iptables-1.3.8-layer7/extensions/libipt_layer7.man
--- iptables-1.3.8/extensions/libipt_layer7.man 1969-12-31
18:00:00.000000000 -0600
================================================================
Index: SOURCES/iptables-old-1.3.7.patch
diff -u SOURCES/iptables-old-1.3.7.patch:1.2
SOURCES/iptables-old-1.3.7.patch:1.3
--- SOURCES/iptables-old-1.3.7.patch:1.2 Sun Feb 3 00:55:01 2008
+++ SOURCES/iptables-old-1.3.7.patch Wed May 21 23:49:11 2008
@@ -167,7 +167,7 @@
+ " --strict"
+ "\t\t\ta flag to force the drop of packets\n"
+ "\t\t\t\tnot containing \"get\" portmapper requests.\n",
-+ IPTABLES_VERSION);
++ XTABLES_VERSION);
+}
+
+
@@ -352,10 +352,10 @@
+}
+
+
-+static struct iptables_match rpcstruct = {
++static struct xtables_match rpcstruct = {
+ .next = NULL,
+ .name = "rpc",
-+ .version = IPTABLES_VERSION,
++ .version = XTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_rpc_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_rpc_info)),
+ .help = &help,
@@ -370,7 +370,7 @@
+
+void _init(void)
+{
-+ register_match(&rpcstruct);
++ xtables_register_match(&rpcstruct);
+}
+
--- /dev/null 2005-12-16 15:49:47.000000000 +0100
@@ -471,7 +471,7 @@
+
+ if (strlen(optarg) > sizeof(route_info->oif) - 1)
+ exit_error(PARAMETER_PROBLEM,
-+ "Maximum interface name length %u",
++ "Maximum interface name length %lu",
+ sizeof(route_info->oif) - 1);
+
+ strcpy(route_info->oif, optarg);
@@ -493,7 +493,7 @@
+
+ if (strlen(optarg) > sizeof(route_info->iif) - 1)
+ exit_error(PARAMETER_PROBLEM,
-+ "Maximum interface name length %u",
++ "Maximum interface name length %lu",
+ sizeof(route_info->iif) - 1);
+
+ strcpy(route_info->iif, optarg);
@@ -621,10 +621,10 @@
+}
+
+
-+static struct iptables_target route = {
++static struct xtables_target route = {
+ .next = NULL,
+ .name = "ROUTE",
-+ .version = IPTABLES_VERSION,
++ .version = XTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_route_target_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_route_target_info)),
+ .help = &help,
@@ -638,7 +638,7 @@
+
+void _init(void)
+{
-+ register_target(&route);
++ xtables_register_target(&route);
+}
--- /dev/null 2005-12-16 15:49:47.000000000 +0100
+++ iptables-1.3.8/extensions/libipt_ROUTE.man 2006-12-04 12:15:20.000000000
+0100
@@ -767,7 +767,7 @@
+
+ if (strlen(optarg) > sizeof(route_info->oif) - 1)
+ exit_error(PARAMETER_PROBLEM,
-+ "Maximum interface name length %u",
++ "Maximum interface name length %lu",
+ sizeof(route_info->oif) - 1);
+
+ strcpy(route_info->oif, optarg);
@@ -896,9 +896,9 @@
+}
+
+
-+static struct ip6tables_target route = {
++static struct xtables_target route = {
+ .name = "ROUTE",
-+ .version = IPTABLES_VERSION,
++ .version = XTABLES_VERSION,
+ .size = IP6T_ALIGN(sizeof(struct ip6t_route_target_info)),
+ .userspacesize = IP6T_ALIGN(sizeof(struct ip6t_route_target_info)),
+ .help = &help,
@@ -912,7 +912,7 @@
+
+void _init(void)
+{
-+ register_target6(&route);
++ xtables_register_target(&route);
+}
--- /dev/null 2005-12-16 15:49:47.000000000 +0100
+++ iptables-1.3.8/extensions/libip6t_ROUTE.man 2006-12-04
12:15:20.000000000 +0100
================================================================
Index: SOURCES/iptables-account.patch
diff -u SOURCES/iptables-account.patch:1.2 SOURCES/iptables-account.patch:1.3
--- SOURCES/iptables-account.patch:1.2 Sat Feb 2 18:34:15 2008
+++ SOURCES/iptables-account.patch Wed May 21 23:49:11 2008
@@ -1,6 +1,6 @@
--- /dev/null 2005-12-16 15:49:47.000000000 +0100
+++ iptables-1.3.8/extensions/libipt_account.c 2007-07-21 19:13:28.000000000
+0200
-@@ -0,0 +1,275 @@
+@@ -0,0 +1,279 @@
+/* Copyright (c) 2004-2007 Piotr 'QuakeR' Gasidlo <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,10 @@
+ ((unsigned char *)&addr)[0]
+#endif
+
++int parseip(const char *parameter, u_int32_t *ip);
++int valid_netmask(u_int32_t netmask);
++int valid_network_and_netmask(struct t_ipt_account_info *info);
++
+static void help(void) {
+ printf(
+ "account v%s options:\n"
@@ -37,7 +41,7 @@
+ " table will colect only short statistics (only total counters\n"
+ " without splitting it into protocols.\n"
+ ,
-+ IPTABLES_VERSION);
++ XTABLES_VERSION);
+};
+
+static struct option opts[] = {
@@ -256,10 +260,10 @@
+ printf("--ashort ");
+}
+
-+static struct iptables_match account = {
++static struct xtables_match account = {
+ .next = NULL,
+ .name = "account",
-+ .version = IPTABLES_VERSION,
++ .version = XTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct t_ipt_account_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct t_ipt_account_info)),
+ .help = &help,
@@ -274,7 +278,7 @@
+/* Function which registers match */
+void _init(void)
+{
-+ register_match(&account);
++ xtables_register_match(&account);
+}
--- /dev/null 2005-12-16 15:49:47.000000000 +0100
+++ iptables-1.3.8/extensions/.account-test 2007-09-09 02:11:13.530174250
+0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-layer7.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-old-1.3.7.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-account.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
