SOURCES: iptables-20070806.patch - more, maybe all
zbyniu
zbyniu at pld-linux.org
Sun Feb 3 00:36:33 CET 2008
Author: zbyniu Date: Sat Feb 2 23:36:33 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- more, maybe all
---- Files affected:
SOURCES:
iptables-20070806.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/iptables-20070806.patch
diff -u SOURCES/iptables-20070806.patch:1.4 SOURCES/iptables-20070806.patch:1.5
--- SOURCES/iptables-20070806.patch:1.4 Sat Feb 2 20:05:03 2008
+++ SOURCES/iptables-20070806.patch Sun Feb 3 00:36:28 2008
@@ -68,7 +68,7 @@
diff -urN iptables-1.3.8/extensions/libipt_ACCOUNT.c iptables/extensions/libipt_ACCOUNT.c
--- iptables-1.3.8/extensions/libipt_ACCOUNT.c 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_ACCOUNT.c 2006-10-26 12:17:57.000000000 +0200
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,171 @@
+/* Shared library add-on to iptables to add ACCOUNT(ing) support.
+ Author: Intra2net AG <opensource at intra2net.com>
+*/
@@ -101,14 +101,11 @@
+
+/* Initialize the target. */
+static void
-+init(struct ipt_entry_target *t, unsigned int *nfcache)
++init(struct xt_entry_target *t)
+{
+ struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)t->data;
+
+ accountinfo->table_nr = -1;
-+
-+ /* Can't cache this */
-+ *nfcache |= NFC_UNKNOWN;
+}
+
+#define IPT_ACCOUNT_OPT_ADDR 0x01
@@ -118,8 +115,8 @@
+ 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)
++ const void *entry,
++ struct xt_entry_target **target)
+{
+ struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)(*target)->data;
+ struct in_addr *addrs = NULL, mask;
@@ -208,8 +205,8 @@
+
+/* Prints out the targinfo. */
+static void
-+print(const struct ipt_ip *ip,
-+ const struct ipt_entry_target *target,
++print(const void *ip,
++ const struct xt_entry_target *target,
+ int numeric)
+{
+ print_it (ip, target, 0);
@@ -217,7 +214,7 @@
+
+/* Saves the union ipt_targinfo in parsable form to stdout. */
+static void
-+save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
++save(const void *ip, const struct xt_entry_target *target)
+{
+ print_it(ip, target, 1);
+}
@@ -294,7 +291,7 @@
+
+/* Initialize the target. */
+static void
-+init(struct ipt_entry_target *t, unsigned int *nfcache)
++init(struct xt_entry_target *t)
+{
+ struct ipt_ipmark_target_info *ipmarkinfo =
+ (struct ipt_ipmark_target_info *)t->data;
@@ -308,8 +305,8 @@
+ 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)
++ const void *entry,
++ struct xt_entry_target **target)
+{
+ struct ipt_ipmark_target_info *ipmarkinfo
+ = (struct ipt_ipmark_target_info *)(*target)->data;
@@ -365,8 +362,8 @@
+
+/* Prints out the targinfo. */
+static void
-+print(const struct ipt_ip *ip,
-+ const struct ipt_entry_target *target,
++print(const void *ip,
++ const struct xt_entry_target *target,
+ int numeric)
+{
+ const struct ipt_ipmark_target_info *ipmarkinfo =
@@ -381,7 +378,7 @@
+
+/* Saves the union ipt_targinfo in parsable form to stdout. */
+static void
-+save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
++save(const void *ip, const struct xt_entry_target *target)
+{
+ const struct ipt_ipmark_target_info *ipmarkinfo =
+ (const struct ipt_ipmark_target_info *)target->data;
@@ -497,8 +494,8 @@
+ 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)
++ const void *entry,
++ struct xt_entry_target **target)
+{
+ return 0;
+}
@@ -510,8 +507,8 @@
+
+/* Prints out the targinfo. */
+static void
-+print(const struct ipt_ip *ip,
-+ const struct ipt_entry_target *target,
++print(const void *ip,
++ const struct xt_entry_target *target,
+ int numeric)
+{
+ /* nothing to print, we don't take option... */
@@ -519,7 +516,7 @@
+
+/* Saves the stuff in parsable form to stdout. */
+static void
-+save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
++save(const void *ip, const struct xt_entry_target *target)
+{
+ /* nothing to print, we don't take option... */
+}
@@ -574,8 +571,8 @@
+
+static int
+parse(int c, char **argv, int invert, unsigned int *flags,
-+ const struct ipt_entry *entry,
-+ struct ipt_entry_target **target)
++ const void *entry,
++ struct xt_entry_target **target)
+{
+ return 0;
+}
@@ -585,13 +582,13 @@
+}
+
+static void
-+print(const struct ipt_ip *ip,
-+ const struct ipt_entry_target *target,
++print(const void *ip,
++ const struct xt_entry_target *target,
+ int numeric)
+{
+}
+
-+static void save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
++static void save(const void *ip, const struct xt_entry_target *target)
+{
+}
+
@@ -1594,7 +1591,7 @@
diff -urN iptables-1.3.8/extensions/libipt_ipv4options.c iptables/extensions/libipt_ipv4options.c
--- iptables-1.3.8/extensions/libipt_ipv4options.c 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_ipv4options.c 2006-12-12 11:34:45.000000000 +0100
-@@ -0,0 +1,311 @@
+@@ -0,0 +1,310 @@
+/* Shared library add-on to iptables to add ipv4 options matching support. */
+#include <stdio.h>
+#include <netdb.h>
@@ -1636,9 +1633,8 @@
+ 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 void *entry,
++ struct xt_entry_match **match)
+{
+ struct ipt_ipv4options_info *info = (struct ipt_ipv4options_info *)(*match)->data;
+
@@ -1823,8 +1819,8 @@
+
+/* Prints out the matchinfo. */
+static void
-+print(const struct ipt_ip *ip,
-+ const struct ipt_entry_match *match,
++print(const void *ip,
++ const struct xt_entry_match *match,
+ int numeric)
+{
+ struct ipt_ipv4options_info *info = ((struct ipt_ipv4options_info *)match->data);
@@ -1858,7 +1854,7 @@
+
+/* Saves the data in parsable form to stdout. */
+static void
-+save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
++save(const void *ip, const struct xt_entry_match *match)
+{
+ struct ipt_ipv4options_info *info = ((struct ipt_ipv4options_info *)match->data);
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-20070806.patch?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list