diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2011-11-25 15:36:56 +0100 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2011-11-30 21:47:12 +0100 |
| commit | 3964023f8640b60456373825b326b91badd7a058 (patch) | |
| tree | e5cd733341a2cdf3584c2867d16bad82ecce5979 /extensions/libipt_SNAT.c | |
| parent | 3c461ceeed5f55599930051f6feaec014b08f730 (diff) | |
libipt_SAME: set PROTO_RANDOM on all ranges
Resolve the (justified) WTF remark to a clearer version of when/why
PROTO_RANDOM needs to be set.
Especially when --random is used before --to in SAME, it would have
not been appleid.
Diffstat (limited to 'extensions/libipt_SNAT.c')
| -rw-r--r-- | extensions/libipt_SNAT.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index 80233060..c8cb26df 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -174,21 +174,23 @@ static void SNAT_parse(struct xt_option_call *cb) "SNAT: Multiple --to-source not supported"); } *cb->target = parse_to(cb->arg, portok, info); - /* WTF do we need this for?? */ - if (cb->xflags & F_RANDOM) - info->mr.range[0].flags |= IP_NAT_RANGE_PROTO_RANDOM; cb->xflags |= F_X_TO_SRC; break; - case O_RANDOM: - if (cb->xflags & F_TO_SRC) - info->mr.range[0].flags |= IP_NAT_RANGE_PROTO_RANDOM; - break; case O_PERSISTENT: info->mr.range[0].flags |= IP_NAT_RANGE_PERSISTENT; break; } } +static void SNAT_fcheck(struct xt_fcheck_call *cb) +{ + static const unsigned int f = F_TO_SRC | F_RANDOM; + struct nf_nat_multi_range *mr = cb->data; + + if ((cb->xflags & f) == f) + mr->range[0].flags |= IP_NAT_RANGE_PROTO_RANDOM; +} + static void print_range(const struct nf_nat_range *r) { if (r->flags & IP_NAT_RANGE_MAP_IPS) { @@ -248,6 +250,7 @@ static struct xtables_target snat_tg_reg = { .userspacesize = XT_ALIGN(sizeof(struct nf_nat_multi_range)), .help = SNAT_help, .x6_parse = SNAT_parse, + .x6_fcheck = SNAT_fcheck, .print = SNAT_print, .save = SNAT_save, .x6_options = SNAT_opts, |