From 23545c2a7a31c68c1e49c7c901b632c2f1c59968 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 14 Feb 2008 04:23:04 +0100 Subject: Implement AF_UNSPEC as a wildcard for extensions --- extensions/libxt_mark.c | 36 ++---------------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) (limited to 'extensions/libxt_mark.c') diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index af7f844a..fab8ecb9 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -149,22 +149,7 @@ mark_save(const void *ip, const struct xt_entry_match *match) } static struct xtables_match mark_match = { - .family = AF_INET, - .name = "mark", - .revision = 0, - .version = IPTABLES_VERSION, - .size = XT_ALIGN(sizeof(struct xt_mark_info)), - .userspacesize = XT_ALIGN(sizeof(struct xt_mark_info)), - .help = mark_mt_help, - .parse = mark_parse, - .final_check = mark_mt_check, - .print = mark_print, - .save = mark_save, - .extra_opts = mark_mt_opts, -}; - -static struct xtables_match mark_match6 = { - .family = AF_INET6, + .family = AF_UNSPEC, .name = "mark", .revision = 0, .version = IPTABLES_VERSION, @@ -182,22 +167,7 @@ static struct xtables_match mark_mt_reg = { .version = IPTABLES_VERSION, .name = "mark", .revision = 1, - .family = AF_INET, - .size = XT_ALIGN(sizeof(struct xt_mark_mtinfo1)), - .userspacesize = XT_ALIGN(sizeof(struct xt_mark_mtinfo1)), - .help = mark_mt_help, - .parse = mark_mt_parse, - .final_check = mark_mt_check, - .print = mark_mt_print, - .save = mark_mt_save, - .extra_opts = mark_mt_opts, -}; - -static struct xtables_match mark_mt6_reg = { - .version = IPTABLES_VERSION, - .name = "mark", - .revision = 1, - .family = AF_INET6, + .family = AF_UNSPEC, .size = XT_ALIGN(sizeof(struct xt_mark_mtinfo1)), .userspacesize = XT_ALIGN(sizeof(struct xt_mark_mtinfo1)), .help = mark_mt_help, @@ -211,7 +181,5 @@ static struct xtables_match mark_mt6_reg = { void _init(void) { xtables_register_match(&mark_match); - xtables_register_match(&mark_match6); xtables_register_match(&mark_mt_reg); - xtables_register_match(&mark_mt6_reg); } -- cgit v1.2.3