[netfilter-cvslog] r3507 - trunk/iptables/extensions
rusty at netfilter.org
rusty at netfilter.org
Tue Dec 28 14:12:00 CET 2004
Author: rusty at netfilter.org
Date: 2004-12-28 14:11:59 +0100 (Tue, 28 Dec 2004)
New Revision: 3507
Modified:
trunk/iptables/extensions/libipt_BALANCE.c
trunk/iptables/extensions/libipt_CLASSIFY.c
trunk/iptables/extensions/libipt_CLUSTERIP.c
trunk/iptables/extensions/libipt_DNAT.c
trunk/iptables/extensions/libipt_DSCP.c
trunk/iptables/extensions/libipt_ECN.c
trunk/iptables/extensions/libipt_FTOS.c
trunk/iptables/extensions/libipt_IPMARK.c
trunk/iptables/extensions/libipt_IPV4OPTSSTRIP.c
trunk/iptables/extensions/libipt_MARK.c
trunk/iptables/extensions/libipt_MASQUERADE.c
trunk/iptables/extensions/libipt_MIRROR.c
trunk/iptables/extensions/libipt_NETLINK.c
trunk/iptables/extensions/libipt_NETMAP.c
trunk/iptables/extensions/libipt_POOL.c
trunk/iptables/extensions/libipt_REDIRECT.c
trunk/iptables/extensions/libipt_REJECT.c
trunk/iptables/extensions/libipt_ROUTE.c
trunk/iptables/extensions/libipt_SAME.c
trunk/iptables/extensions/libipt_SNAT.c
trunk/iptables/extensions/libipt_TARPIT.c
trunk/iptables/extensions/libipt_TCPMSS.c
trunk/iptables/extensions/libipt_TOS.c
trunk/iptables/extensions/libipt_TTL.c
trunk/iptables/extensions/libipt_ULOG.c
trunk/iptables/extensions/libipt_XOR.c
trunk/iptables/extensions/libipt_addrtype.c
trunk/iptables/extensions/libipt_ah.c
trunk/iptables/extensions/libipt_comment.c
trunk/iptables/extensions/libipt_condition.c
trunk/iptables/extensions/libipt_connbytes.c
trunk/iptables/extensions/libipt_connlimit.c
trunk/iptables/extensions/libipt_connrate.c
trunk/iptables/extensions/libipt_conntrack.c
trunk/iptables/extensions/libipt_dscp.c
trunk/iptables/extensions/libipt_dstlimit.c
trunk/iptables/extensions/libipt_esp.c
trunk/iptables/extensions/libipt_fuzzy.c
trunk/iptables/extensions/libipt_hashlimit.c
trunk/iptables/extensions/libipt_helper.c
trunk/iptables/extensions/libipt_icmp.c
trunk/iptables/extensions/libipt_iprange.c
trunk/iptables/extensions/libipt_ipv4options.c
trunk/iptables/extensions/libipt_length.c
trunk/iptables/extensions/libipt_limit.c
trunk/iptables/extensions/libipt_mac.c
trunk/iptables/extensions/libipt_mark.c
trunk/iptables/extensions/libipt_mport.c
trunk/iptables/extensions/libipt_multiport.c
trunk/iptables/extensions/libipt_nth.c
trunk/iptables/extensions/libipt_owner.c
trunk/iptables/extensions/libipt_physdev.c
trunk/iptables/extensions/libipt_pkttype.c
trunk/iptables/extensions/libipt_pool.c
trunk/iptables/extensions/libipt_psd.c
trunk/iptables/extensions/libipt_quota.c
trunk/iptables/extensions/libipt_random.c
trunk/iptables/extensions/libipt_realm.c
trunk/iptables/extensions/libipt_rpc.c
trunk/iptables/extensions/libipt_standard.c
trunk/iptables/extensions/libipt_state.c
trunk/iptables/extensions/libipt_tcp.c
trunk/iptables/extensions/libipt_tcpmss.c
trunk/iptables/extensions/libipt_time.c
trunk/iptables/extensions/libipt_tos.c
trunk/iptables/extensions/libipt_ttl.c
trunk/iptables/extensions/libipt_u32.c
trunk/iptables/extensions/libipt_udp.c
trunk/iptables/extensions/libipt_unclean.c
Log:
Pablo Neira: extensions conversion to C99 structure initialization
(I removed the revision stuff for the moment, but this needs to go in before the code moves too much --RR)
Modified: trunk/iptables/extensions/libipt_BALANCE.c
===================================================================
--- trunk/iptables/extensions/libipt_BALANCE.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_BALANCE.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -131,20 +131,19 @@
printf("-%s ", addr_to_dotted(&a));
}
-static
-struct iptables_target balance
-= { NULL,
- "BALANCE",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target balance = {
+ .next = NULL,
+ .name = "BALANCE",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_CLASSIFY.c
===================================================================
--- trunk/iptables/extensions/libipt_CLASSIFY.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_CLASSIFY.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -108,20 +108,19 @@
TC_H_MAJ(clinfo->priority)>>16, TC_H_MIN(clinfo->priority));
}
-static
-struct iptables_target classify
-= { NULL,
- "CLASSIFY",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_classify_target_info)),
- IPT_ALIGN(sizeof(struct ipt_classify_target_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target classify = {
+ .next = NULL,
+ .name = "CLASSIFY",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_classify_target_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_classify_target_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_CLUSTERIP.c
===================================================================
--- trunk/iptables/extensions/libipt_CLUSTERIP.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_CLUSTERIP.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -237,20 +237,19 @@
*/
}
-static
-struct iptables_target clusterip
-= { NULL,
- "CLUSTERIP",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_clusterip_tgt_info)),
- IPT_ALIGN(sizeof(struct ipt_clusterip_tgt_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target clusterip = {
+ .next = NULL,
+ .name = "CLUSTERIP",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_clusterip_tgt_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_clusterip_tgt_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_DNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_DNAT.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_DNAT.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -224,20 +224,19 @@
}
}
-static
-struct iptables_target dnat
-= { NULL,
- "DNAT",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target dnat = {
+ .next = NULL,
+ .name = "DNAT",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_DSCP.c
===================================================================
--- trunk/iptables/extensions/libipt_DSCP.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_DSCP.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -143,20 +143,19 @@
printf("--set-dscp 0x%02x ", dinfo->dscp);
}
-static
-struct iptables_target dscp
-= { NULL,
- "DSCP",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_DSCP_info)),
- IPT_ALIGN(sizeof(struct ipt_DSCP_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target dscp = {
+ .next = NULL,
+ .name = "DSCP",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_DSCP_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_DSCP_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_ECN.c
===================================================================
--- trunk/iptables/extensions/libipt_ECN.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_ECN.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -6,7 +6,7 @@
*
* libipt_ECN.c borrowed heavily from libipt_DSCP.c
*
- * $Id: libipt_ECN.c,v 1.11 2002/08/07 10:04:42 laforge Exp $
+ * $Id$
*/
#include <stdio.h>
#include <string.h>
@@ -164,19 +164,19 @@
}
static
-struct iptables_target ecn
-= { NULL,
- "ECN",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_ECN_info)),
- IPT_ALIGN(sizeof(struct ipt_ECN_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_target ecn = {
+ .next = NULL,
+ .name = "ECN",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_ECN_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_ECN_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_FTOS.c
===================================================================
--- trunk/iptables/extensions/libipt_FTOS.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_FTOS.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -112,20 +112,19 @@
printf("--set-ftos 0x%02x ", finfo->ftos);
}
-static
-struct iptables_target ftos
-= { NULL,
- "FTOS",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_FTOS_info)),
- IPT_ALIGN(sizeof(struct ipt_FTOS_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target ftos = {
+ .next = NULL,
+ .name = "FTOS",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_FTOS_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_FTOS_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_IPMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_IPMARK.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_IPMARK.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -148,20 +148,19 @@
printf("--or-mask 0x%lx ", ipmarkinfo->ormask);
}
-static
-struct iptables_target ipmark
-= { NULL,
- "IPMARK",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_ipmark_target_info)),
- IPT_ALIGN(sizeof(struct ipt_ipmark_target_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target ipmark = {
+ .next = NULL,
+ .name = "IPMARK",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_ipmark_target_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_ipmark_target_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_IPV4OPTSSTRIP.c
===================================================================
--- trunk/iptables/extensions/libipt_IPV4OPTSSTRIP.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_IPV4OPTSSTRIP.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -59,20 +59,19 @@
/* nothing to print, we don't take option... */
}
-static
-struct iptables_target IPV4OPTSSTRIP
-= { NULL,
- "IPV4OPTSSTRIP",
- IPTABLES_VERSION,
- IPT_ALIGN(0),
- IPT_ALIGN(0),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target IPV4OPTSSTRIP = {
+ .next = NULL,
+ .name = "IPV4OPTSSTRIP",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(0),
+ .userspacesize = IPT_ALIGN(0),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_MARK.c
===================================================================
--- trunk/iptables/extensions/libipt_MARK.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_MARK.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -110,19 +110,19 @@
}
static
-struct iptables_target mark
-= { NULL,
- "MARK",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
- IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_target mark = {
+ .next = NULL,
+ .name = "MARK",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_mark_target_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_MASQUERADE.c
===================================================================
--- trunk/iptables/extensions/libipt_MASQUERADE.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_MASQUERADE.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -146,20 +146,18 @@
}
}
-static
-struct iptables_target masq
-= { NULL,
- "MASQUERADE",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target masq = { NULL,
+ .name = "MASQUERADE",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_MIRROR.c
===================================================================
--- trunk/iptables/extensions/libipt_MIRROR.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_MIRROR.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -41,20 +41,19 @@
{
}
-static
-struct iptables_target mirror
-= { NULL,
- "MIRROR",
- IPTABLES_VERSION,
- IPT_ALIGN(0),
- IPT_ALIGN(0),
- &help,
- &init,
- &parse,
- &final_check,
- NULL, /* print */
- NULL, /* save */
- opts
+static struct iptables_target mirror = {
+ .next = NULL,
+ .name = "MIRROR",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(0),
+ .userspacesize = IPT_ALIGN(0),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = NULL,
+ .save = NULL,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_NETLINK.c
===================================================================
--- trunk/iptables/extensions/libipt_NETLINK.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_NETLINK.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -136,19 +136,19 @@
printf("nlsize %i ", nld->size);
}
-static
-struct iptables_target netlink = { NULL,
- "NETLINK",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_nldata)),
- IPT_ALIGN(sizeof(struct ipt_nldata)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target netlink = {
+ .next = NULL,
+ .name = "NETLINK",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_nldata)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_nldata)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_NETMAP.c
===================================================================
--- trunk/iptables/extensions/libipt_NETMAP.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_NETMAP.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -179,20 +179,19 @@
print(ip, target, 0);
}
-static
-struct iptables_target target_module
-= { NULL,
- MODULENAME,
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target target_module = {
+ .next = NULL,
+ .name = MODULENAME,
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_POOL.c
===================================================================
--- trunk/iptables/extensions/libipt_POOL.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_POOL.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -133,20 +133,19 @@
}
}
-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)
Modified: trunk/iptables/extensions/libipt_REDIRECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REDIRECT.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_REDIRECT.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -147,20 +147,19 @@
}
}
-static
-struct iptables_target redir
-= { NULL,
- "REDIRECT",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target redir = {
+ .next = NULL,
+ .name = "REDIRECT",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_REJECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REJECT.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_REJECT.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -170,20 +170,19 @@
printf("--reject-with %s ", reject_table[i].name);
}
-static
-struct iptables_target reject
-= { NULL,
- "REJECT",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_reject_info)),
- IPT_ALIGN(sizeof(struct ipt_reject_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target reject = {
+ .next = NULL,
+ .name = "REJECT",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_reject_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_reject_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_ROUTE.c
===================================================================
--- trunk/iptables/extensions/libipt_ROUTE.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_ROUTE.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -243,20 +243,19 @@
}
-static
-struct iptables_target route
-= { NULL,
- "ROUTE",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_route_target_info)),
- IPT_ALIGN(sizeof(struct ipt_route_target_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target route = {
+ .next = NULL,
+ .name = "ROUTE",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_route_target_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_route_target_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_SAME.c
===================================================================
--- trunk/iptables/extensions/libipt_SAME.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_SAME.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -189,20 +189,19 @@
printf("--nodst ");
}
-static
-struct iptables_target same
-= { NULL,
- "SAME",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_same_info)),
- IPT_ALIGN(sizeof(struct ipt_same_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target same = {
+ .next = NULL,
+ .name = "SAME",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_same_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_same_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_SNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_SNAT.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_SNAT.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -224,20 +224,19 @@
}
}
-static
-struct iptables_target snat
-= { NULL,
- "SNAT",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target snat = {
+ .next = NULL,
+ .name = "SNAT",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_TARPIT.c
===================================================================
--- trunk/iptables/extensions/libipt_TARPIT.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_TARPIT.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -45,20 +45,19 @@
{
}
-static
-struct iptables_target tarpit
-= { NULL,
- "TARPIT",
- IPTABLES_VERSION,
- IPT_ALIGN(0),
- IPT_ALIGN(0),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target tarpit = {
+ .next = NULL,
+ .name = "TARPIT",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(0),
+ .userspacesize = IPT_ALIGN(0),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_TCPMSS.c
===================================================================
--- trunk/iptables/extensions/libipt_TCPMSS.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_TCPMSS.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -113,20 +113,19 @@
printf("--set-mss %u ", mssinfo->mss);
}
-static
-struct iptables_target mss
-= { NULL,
- "TCPMSS",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
- IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target mss = {
+ .next = NULL,
+ .name = "TCPMSS",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_TOS.c
===================================================================
--- trunk/iptables/extensions/libipt_TOS.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_TOS.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -153,20 +153,19 @@
printf("--set-tos 0x%02x ", tosinfo->tos);
}
-static
-struct iptables_target tos
-= { NULL,
- "TOS",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
- IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target tos = {
+ .next = NULL,
+ .name = "TOS",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_tos_target_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_TTL.c
===================================================================
--- trunk/iptables/extensions/libipt_TTL.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_TTL.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -1,7 +1,7 @@
/* Shared library add-on to iptables for the TTL target
* (C) 2000 by Harald Welte <laforge at gnumonks.org>
*
- * $Id: libipt_TTL.c,v 1.6 2002/05/29 13:08:16 laforge Exp $
+ * $Id$
*
* This program is distributed under the terms of GNU GPL
*/
@@ -145,19 +145,19 @@
{ 0 }
};
-static
-struct iptables_target TTL = { NULL,
- "TTL",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_TTL_info)),
- IPT_ALIGN(sizeof(struct ipt_TTL_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target TTL = {
+ .next = NULL,
+ .name = "TTL",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_TTL_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_TTL_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_ULOG.c
===================================================================
--- trunk/iptables/extensions/libipt_ULOG.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_ULOG.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -208,19 +208,19 @@
#endif
}
-static
-struct iptables_target ulog = { NULL,
- "ULOG",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_ulog_info)),
- IPT_ALIGN(sizeof(struct ipt_ulog_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target ulog = {
+ .next = NULL,
+ .name = "ULOG",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_ulog_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_ulog_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_XOR.c
===================================================================
--- trunk/iptables/extensions/libipt_XOR.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_XOR.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -93,18 +93,19 @@
{ 0 }
};
-static struct iptables_target XOR = { NULL,
- "XOR",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_XOR_info)),
- IPT_ALIGN(sizeof(struct ipt_XOR_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_target XOR = {
+ .next = NULL,
+ .name = "XOR",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_XOR_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_XOR_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_addrtype.c
===================================================================
--- trunk/iptables/extensions/libipt_addrtype.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_addrtype.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -193,18 +193,18 @@
static
struct iptables_match addrtype = {
- NULL,
- "addrtype",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_addrtype_info)),
- IPT_ALIGN(sizeof(struct ipt_addrtype_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+ .next = NULL,
+ .name = "addrtype",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_addrtype_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_addrtype_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
Modified: trunk/iptables/extensions/libipt_ah.c
===================================================================
--- trunk/iptables/extensions/libipt_ah.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_ah.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -168,20 +168,19 @@
}
-static
-struct iptables_match ah
-= { NULL,
- "ah",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_ah)),
- IPT_ALIGN(sizeof(struct ipt_ah)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match ah = {
+ .next = NULL,
+ .name = "ah",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_ah)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_ah)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_comment.c
===================================================================
--- trunk/iptables/extensions/libipt_comment.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_comment.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -107,18 +107,18 @@
}
static struct iptables_match comment = {
- NULL,
- "comment",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_comment_info)),
- IPT_ALIGN(sizeof(struct ipt_comment_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+ .next = NULL,
+ .name = "comment",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_comment_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_comment_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_condition.c
===================================================================
--- trunk/iptables/extensions/libipt_condition.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_condition.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -94,17 +94,17 @@
static struct iptables_match condition = {
- .name = "condition",
- .version = IPTABLES_VERSION,
- .size = IPT_ALIGN(sizeof(struct condition_info)),
- .userspacesize = IPT_ALIGN(sizeof(struct condition_info)),
- .help = &help,
- .init = &init,
- .parse = &parse,
- .final_check = &final_check,
- .print = &print,
- .save = &save,
- .extra_opts = opts
+ .name = "condition",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct condition_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct condition_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
Modified: trunk/iptables/extensions/libipt_connbytes.c
===================================================================
--- trunk/iptables/extensions/libipt_connbytes.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_connbytes.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -192,20 +192,19 @@
print_direction(sinfo);
}
-static
-struct iptables_match state
-= { NULL,
- "connbytes",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_connbytes_info)),
- IPT_ALIGN(sizeof(struct ipt_connbytes_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match state = {
+ .next = NULL,
+ .name = "connbytes",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_connbytes_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_connbytes_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_connlimit.c
===================================================================
--- trunk/iptables/extensions/libipt_connlimit.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_connlimit.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -122,17 +122,17 @@
}
static struct iptables_match connlimit = {
- name: "connlimit",
- version: IPTABLES_VERSION,
- size: IPT_ALIGN(sizeof(struct ipt_connlimit_info)),
- userspacesize: offsetof(struct ipt_connlimit_info,data),
- help: help,
- init: init,
- parse: parse,
- final_check: final_check,
- print: print,
- save: save,
- extra_opts: opts
+ .name = "connlimit",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_connlimit_info)),
+ .userspacesize = offsetof(struct ipt_connlimit_info,data),
+ .help = help,
+ .init = init,
+ .parse = parse,
+ .final_check = final_check,
+ .print = print,
+ .save = save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_connrate.c
===================================================================
--- trunk/iptables/extensions/libipt_connrate.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_connrate.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -167,20 +167,19 @@
printf(" ");
}
-static
-struct iptables_match state
-= { NULL,
- "connrate",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_connrate_info)),
- IPT_ALIGN(sizeof(struct ipt_connrate_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match state = {
+ .next = NULL,
+ .name = "connrate",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_connrate_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_connrate_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_conntrack.c
===================================================================
--- trunk/iptables/extensions/libipt_conntrack.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_conntrack.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -531,20 +531,19 @@
matchinfo_print(ip, match, 1, "--");
}
-static
-struct iptables_match conntrack
-= { NULL,
- "conntrack",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_conntrack_info)),
- IPT_ALIGN(sizeof(struct ipt_conntrack_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match conntrack = {
+ .next = NULL,
+ .name = "conntrack",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_conntrack_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_conntrack_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_dscp.c
===================================================================
--- trunk/iptables/extensions/libipt_dscp.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_dscp.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -157,20 +157,19 @@
print_dscp(dinfo->dscp, dinfo->invert, 1);
}
-static
-struct iptables_match dscp
-= { NULL,
- "dscp",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_dscp_info)),
- IPT_ALIGN(sizeof(struct ipt_dscp_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match dscp = {
+ .next = NULL,
+ .name = "dscp",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_dscp_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_dscp_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_dstlimit.c
===================================================================
--- trunk/iptables/extensions/libipt_dstlimit.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_dstlimit.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -320,21 +320,20 @@
printf("--dstlimit-htable-expire %u ", r->cfg.expire);
}
-static
-struct iptables_match dstlimit
-= { NULL,
- "dstlimit",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_dstlimit_info)),
- IPT_ALIGN(sizeof(struct ipt_dstlimit_info)),
- //offsetof(struct ipt_dstlimit_info, prev),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match dstlimit = {
+ .next = NULL,
+ .name = "dstlimit",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_dstlimit_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_dstlimit_info)),
+ //offsetof(struct ipt_dstlimit_info, prev),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .opts_extra = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_esp.c
===================================================================
--- trunk/iptables/extensions/libipt_esp.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_esp.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -168,20 +168,19 @@
}
-static
-struct iptables_match esp
-= { NULL,
- "esp",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_esp)),
- IPT_ALIGN(sizeof(struct ipt_esp)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match esp = {
+ .next = NULL,
+ .name = "esp",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_esp)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_esp)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_fuzzy.c
===================================================================
--- trunk/iptables/extensions/libipt_fuzzy.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_fuzzy.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -138,19 +138,19 @@
}
-struct iptables_match fuzzy_match
-= { NULL,
- "fuzzy",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_fuzzy_info)),
- IPT_ALIGN(sizeof(struct ipt_fuzzy_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match fuzzy_match = {
+ .next = NULL,
+ .name = "fuzzy",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_fuzzy_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_fuzzy_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_hashlimit.c
===================================================================
--- trunk/iptables/extensions/libipt_hashlimit.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_hashlimit.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -347,21 +347,19 @@
printf("--hashlimit-htable-expire %u ", r->cfg.expire);
}
-static
-struct iptables_match hashlimit
-= { NULL,
- "hashlimit",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_hashlimit_info)),
- IPT_ALIGN(sizeof(struct ipt_hashlimit_info)),
- //offsetof(struct ipt_hashlimit_info, prev),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match hashlimit = { NULL,
+ .name = "hashlimit",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_hashlimit_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_hashlimit_info)),
+ //offsetof(struct ipt_hashlimit_info, prev),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_helper.c
===================================================================
--- trunk/iptables/extensions/libipt_helper.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_helper.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -87,20 +87,19 @@
printf("%s--helper \"%s\" ",info->invert ? "! " : "", info->name);
}
-static
-struct iptables_match helper
-= { NULL,
- "helper",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_helper_info)),
- IPT_ALIGN(sizeof(struct ipt_helper_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match helper = {
+ .next = NULL,
+ .name = "helper",
+ .version = IPTABLES_VERSION,
+ .release = IPT_ALIGN(sizeof(struct ipt_helper_info)),
+ .size = IPT_ALIGN(sizeof(struct ipt_helper_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_icmp.c
===================================================================
--- trunk/iptables/extensions/libipt_icmp.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_icmp.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -287,20 +287,19 @@
{
}
-static
-struct iptables_match icmp
-= { NULL,
- "icmp",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_icmp)),
- IPT_ALIGN(sizeof(struct ipt_icmp)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match icmp = {
+ .next = NULL,
+ .name = "icmp",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_icmp)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_icmp)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_iprange.c
===================================================================
--- trunk/iptables/extensions/libipt_iprange.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_iprange.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -173,20 +173,19 @@
}
}
-static
-struct iptables_match iprange
-= { NULL,
- "iprange",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_iprange_info)),
- IPT_ALIGN(sizeof(struct ipt_iprange_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match iprange = {
+ .next = NULL,
+ .name = "iprange",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_iprange_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_iprange_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_ipv4options.c
===================================================================
--- trunk/iptables/extensions/libipt_ipv4options.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_ipv4options.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -299,20 +299,19 @@
printf(" ");
}
-static
-struct iptables_match ipv4options_struct
-= { NULL,
- "ipv4options",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_ipv4options_info)),
- IPT_ALIGN(sizeof(struct ipt_ipv4options_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match ipv4options_struct = {
+ .next = NULL,
+ .name = "ipv4options",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_ipv4options_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_ipv4options_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_length.c
===================================================================
--- trunk/iptables/extensions/libipt_length.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_length.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -138,20 +138,19 @@
print_length((struct ipt_length_info *)match->data);
}
-static
-struct iptables_match length
-= { NULL,
- "length",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_length_info)),
- IPT_ALIGN(sizeof(struct ipt_length_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match length = {
+ .next = NULL,
+ .name = "length",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_length_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_length_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_limit.c
===================================================================
--- trunk/iptables/extensions/libipt_limit.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_limit.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -177,20 +177,19 @@
printf("--limit-burst %u ", r->burst);
}
-static
-struct iptables_match limit
-= { NULL,
- "limit",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_rateinfo)),
- offsetof(struct ipt_rateinfo, prev),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match limit = {
+ .next = NULL,
+ .name = "limit",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_rateinfo)),
+ .userspacesize = offsetof(struct ipt_rateinfo, prev),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_mac.c
===================================================================
--- trunk/iptables/extensions/libipt_mac.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_mac.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -128,20 +128,19 @@
print_mac(((struct ipt_mac_info *)match->data)->srcaddr);
}
-static
-struct iptables_match mac
-= { NULL,
- "mac",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_mac_info)),
- IPT_ALIGN(sizeof(struct ipt_mac_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match mac = {
+ .next = NULL,
+ .name = "mac",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_mac_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_mac_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_mark.c
===================================================================
--- trunk/iptables/extensions/libipt_mark.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_mark.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -131,20 +131,19 @@
print_mark(info->mark, info->mask, 0);
}
-static
-struct iptables_match mark
-= { NULL,
- "mark",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_mark_info)),
- IPT_ALIGN(sizeof(struct ipt_mark_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match mark = {
+ .next = NULL,
+ .name = "mark",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_mark_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_mark_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_mport.c
===================================================================
--- trunk/iptables/extensions/libipt_mport.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_mport.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -292,19 +292,19 @@
printf(" ");
}
-struct iptables_match mport
-= { NULL,
- "mport",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_mport)),
- IPT_ALIGN(sizeof(struct ipt_mport)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match mport = {
+ .next = NULL,
+ .name = "mport",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_mport)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_mport)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_multiport.c
===================================================================
--- trunk/iptables/extensions/libipt_multiport.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_multiport.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -249,20 +249,19 @@
printf(" ");
}
-static
-struct iptables_match multiport
-= { NULL,
- "multiport",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_multiport)),
- IPT_ALIGN(sizeof(struct ipt_multiport)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match multiport = {
+ .next = NULL,
+ .name = "multiport",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_multiport)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_multiport)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_nth.c
===================================================================
--- trunk/iptables/extensions/libipt_nth.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_nth.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -217,19 +217,19 @@
printf("--packet %u ", nthinfo->packet );
}
-struct iptables_match nth
-= { NULL,
- "nth",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_nth_info)),
- IPT_ALIGN(sizeof(struct ipt_nth_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match nth = {
+ .next = NULL,
+ .name = "nth",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_nth_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_nth_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_owner.c
===================================================================
--- trunk/iptables/extensions/libipt_owner.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_owner.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -238,20 +238,19 @@
#endif
}
-static
-struct iptables_match owner
-= { NULL,
- "owner",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_owner_info)),
- IPT_ALIGN(sizeof(struct ipt_owner_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match owner = {
+ .next = NULL,
+ .name = "owner",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_owner_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_owner_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_physdev.c
===================================================================
--- trunk/iptables/extensions/libipt_physdev.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_physdev.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -210,20 +210,19 @@
printf(" ");
}
-static
-struct iptables_match physdev
-= { NULL,
- "physdev",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_physdev_info)),
- IPT_ALIGN(sizeof(struct ipt_physdev_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match physdev = {
+ .next = NULL,
+ .name = "physdev",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_physdev_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_physdev_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_pkttype.c
===================================================================
--- trunk/iptables/extensions/libipt_pkttype.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_pkttype.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -152,20 +152,19 @@
print_pkttype(info);
}
-static
-struct iptables_match pkttype = {
- NULL,
- "pkttype",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
- IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match pkttype = {
+ .next = NULL,
+ .name = "pkttype",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_pkttype_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_pool.c
===================================================================
--- trunk/iptables/extensions/libipt_pool.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_pool.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -122,20 +122,19 @@
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)
Modified: trunk/iptables/extensions/libipt_psd.c
===================================================================
--- trunk/iptables/extensions/libipt_psd.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_psd.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -175,20 +175,19 @@
printf("--psd-hi-ports-weight %u ", psdinfo->hi_ports_weight);
}
-static
-struct iptables_match psd
-= { NULL,
- "psd",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_psd_info)),
- IPT_ALIGN(sizeof(struct ipt_psd_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match psd = {
+ .next = NULL,
+ .name = "psd",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_psd_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_psd_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_quota.c
===================================================================
--- trunk/iptables/extensions/libipt_quota.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_quota.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -93,18 +93,19 @@
{
}
-struct iptables_match quota = { NULL,
- "quota",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof (struct ipt_quota_info)),
- IPT_ALIGN(sizeof (struct ipt_quota_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_match quota = {
+ .next = NULL,
+ .name = "quota",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof (struct ipt_quota_info)),
+ .userspacesize = IPT_ALIGN(sizeof (struct ipt_quota_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_random.c
===================================================================
--- trunk/iptables/extensions/libipt_random.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_random.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -130,19 +130,19 @@
printf("--average %u ", result.quot);
}
-struct iptables_match rand_match
-= { NULL,
- "random",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_rand_info)),
- IPT_ALIGN(sizeof(struct ipt_rand_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_match rand_match = {
+ .next = NULL,
+ .name = "random",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_rand_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_rand_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_realm.c
===================================================================
--- trunk/iptables/extensions/libipt_realm.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_realm.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -113,19 +113,18 @@
"REALM match: You must specify `--realm'");
}
-struct iptables_match realm
-= { NULL,
- "realm",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_realm_info)),
- IPT_ALIGN(sizeof(struct ipt_realm_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match realm = { NULL,
+ .name = "realm",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_realm_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_realm_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_rpc.c
===================================================================
--- trunk/iptables/extensions/libipt_rpc.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_rpc.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -352,18 +352,19 @@
}
-static struct iptables_match rpcstruct = { NULL,
- "rpc",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_rpc_info)),
- IPT_ALIGN(sizeof(struct ipt_rpc_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match rpcstruct = {
+ .next = NULL,
+ .name = "rpc",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_rpc_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_rpc_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
Modified: trunk/iptables/extensions/libipt_standard.c
===================================================================
--- trunk/iptables/extensions/libipt_standard.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_standard.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -48,19 +48,19 @@
}
static
-struct iptables_target standard
-= { NULL,
- "standard",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(int)),
- IPT_ALIGN(sizeof(int)),
- &help,
- &init,
- &parse,
- &final_check,
- NULL, /* print */
- &save,
- opts
+struct iptables_target standard = {
+ .next = NULL,
+ .name = "standard",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(int)),
+ .userspacesize = IPT_ALIGN(sizeof(int)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = NULL,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_state.c
===================================================================
--- trunk/iptables/extensions/libipt_state.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_state.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -151,20 +151,19 @@
print_state(sinfo->statemask);
}
-static
-struct iptables_match state
-= { NULL,
- "state",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_state_info)),
- IPT_ALIGN(sizeof(struct ipt_state_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match state = {
+ .next = NULL,
+ .name = "state",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_state_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_state_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_tcp.c
===================================================================
--- trunk/iptables/extensions/libipt_tcp.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_tcp.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -423,20 +423,20 @@
}
}
-static
-struct iptables_match tcp
-= { NULL,
- "tcp",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_tcp)),
- IPT_ALIGN(sizeof(struct ipt_tcp)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts };
+static struct iptables_match tcp = {
+ .next = NULL,
+ .name = "tcp",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_tcp)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_tcp)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
+};
void
_init(void)
Modified: trunk/iptables/extensions/libipt_tcpmss.c
===================================================================
--- trunk/iptables/extensions/libipt_tcpmss.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_tcpmss.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -139,20 +139,19 @@
mssinfo->invert, 0);
}
-static
-struct iptables_match tcpmss
-= { NULL,
- "tcpmss",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_tcpmss_match_info)),
- IPT_ALIGN(sizeof(struct ipt_tcpmss_match_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match tcpmss = {
+ .next = NULL,
+ .name = "tcpmss",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_tcpmss_match_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_tcpmss_match_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_time.c
===================================================================
--- trunk/iptables/extensions/libipt_time.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_time.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -530,19 +530,19 @@
/* have to use offsetof() instead of IPT_ALIGN(), since kerneltime must not
* be compared when user deletes rule with '-D' */
static
-struct iptables_match timestruct
-= { NULL,
- "time",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_time_info)),
- offsetof(struct ipt_time_info, kerneltime),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_match timestruct = {
+ .next = NULL,
+ .name = "time",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_time_info)),
+ .userspacesize = offsetof(struct ipt_time_info, kerneltime),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_tos.c
===================================================================
--- trunk/iptables/extensions/libipt_tos.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_tos.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -159,20 +159,19 @@
print_tos(info->tos, 0);
}
-static
-struct iptables_match tos
-= { NULL,
- "tos",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_tos_info)),
- IPT_ALIGN(sizeof(struct ipt_tos_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match tos = {
+ .next = NULL,
+ .name = "tos",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_tos_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_tos_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void _init(void)
Modified: trunk/iptables/extensions/libipt_ttl.c
===================================================================
--- trunk/iptables/extensions/libipt_ttl.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_ttl.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -149,20 +149,19 @@
{ 0 }
};
-static
-struct iptables_match ttl = {
- NULL,
- "ttl",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_ttl_info)),
- IPT_ALIGN(sizeof(struct ipt_ttl_info)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+static struct iptables_match ttl = {
+ .next = NULL,
+ .name = "ttl",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_ttl_info)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_ttl_info)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
Modified: trunk/iptables/extensions/libipt_u32.c
===================================================================
--- trunk/iptables/extensions/libipt_u32.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_u32.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -250,19 +250,19 @@
print_u32((struct ipt_u32 *)match->data);
}
-struct iptables_match u32
-= { NULL,
- "u32",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_u32)),
- IPT_ALIGN(sizeof(struct ipt_u32)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_match u32 = {
+ .next = NULL,
+ .name = "u32",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_u32)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_u32)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_udp.c
===================================================================
--- trunk/iptables/extensions/libipt_udp.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_udp.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -234,19 +234,19 @@
}
static
-struct iptables_match udp
-= { NULL,
- "udp",
- IPTABLES_VERSION,
- IPT_ALIGN(sizeof(struct ipt_udp)),
- IPT_ALIGN(sizeof(struct ipt_udp)),
- &help,
- &init,
- &parse,
- &final_check,
- &print,
- &save,
- opts
+struct iptables_match udp = {
+ .next = NULL,
+ .name = "udp",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(sizeof(struct ipt_udp)),
+ .userspacesize = IPT_ALIGN(sizeof(struct ipt_udp)),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = &print,
+ .save = &save,
+ .extra_opts = opts
};
void
Modified: trunk/iptables/extensions/libipt_unclean.c
===================================================================
--- trunk/iptables/extensions/libipt_unclean.c 2004-12-28 12:36:02 UTC (rev 3506)
+++ trunk/iptables/extensions/libipt_unclean.c 2004-12-28 13:11:59 UTC (rev 3507)
@@ -42,19 +42,19 @@
}
static
-struct iptables_match unclean
-= { NULL,
- "unclean",
- IPTABLES_VERSION,
- IPT_ALIGN(0),
- IPT_ALIGN(0),
- &help,
- &init,
- &parse,
- &final_check,
- NULL, /* print */
- NULL, /* save */
- opts
+struct iptables_match unclean = {
+ .next = NULL,
+ .name = "unclean",
+ .version = IPTABLES_VERSION,
+ .size = IPT_ALIGN(0),
+ .userspacesize = IPT_ALIGN(0),
+ .help = &help,
+ .init = &init,
+ .parse = &parse,
+ .final_check = &final_check,
+ .print = NULL,
+ .save = NULL,
+ .extra_opts = opts
};
void _init(void)
More information about the netfilter-cvslog
mailing list