From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 20 Feb 2006 16:22:48 +0000 (+0000)
Subject: iptables-1.3.2-20050720
X-Git-Url: http://git.onelab.eu/?p=iptables.git;a=commitdiff_plain;h=98c90cbcc6f660e13f9e7878bbb80dfc9d03ceae

iptables-1.3.2-20050720
---

diff --git a/extensions/libipt_POOL.c b/extensions/libipt_POOL.c
index 931dcfd..95756bc 100644
--- a/extensions/libipt_POOL.c
+++ b/extensions/libipt_POOL.c
@@ -51,8 +51,6 @@ init(struct ipt_entry_target *target, unsigned int *nfcache)
 	ipi->src = ipi->dst = IP_POOL_NONE;
 	ipi->flags = 0;
 
-	/* Can't cache this */
-	*nfcache |= NFC_UNKNOWN;
 }
 
 /* Function which parses command options; returns true if it
@@ -133,20 +131,19 @@ save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
 	}
 }
 
-static
-struct iptables_target ipt_pool_target
-= { NULL,
-    "POOL",
-    IPTABLES_VERSION,
-    IPT_ALIGN(sizeof(struct ipt_pool_info)),
-    IPT_ALIGN(sizeof(struct ipt_pool_info)),
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts
+static struct iptables_target ipt_pool_target = { 
+	.next		= NULL,
+	.name		= "POOL",
+	.version	= IPTABLES_VERSION,
+	.size		= IPT_ALIGN(sizeof(struct ipt_pool_info)),
+	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_pool_info)),
+	.help		= &help,
+	.init		= &init,
+	.parse		= &parse,
+	.final_check	= &final_check,
+	.print		= &print,
+	.save		= &save,
+	.extra_opts	= opts
 };
 
 void _init(void)
diff --git a/extensions/libipt_pool.c b/extensions/libipt_pool.c
index 082d76c..0d64920 100644
--- a/extensions/libipt_pool.c
+++ b/extensions/libipt_pool.c
@@ -43,8 +43,6 @@ init(struct ipt_entry_match *match, unsigned int *nfcache)
 	info->src = IP_POOL_NONE;
 	info->dst = IP_POOL_NONE;
 	info->flags = 0;
-	/* Can't cache this - XXX */
-	*nfcache |= NFC_UNKNOWN;
 }
 
 /* Function which parses command options; returns true if it ate an option */
@@ -122,20 +120,19 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 			ip_pool_get_name(buf, sizeof(buf), info->dst, 0));
 }
 
-static
-struct iptables_match pool
-= { NULL,
-    "pool",
-    IPTABLES_VERSION,
-    IPT_ALIGN(sizeof(struct ipt_pool_info)),
-    IPT_ALIGN(sizeof(struct ipt_pool_info)),
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts
+static struct iptables_match pool = { 
+	.next		= NULL,
+	.name		= "pool",
+	.version	= IPTABLES_VERSION,
+	.size		= IPT_ALIGN(sizeof(struct ipt_pool_info)),
+	.userspacesize	= IPT_ALIGN(sizeof(struct ipt_pool_info)),
+	.help		= &help,
+	.init		= &init,
+	.parse		= &parse,
+	.final_check	= &final_check,
+	.print		= &print,
+	.save		= &save,
+	.extra_opts	= opts
 };
 
 void _init(void)