SOURCES: iptables-20070806.patch - some modules updated for iptabl...
zbyniu
zbyniu at pld-linux.org
Sat Feb 2 20:05:08 CET 2008
Author: zbyniu Date: Sat Feb 2 19:05:08 2008 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- some modules updated for iptables 1.4.0
---- Files affected:
SOURCES:
iptables-20070806.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/iptables-20070806.patch
diff -u SOURCES/iptables-20070806.patch:1.3 SOURCES/iptables-20070806.patch:1.4
--- SOURCES/iptables-20070806.patch:1.3 Tue Jan 29 08:30:18 2008
+++ SOURCES/iptables-20070806.patch Sat Feb 2 20:05:03 2008
@@ -654,7 +654,7 @@
diff -urN iptables-1.3.8/extensions/libipt_connlimit.c iptables/extensions/libipt_connlimit.c
--- iptables-1.3.8/extensions/libipt_connlimit.c 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_connlimit.c 2006-12-04 12:15:19.000000000 +0100
-@@ -0,0 +1,132 @@
+@@ -0,0 +1,131 @@
+/* Shared library add-on to iptables to add connection limit support. */
+#include <stdio.h>
+#include <netdb.h>
@@ -687,9 +687,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_connlimit_info *info = (struct ipt_connlimit_info*)(*match)->data;
+ int i;
@@ -751,8 +750,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_connlimit_info *info = (struct ipt_connlimit_info*)match->data;
@@ -762,7 +761,7 @@
+}
+
+/* Saves the matchinfo in parsable form to stdout. */
-+static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
++static void save(const void *ip, const struct xt_entry_match *match)
+{
+ struct ipt_connlimit_info *info = (struct ipt_connlimit_info*)match->data;
+
@@ -790,7 +789,7 @@
diff -urN iptables-1.3.8/extensions/libipt_geoip.c iptables/extensions/libipt_geoip.c
--- iptables-1.3.8/extensions/libipt_geoip.c 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_geoip.c 2006-12-05 04:36:39.000000000 +0100
-@@ -0,0 +1,338 @@
+@@ -0,0 +1,335 @@
+/* Shared library add-on to iptables to add geoip match support.
+
+ * This program is free software; you can redistribute it and/or modify
@@ -845,7 +844,7 @@
+};
+
+static void
-+init(struct ipt_entry_match *m, unsigned int *nfcache)
++init(struct xt_entry_match *m)
+{
+}
+
@@ -1014,9 +1013,8 @@
+
+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_geoip_info *info
+ = (struct ipt_geoip_info *)(*match)->data;
@@ -1029,7 +1027,6 @@
+ "geoip match: only use --source-country *OR* --destination-country once!");
+
+ *flags |= IPT_GEOIP_SRC;
-+ *nfcache |= NFC_IP_SRC;
+ break;
+
+ case '2':
@@ -1039,7 +1036,6 @@
+ "geoip match: only use --source-country *OR* --destination-country once!");
+
+ *flags |= IPT_GEOIP_DST;
-+ *nfcache |= NFC_IP_DST;
+ break;
+
+ default:
@@ -1066,8 +1062,8 @@
+}
+
+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)
+{
+ const struct ipt_geoip_info *info
@@ -1092,8 +1088,8 @@
+}
+
+static void
-+save(const struct ipt_ip *ip,
-+ const struct ipt_entry_match *match)
++save(const void *ip,
++ const struct xt_entry_match *match)
+{
+ const struct ipt_geoip_info *info
+ = (const struct ipt_geoip_info *)match->data;
@@ -1151,8 +1147,7 @@
diff -urN iptables-1.3.8/extensions/libipt_ipp2p.c iptables/extensions/libipt_ipp2p.c
--- iptables-1.3.8/extensions/libipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_ipp2p.c 2006-03-29 10:59:21.000000000 +0200
-@@ -0,0 +1,401 @@
-+
+@@ -0,0 +1,396 @@
+#include <stdio.h>
+#include <netdb.h>
+#include <string.h>
@@ -1218,12 +1213,10 @@
+
+
+static void
-+init(struct ipt_entry_match *m, unsigned int *nfcache)
++init(struct xt_entry_match *m)
+{
+ struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data;
+
-+ *nfcache |= NFC_UNKNOWN;
-+
+ /*init the module with default values*/
+ info->cmd = 0;
+ info->debug = 0;
@@ -1233,9 +1226,8 @@
+
+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_p2p_info *info = (struct ipt_p2p_info *)(*match)->data;
+
@@ -1469,8 +1461,8 @@
+
+
+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_p2p_info *info = (struct ipt_p2p_info *)match->data;
@@ -1501,7 +1493,7 @@
+
+
+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_p2p_info *info = (struct ipt_p2p_info *)match->data;
+
@@ -1552,7 +1544,6 @@
+{
+ register_match(&ipp2p);
+}
-+
diff -urN iptables-1.3.8/extensions/libipt_ipp2p.man iptables/extensions/libipt_ipp2p.man
--- iptables-1.3.8/extensions/libipt_ipp2p.man 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_ipp2p.man 2005-02-01 11:09:48.000000000 +0100
@@ -2527,7 +2518,7 @@
diff -urN iptables-1.3.8/extensions/libipt_u32.c iptables/extensions/libipt_u32.c
--- iptables-1.3.8/extensions/libipt_u32.c 1970-01-01 01:00:00.000000000 +0100
+++ iptables/extensions/libipt_u32.c 2006-12-12 11:34:45.000000000 +0100
-@@ -0,0 +1,264 @@
+@@ -0,0 +1,263 @@
+/* Shared library add-on to iptables to add u32 matching,
+ * generalized matching on values found at packet offsets
+ *
@@ -2622,9 +2613,8 @@
+/* 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 void *entry,
++ struct xt_entry_match **match)
+{
+ struct ipt_u32 *data = (struct ipt_u32 *)(*match)->data;
+ char *arg = argv[optind-1]; /* the argument string */
@@ -2758,8 +2748,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)
+{
+ printf("u32 ");
@@ -2767,7 +2757,7 @@
+}
+
+/* Saves the union ipt_matchinfo in parsable form to stdout. */
-+static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
++static void save(const void *ip, const struct xt_entry_match *match)
+{
+ printf("--u32 ");
+ print_u32((struct ipt_u32 *)match->data);
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-20070806.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list