Aligning matchsize and targetsize now responsibility of extension writers

(PPC fix).

24 files changed, 51 insertions, 51 deletions

diff --git a/extensions/libip6t_icmp.c b/extensions/libip6t_icmp.c
index d8641129..8025175a 100644
--- a/extensions/libip6t_icmp.c
+++ b/extensions/libip6t_icmp.c
@@ -264,8 +264,8 @@ struct ip6tables_match icmp
 = { NULL,
     "icmp",
     NETFILTER_VERSION,
-    sizeof(struct ip6t_icmp),
-    sizeof(struct ip6t_icmp),
+    IP6T_ALIGN(sizeof(struct ip6t_icmp)),
+    IP6T_ALIGN(sizeof(struct ip6t_icmp)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libip6t_standard.c b/extensions/libip6t_standard.c
index 589b9058..1ffb1d7a 100644
--- a/extensions/libip6t_standard.c
+++ b/extensions/libip6t_standard.c
@@ -51,8 +51,8 @@ struct ip6tables_target standard
 = { NULL,
     "standard",
     NETFILTER_VERSION,
-    sizeof(int),
-    sizeof(int),
+    IP6T_ALIGN(sizeof(int)),
+    IP6T_ALIGN(sizeof(int)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libip6t_tcp.c b/extensions/libip6t_tcp.c
index 1cbba9a2..28e7bdf6 100644
--- a/extensions/libip6t_tcp.c
+++ b/extensions/libip6t_tcp.c
@@ -425,8 +425,8 @@ struct ip6tables_match tcp
 = { NULL,
     "tcp",
     NETFILTER_VERSION,
-    sizeof(struct ip6t_tcp),
-    sizeof(struct ip6t_tcp),
+    IP6T_ALIGN(sizeof(struct ip6t_tcp)),
+    IP6T_ALIGN(sizeof(struct ip6t_tcp)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libip6t_udp.c b/extensions/libip6t_udp.c
index f2c0b6ad..7fe16dd7 100644
--- a/extensions/libip6t_udp.c
+++ b/extensions/libip6t_udp.c
@@ -235,8 +235,8 @@ struct ip6tables_match udp
 = { NULL,
     "udp",
     NETFILTER_VERSION,
-    sizeof(struct ip6t_udp),
-    sizeof(struct ip6t_udp),
+    IP6T_ALIGN(sizeof(struct ip6t_udp)),
+    IP6T_ALIGN(sizeof(struct ip6t_udp)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c
index af08cc0a..8ae9a62b 100644
--- a/extensions/libipt_DNAT.c
+++ b/extensions/libipt_DNAT.c
@@ -228,8 +228,8 @@ struct iptables_target dnat
 = { NULL,
     "DNAT",
     NETFILTER_VERSION,
-    sizeof(struct ip_nat_multi_range),
-    sizeof(struct ip_nat_multi_range),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c
index d634cd55..f098df2f 100644
--- a/extensions/libipt_LOG.c
+++ b/extensions/libipt_LOG.c
@@ -244,8 +244,8 @@ struct iptables_target log
 = { NULL,
     "LOG",
     NETFILTER_VERSION,
-    sizeof(struct ipt_log_info),
-    sizeof(struct ipt_log_info),
+    IPT_ALIGN(sizeof(struct ipt_log_info)),
+    IPT_ALIGN(sizeof(struct ipt_log_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_MARK.c b/extensions/libipt_MARK.c
index b8afe550..ef7d7331 100644
--- a/extensions/libipt_MARK.c
+++ b/extensions/libipt_MARK.c
@@ -104,8 +104,8 @@ struct iptables_target mark
 = { NULL,
     "MARK",
     NETFILTER_VERSION,
-    sizeof(struct ipt_mark_target_info),
-    sizeof(struct ipt_mark_target_info),
+    IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
+    IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c
index 902f06f3..2159016d 100644
--- a/extensions/libipt_MASQUERADE.c
+++ b/extensions/libipt_MASQUERADE.c
@@ -150,8 +150,8 @@ struct iptables_target masq
 = { NULL,
     "MASQUERADE",
     NETFILTER_VERSION,
-    sizeof(struct ip_nat_multi_range),
-    sizeof(struct ip_nat_multi_range),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c
index dd702430..d729cefe 100644
--- a/extensions/libipt_REDIRECT.c
+++ b/extensions/libipt_REDIRECT.c
@@ -151,8 +151,8 @@ struct iptables_target redir
 = { NULL,
     "REDIRECT",
     NETFILTER_VERSION,
-    sizeof(struct ip_nat_multi_range),
-    sizeof(struct ip_nat_multi_range),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c
index e13d4b1e..5f723f7c 100644
--- a/extensions/libipt_REJECT.c
+++ b/extensions/libipt_REJECT.c
@@ -147,8 +147,8 @@ struct iptables_target reject
 = { NULL,
     "REJECT",
     NETFILTER_VERSION,
-    sizeof(struct ipt_reject_info),
-    sizeof(struct ipt_reject_info),
+    IPT_ALIGN(sizeof(struct ipt_reject_info)),
+    IPT_ALIGN(sizeof(struct ipt_reject_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c
index e1d27523..83f4ce9e 100644
--- a/extensions/libipt_SNAT.c
+++ b/extensions/libipt_SNAT.c
@@ -228,8 +228,8 @@ struct iptables_target snat
 = { NULL,
     "SNAT",
     NETFILTER_VERSION,
-    sizeof(struct ip_nat_multi_range),
-    sizeof(struct ip_nat_multi_range),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+    IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c
index ed599005..0c91cb54 100644
--- a/extensions/libipt_TOS.c
+++ b/extensions/libipt_TOS.c
@@ -157,8 +157,8 @@ struct iptables_target tos
 = { NULL,
     "TOS",
     NETFILTER_VERSION,
-    sizeof(struct ipt_tos_target_info),
-    sizeof(struct ipt_tos_target_info),
+    IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
+    IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
index 0a47e412..63905181 100644
--- a/extensions/libipt_icmp.c
+++ b/extensions/libipt_icmp.c
@@ -279,8 +279,8 @@ struct iptables_match icmp
 = { NULL,
     "icmp",
     NETFILTER_VERSION,
-    sizeof(struct ipt_icmp),
-    sizeof(struct ipt_icmp),
+    IPT_ALIGN(sizeof(struct ipt_icmp)),
+    IPT_ALIGN(sizeof(struct ipt_icmp)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_limit.c b/extensions/libipt_limit.c
index e7dda7bc..58c2ebd0 100644
--- a/extensions/libipt_limit.c
+++ b/extensions/libipt_limit.c
@@ -181,7 +181,7 @@ struct iptables_match limit
 = { NULL,
     "limit",
     NETFILTER_VERSION,
-    sizeof(struct ipt_rateinfo),
+    IPT_ALIGN(sizeof(struct ipt_rateinfo)),
     offsetof(struct ipt_rateinfo, prev),
     &help,
     &init,
diff --git a/extensions/libipt_mac.c b/extensions/libipt_mac.c
index f740ecc5..6d61d605 100644
--- a/extensions/libipt_mac.c
+++ b/extensions/libipt_mac.c
@@ -128,8 +128,8 @@ struct iptables_match mac
 = { NULL,
     "mac",
     NETFILTER_VERSION,
-    sizeof(struct ipt_mac_info),
-    sizeof(struct ipt_mac_info),
+    IPT_ALIGN(sizeof(struct ipt_mac_info)),
+    IPT_ALIGN(sizeof(struct ipt_mac_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_mark.c b/extensions/libipt_mark.c
index 2cd6193b..aced5475 100644
--- a/extensions/libipt_mark.c
+++ b/extensions/libipt_mark.c
@@ -112,8 +112,8 @@ struct iptables_match mark
 = { NULL,
     "mark",
     NETFILTER_VERSION,
-    sizeof(struct ipt_mark_info),
-    sizeof(struct ipt_mark_info),
+    IPT_ALIGN(sizeof(struct ipt_mark_info)),
+    IPT_ALIGN(sizeof(struct ipt_mark_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_multiport.c b/extensions/libipt_multiport.c
index 8c58bddd..bac4621f 100644
--- a/extensions/libipt_multiport.c
+++ b/extensions/libipt_multiport.c
@@ -245,8 +245,8 @@ struct iptables_match multiport
 = { NULL,
     "multiport",
     NETFILTER_VERSION,
-    sizeof(struct ipt_multiport),
-    sizeof(struct ipt_multiport),
+    IPT_ALIGN(sizeof(struct ipt_multiport)),
+    IPT_ALIGN(sizeof(struct ipt_multiport)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c
index 027f5383..233cd0be 100644
--- a/extensions/libipt_owner.c
+++ b/extensions/libipt_owner.c
@@ -203,8 +203,8 @@ struct iptables_match owner
 = { NULL,
     "owner",
     NETFILTER_VERSION,
-    sizeof(struct ipt_owner_info),
-    sizeof(struct ipt_owner_info),
+    IPT_ALIGN(sizeof(struct ipt_owner_info)),
+    IPT_ALIGN(sizeof(struct ipt_owner_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_standard.c b/extensions/libipt_standard.c
index c63669f0..22db24ba 100644
--- a/extensions/libipt_standard.c
+++ b/extensions/libipt_standard.c
@@ -51,8 +51,8 @@ struct iptables_target standard
 = { NULL,
     "standard",
     NETFILTER_VERSION,
-    sizeof(int),
-    sizeof(int),
+    IPT_ALIGN(sizeof(int)),
+    IPT_ALIGN(sizeof(int)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_state.c b/extensions/libipt_state.c
index d3dcbc2d..d21ccf16 100644
--- a/extensions/libipt_state.c
+++ b/extensions/libipt_state.c
@@ -146,8 +146,8 @@ struct iptables_match state
 = { NULL,
     "state",
     NETFILTER_VERSION,
-    sizeof(struct ipt_state_info),
-    sizeof(struct ipt_state_info),
+    IPT_ALIGN(sizeof(struct ipt_state_info)),
+    IPT_ALIGN(sizeof(struct ipt_state_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_tcp.c b/extensions/libipt_tcp.c
index 276d0e2a..47336f6c 100644
--- a/extensions/libipt_tcp.c
+++ b/extensions/libipt_tcp.c
@@ -374,7 +374,7 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 	const struct ipt_tcp *tcpinfo = (struct ipt_tcp *)match->data;
 
 	if (tcpinfo->spts[0] != 0
-	    && tcpinfo->spts[1] != 0xFFFF) {
+	    || tcpinfo->spts[1] != 0xFFFF) {
 		if (tcpinfo->invflags & IPT_TCP_INV_SRCPT)
 			printf("! ");
 		if (tcpinfo->spts[0]
@@ -388,7 +388,7 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 	}
 
 	if (tcpinfo->dpts[0] != 0
-	    && tcpinfo->dpts[1] != 0xFFFF) {
+	    || tcpinfo->dpts[1] != 0xFFFF) {
 		if (tcpinfo->invflags & IPT_TCP_INV_DSTPT)
 			printf("! ");
 		if (tcpinfo->dpts[0]
@@ -425,8 +425,8 @@ struct iptables_match tcp
 = { NULL,
     "tcp",
     NETFILTER_VERSION,
-    sizeof(struct ipt_tcp),
-    sizeof(struct ipt_tcp),
+    IPT_ALIGN(sizeof(struct ipt_tcp)),
+    IPT_ALIGN(sizeof(struct ipt_tcp)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c
index 99c89ea7..ec83e18d 100644
--- a/extensions/libipt_tos.c
+++ b/extensions/libipt_tos.c
@@ -155,8 +155,8 @@ struct iptables_match tos
 = { NULL,
     "tos",
     NETFILTER_VERSION,
-    sizeof(struct ipt_tos_info),
-    sizeof(struct ipt_tos_info),
+    IPT_ALIGN(sizeof(struct ipt_tos_info)),
+    IPT_ALIGN(sizeof(struct ipt_tos_info)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_udp.c b/extensions/libipt_udp.c
index 507937b1..06c61c51 100644
--- a/extensions/libipt_udp.c
+++ b/extensions/libipt_udp.c
@@ -203,7 +203,7 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 	const struct ipt_udp *udpinfo = (struct ipt_udp *)match->data;
 
 	if (udpinfo->spts[0] != 0
-	    && udpinfo->spts[1] != 0xFFFF) {
+	    || udpinfo->spts[1] != 0xFFFF) {
 		if (udpinfo->invflags & IPT_UDP_INV_SRCPT)
 			printf("! ");
 		if (udpinfo->spts[0]
@@ -217,7 +217,7 @@ static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
 	}
 
 	if (udpinfo->dpts[0] != 0
-	    && udpinfo->dpts[1] != 0xFFFF) {
+	    || udpinfo->dpts[1] != 0xFFFF) {
 		if (udpinfo->invflags & IPT_UDP_INV_DSTPT)
 			printf("! ");
 		if (udpinfo->dpts[0]
@@ -235,8 +235,8 @@ struct iptables_match udp
 = { NULL,
     "udp",
     NETFILTER_VERSION,
-    sizeof(struct ipt_udp),
-    sizeof(struct ipt_udp),
+    IPT_ALIGN(sizeof(struct ipt_udp)),
+    IPT_ALIGN(sizeof(struct ipt_udp)),
     &help,
     &init,
     &parse,
diff --git a/extensions/libipt_unclean.c b/extensions/libipt_unclean.c
index bef513e6..c433bc7c 100644
--- a/extensions/libipt_unclean.c
+++ b/extensions/libipt_unclean.c
@@ -50,8 +50,8 @@ struct iptables_match unclean
 = { NULL,
     "unclean",
     NETFILTER_VERSION,
-    0,
-    0,
+    IPT_ALIGN(0),
+    IPT_ALIGN(0),
     &help,
     &init,
     &parse,