diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-05-25 05:34:04 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-05-25 05:34:04 +0200 |
| commit | 790845385fb84ce8e79a96e91fc6c4f7df60713d (patch) | |
| tree | 3a0269859e66b8703af172f8e0debe846db124a6 /extensions/libip6t_frag.c | |
| parent | 17f7937f79af4d260c60cb800e56fc0df0a48b37 (diff) | |
| parent | db50b83bc3cd634beb71f38978ad7d035c88ff11 (diff) | |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'extensions/libip6t_frag.c')
| -rw-r--r-- | extensions/libip6t_frag.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c index 12794e42..47793860 100644 --- a/extensions/libip6t_frag.c +++ b/extensions/libip6t_frag.c @@ -41,19 +41,16 @@ static const struct xt_option_entry frag_opts[] = { }; #undef s -static void frag_init(struct xt_entry_match *m) -{ - struct ip6t_frag *fraginfo = (struct ip6t_frag *)m->data; - - fraginfo->ids[1] = 0xFFFFFFFF; -} - static void frag_parse(struct xt_option_call *cb) { struct ip6t_frag *fraginfo = cb->data; xtables_option_parse(cb); switch (cb->entry->id) { + case O_FRAGID: + if (cb->nvals == 1) + fraginfo->ids[1] = fraginfo->ids[0]; + break; case O_FRAGRES: fraginfo->flags |= IP6T_FRAG_RES; break; @@ -160,7 +157,6 @@ static struct xtables_match frag_mt6_reg = { .size = XT_ALIGN(sizeof(struct ip6t_frag)), .userspacesize = XT_ALIGN(sizeof(struct ip6t_frag)), .help = frag_help, - .init = frag_init, .print = frag_print, .save = frag_save, .x6_parse = frag_parse, |