18 files changed, 27 insertions, 7 deletions

diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index e3c37222..6251cf1c 100644
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -229,6 +229,7 @@ struct iptables_target dnat
     "DNAT",
     NETFILTER_VERSION,
     sizeof(struct ip_nat_multi_range),
+    sizeof(struct ip_nat_multi_range),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index ce4adb23..d634cd55 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -245,6 +245,7 @@ struct iptables_target log
     "LOG",
     NETFILTER_VERSION,
     sizeof(struct ipt_log_info),
+    sizeof(struct ipt_log_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_MARK.c b/extensions/libipt_MARK.c
index a7cb60c0..b8afe550 100644
--- a/extensions/libipt_MARK.c
+++ b/extensions/libipt_MARK.c
@@ -105,6 +105,7 @@ struct iptables_target mark
     "MARK",
     NETFILTER_VERSION,
     sizeof(struct ipt_mark_target_info),
+    sizeof(struct ipt_mark_target_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index 3f5c128a..2c0b85b7 100644
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -142,6 +142,7 @@ struct iptables_target reject
     "REJECT",
     NETFILTER_VERSION,
     sizeof(struct ipt_reject_info),
+    sizeof(struct ipt_reject_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c
index 86ba39b9..f769cd4e 100644
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -229,6 +229,7 @@ struct iptables_target snat
     "SNAT",
     NETFILTER_VERSION,
     sizeof(struct ip_nat_multi_range),
+    sizeof(struct ip_nat_multi_range),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index f01fc264..ed599005 100644
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -158,6 +158,7 @@ struct iptables_target tos
     "TOS",
     NETFILTER_VERSION,
     sizeof(struct ipt_tos_target_info),
+    sizeof(struct ipt_tos_target_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 65857ce3..0a47e412 100644
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -280,6 +280,7 @@ struct iptables_match icmp
     "icmp",
     NETFILTER_VERSION,
     sizeof(struct ipt_icmp),
+    sizeof(struct ipt_icmp),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_limit.c b/extensions/libipt_limit.c
index b6cc74f2..822109bf 100644
--- a/extensions/libipt_limit.c
+++ b/extensions/libipt_limit.c
@@ -181,6 +181,7 @@ struct iptables_match limit
     "limit",
     NETFILTER_VERSION,
     sizeof(struct ipt_rateinfo),
+    offsetof(struct ipt_rateinfo, prev),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_mac.c b/extensions/libipt_mac.c
index 36d89692..f740ecc5 100644
--- a/extensions/libipt_mac.c
+++ b/extensions/libipt_mac.c
@@ -129,6 +129,7 @@ struct iptables_match mac
     "mac",
     NETFILTER_VERSION,
     sizeof(struct ipt_mac_info),
+    sizeof(struct ipt_mac_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_mark.c b/extensions/libipt_mark.c
index dcf54488..2cd6193b 100644
--- a/extensions/libipt_mark.c
+++ b/extensions/libipt_mark.c
@@ -113,6 +113,7 @@ struct iptables_match mark
     "mark",
     NETFILTER_VERSION,
     sizeof(struct ipt_mark_info),
+    sizeof(struct ipt_mark_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_multiport.c b/extensions/libipt_multiport.c
index 727f95fc..8c58bddd 100644
--- a/extensions/libipt_multiport.c
+++ b/extensions/libipt_multiport.c
@@ -246,6 +246,7 @@ struct iptables_match multiport
     "multiport",
     NETFILTER_VERSION,
     sizeof(struct ipt_multiport),
+    sizeof(struct ipt_multiport),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index 29311022..027f5383 100644
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -204,6 +204,7 @@ struct iptables_match owner
     "owner",
     NETFILTER_VERSION,
     sizeof(struct ipt_owner_info),
+    sizeof(struct ipt_owner_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_standard.c b/extensions/libipt_standard.c
index 9a746b2d..c63669f0 100644
--- a/extensions/libipt_standard.c
+++ b/extensions/libipt_standard.c
@@ -52,6 +52,7 @@ struct iptables_target standard
     "standard",
     NETFILTER_VERSION,
     sizeof(int),
+    sizeof(int),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_state.c b/extensions/libipt_state.c
index 19751d72..d3dcbc2d 100644
--- a/extensions/libipt_state.c
+++ b/extensions/libipt_state.c
@@ -147,6 +147,7 @@ struct iptables_match state
     "state",
     NETFILTER_VERSION,
     sizeof(struct ipt_state_info),
+    sizeof(struct ipt_state_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_tcp.c b/extensions/libipt_tcp.c
index 2febc28c..276d0e2a 100644
--- a/extensions/libipt_tcp.c
+++ b/extensions/libipt_tcp.c
@@ -308,21 +308,23 @@ print_option(u_int8_t option, int invert, int numeric)
 static void
 print_tcpf(u_int8_t flags)
 {
-	int sole_flag = 1;
+	int have_flag = 0;
 
-	do {
+	while (flags) {
 		unsigned int i;
 
-		/* Terminates because last flag is 0 */
-		for (i = 0; !(flags & tcp_flag_names[i].flag); i++);
+		for (i = 0; (flags & tcp_flag_names[i].flag) == 0; i++);
 
-		if (!sole_flag)
+		if (have_flag)
 			printf(",");
 		printf("%s", tcp_flag_names[i].name);
-		sole_flag = 0;
+		have_flag = 1;
 
 		flags &= ~tcp_flag_names[i].flag;
-	} while (flags);
+	}
+
+	if (!have_flag)
+		printf("NONE");
 }
 
 static void
@@ -424,6 +426,7 @@ struct iptables_match tcp
     "tcp",
     NETFILTER_VERSION,
     sizeof(struct ipt_tcp),
+    sizeof(struct ipt_tcp),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index 6d2d7724..99c89ea7 100644
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -156,6 +156,7 @@ struct iptables_match tos
     "tos",
     NETFILTER_VERSION,
     sizeof(struct ipt_tos_info),
+    sizeof(struct ipt_tos_info),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_udp.c b/extensions/libipt_udp.c
index 603a4860..507937b1 100644
--- a/extensions/libipt_udp.c
+++ b/extensions/libipt_udp.c
@@ -236,6 +236,7 @@ struct iptables_match udp
     "udp",
     NETFILTER_VERSION,
     sizeof(struct ipt_udp),
+    sizeof(struct ipt_udp),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c
index 50f62bdc..bef513e6 100644
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
@@ -51,6 +51,7 @@ struct iptables_match unclean
     "unclean",
     NETFILTER_VERSION,
     0,
+    0,
     &help,
     &init,
     &parse,