diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-02-21 20:09:30 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2019-02-22 17:00:44 +0100 |
| commit | fcbdc69e8a750fe02c9d7c7aced0efc91715132d (patch) | |
| tree | ecf7460c342a8c8a00342b096ade79843b6ffe9f | |
| parent | dffb5ec2a8c7f91351e2a1029a757cb1f41f2d02 (diff) | |
extensions: Fix ipvs vproto parsing
This was broken by integration into guided option parser:
* Make 'vproto' option XTTYPE_PROTOCOL, otherwise its arguments are
parsed as garbage only.
* Drop O_VPROTO case from ipvs_mt_parse(), due to XTOPT_POINTER() and
above change there is nothing to do for it in there.
Fixes: 372203af4c70f ("libxt_ipvs: use guided option parser")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | extensions/libxt_ipvs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/extensions/libxt_ipvs.c b/extensions/libxt_ipvs.c index a6c57a03..fe98fef9 100644 --- a/extensions/libxt_ipvs.c +++ b/extensions/libxt_ipvs.c @@ -27,7 +27,7 @@ enum { static const struct xt_option_entry ipvs_mt_opts[] = { {.name = "ipvs", .id = O_IPVS, .type = XTTYPE_NONE, .flags = XTOPT_INVERT}, - {.name = "vproto", .id = O_VPROTO, .type = XTTYPE_STRING, + {.name = "vproto", .id = O_VPROTO, .type = XTTYPE_PROTOCOL, .flags = XTOPT_INVERT | XTOPT_PUT, XTOPT_POINTER(s, l4proto)}, {.name = "vaddr", .id = O_VADDR, .type = XTTYPE_HOSTMASK, .flags = XTOPT_INVERT}, @@ -69,9 +69,6 @@ static void ipvs_mt_parse(struct xt_option_call *cb) xtables_option_parse(cb); switch (cb->entry->id) { - case O_VPROTO: - data->l4proto = cb->val.protocol; - break; case O_VADDR: memcpy(&data->vaddr, &cb->val.haddr, sizeof(cb->val.haddr)); memcpy(&data->vmask, &cb->val.hmask, sizeof(cb->val.hmask)); |