extensions: Fix ipvs vproto parsing
Phil Sutter
reviewerPATCH 1/3 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.
--- extensions/libxt_ipvs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
extensions/libxt_ipvs.c +1 -4
@@ -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));
Signature · 1 line
2.20.1
Phil Sutter
reviewerPATCH 2/3 extensions: Fix ipvs vproto option printing
This was broken since day 1: vproto option was printed as 'proto' which in turn iptables wouldn't accept anymore.
--- extensions/libxt_ipvs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
extensions/libxt_ipvs.c +1 -1
@@ -165,7 +165,7 @@ static void ipvs_mt_dump(const void *ip, const struct xt_ipvs_mtinfo *data,if (data->bitmask &XT_IPVS_PROTO ) {if (data->invert &XT_IPVS_PROTO )printf (" !" ); -printf (" %sproto %u" , prefix, data->l4proto); +printf (" %svproto %u" , prefix, data->l4proto); }if (data->bitmask &XT_IPVS_VADDR ) {
Signature · 1 line
2.20.1
Phil Sutter
reviewerPATCH 3/3 extensions: Add testcase for libxt_ipvs
In reply to Phil SutterGiven that it is fixed now, make it stay.
--- extensions/libxt_ipvs.t | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 extensions/libxt_ipvs.t
extensions/libxt_ipvs.t new file +20 -0
@@ -0,0 +1,20 @@ +:INPUT,FORWARD,OUTPUT +-m ipvs --ipvs;=;OK +-m ipvs ! --ipvs;=;OK +-m ipvs --vproto tcp;-m ipvs --vproto 6;OK +-m ipvs ! --vproto TCP;-m ipvs ! --vproto 6;OK +-m ipvs --vproto 23;=;OK +-m ipvs --vaddr 1.2.3.4;=;OK +-m ipvs ! --vaddr 1.2.3.4/255.255.255.0;-m ipvs ! --vaddr 1.2.3.4/24;OK +-m ipvs --vport http;-m ipvs --vport 80;OK +-m ipvs ! --vport ssh;-m ipvs ! --vport 22;OK +-m ipvs --vport 22;=;OK +-m ipvs ! --vport 443;=;OK +-m ipvs --vdir ORIGINAL;=;OK +-m ipvs --vdir REPLY;=;OK +-m ipvs --vmethod GATE;=;OK +-m ipvs ! --vmethod IPIP;=;OK +-m ipvs --vmethod MASQ;=;OK +-m ipvs --vportctl 21;=;OK +-m ipvs ! --vportctl 21;=;OK +-m ipvs --vproto 6 --vaddr 1.2.3.4/16 --vport 22 --vdir ORIGINAL --vmethod GATE;=;OK
Signature · 1 line
2.20.1
Hello,
Quoted 10 lines · Phil Sutter
This was broken by integration into guided option parser:
* Make 'vproto' option
XTTYPE_PROTOCOL, otherwise its arguments are parsed as garbage only.* Drop
O_VPROTOcase fromipvs_mt_parse(), due toXTOPT_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 <[email protected]>
The 3 patches look good to me, thanks!
Quoted 29 lines
--- extensions/libxt_ipvs.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)extensions/libxt_ipvs.c +1
-4@@ -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));Signature · 1 line
2.20.1
Regards
--
Julian Anastasov <[email protected]>