diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2009-06-12 20:55:44 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2009-06-26 21:13:09 +0200 |
| commit | c5e85736c207f211d82d2878a5781f512327dfce (patch) | |
| tree | 38e324d6ae9697bf3bba4c9110308a2e9e42b0bf /extensions/libxt_connmark.c | |
| parent | cc4344042e8c0bb6eef877975588321aa152660d (diff) | |
extensions: collapse registration structures
There are no different code paths between IPV4 and IPV6, so
data can be consolidated here.
text data bss dec hex filename
243757 12212 2576 258545 3f1f1 ip6tables-static[before.i586]
243613 9428 2576 255617 3e681 ip6tables-static[after.i586]
-144 -2784
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libxt_connmark.c')
| -rw-r--r-- | extensions/libxt_connmark.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c index ce2002ce..db7c3a19 100644 --- a/extensions/libxt_connmark.c +++ b/extensions/libxt_connmark.c @@ -164,22 +164,7 @@ connmark_mt_save(const void *ip, const struct xt_entry_match *match) } static struct xtables_match connmark_mt_reg_v0 = { - .family = NFPROTO_IPV4, - .name = "connmark", - .revision = 0, - .version = XTABLES_VERSION, - .size = XT_ALIGN(sizeof(struct xt_connmark_info)), - .userspacesize = XT_ALIGN(sizeof(struct xt_connmark_info)), - .help = connmark_mt_help, - .parse = connmark_parse, - .final_check = connmark_mt_check, - .print = connmark_print, - .save = connmark_save, - .extra_opts = connmark_mt_opts, -}; - -static struct xtables_match connmark_mt6_reg_v0 = { - .family = NFPROTO_IPV6, + .family = NFPROTO_UNSPEC, .name = "connmark", .revision = 0, .version = XTABLES_VERSION, @@ -197,22 +182,7 @@ static struct xtables_match connmark_mt_reg = { .version = XTABLES_VERSION, .name = "connmark", .revision = 1, - .family = NFPROTO_IPV4, - .size = XT_ALIGN(sizeof(struct xt_connmark_mtinfo1)), - .userspacesize = XT_ALIGN(sizeof(struct xt_connmark_mtinfo1)), - .help = connmark_mt_help, - .parse = connmark_mt_parse, - .final_check = connmark_mt_check, - .print = connmark_mt_print, - .save = connmark_mt_save, - .extra_opts = connmark_mt_opts, -}; - -static struct xtables_match connmark_mt6_reg = { - .version = XTABLES_VERSION, - .name = "connmark", - .revision = 1, - .family = NFPROTO_IPV6, + .family = NFPROTO_UNSPEC, .size = XT_ALIGN(sizeof(struct xt_connmark_mtinfo1)), .userspacesize = XT_ALIGN(sizeof(struct xt_connmark_mtinfo1)), .help = connmark_mt_help, @@ -226,7 +196,5 @@ static struct xtables_match connmark_mt6_reg = { void _init(void) { xtables_register_match(&connmark_mt_reg_v0); - xtables_register_match(&connmark_mt6_reg_v0); xtables_register_match(&connmark_mt_reg); - xtables_register_match(&connmark_mt6_reg); } |