diff options
| author | Jan Engelhardt <jengelh@medozas.de> | 2009-10-24 00:45:33 +0200 |
|---|---|---|
| committer | Jan Engelhardt <jengelh@medozas.de> | 2009-11-03 21:54:20 +0100 |
| commit | bbe83862a5e1baf15f7c923352d4afdf59bc70e2 (patch) | |
| tree | 790bfd0d6a47968e6c1ed6b2f681ec5578728463 /extensions/libip6t_rt.c | |
| parent | bf97128c7262f17a02fec41cdae75b472ba77f88 (diff) | |
iptables/extensions: make bundled options work again
When using a bundled option like "-ptcp", 'argv[optind-1]' would
logically point to "-ptcp", but this is obviously not right.
'optarg' is needed instead, which if properly offset to "tcp".
Not all places change optind-based access to optarg; where
look-ahead is needed, such as for tcp's --tcp-flags option for
example, optind is ok.
References: http://bugzilla.netfilter.org/show_bug.cgi?id=611
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Diffstat (limited to 'extensions/libip6t_rt.c')
| -rw-r--r-- | extensions/libip6t_rt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c index 851a600a..a04023df 100644 --- a/extensions/libip6t_rt.c +++ b/extensions/libip6t_rt.c @@ -159,7 +159,7 @@ static int rt_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "Only one `--rt-type' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - rtinfo->rt_type = parse_rt_num(argv[optind-1], "type"); + rtinfo->rt_type = parse_rt_num(optarg, "type"); if (invert) rtinfo->invflags |= IP6T_RT_INV_TYP; rtinfo->flags |= IP6T_RT_TYP; @@ -170,7 +170,7 @@ static int rt_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "Only one `--rt-segsleft' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_rt_segsleft(argv[optind-1], rtinfo->segsleft); + parse_rt_segsleft(optarg, rtinfo->segsleft); if (invert) rtinfo->invflags |= IP6T_RT_INV_SGS; rtinfo->flags |= IP6T_RT_SGS; @@ -181,7 +181,7 @@ static int rt_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "Only one `--rt-len' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - rtinfo->hdrlen = parse_rt_num(argv[optind-1], "length"); + rtinfo->hdrlen = parse_rt_num(optarg, "length"); if (invert) rtinfo->invflags |= IP6T_RT_INV_LEN; rtinfo->flags |= IP6T_RT_LEN; @@ -208,7 +208,7 @@ static int rt_parse(int c, char **argv, int invert, unsigned int *flags, if (invert) xtables_error(PARAMETER_PROBLEM, " '!' not allowed with `--rt-0-addrs'"); - rtinfo->addrnr = parse_addresses(argv[optind-1], rtinfo->addrs); + rtinfo->addrnr = parse_addresses(optarg, rtinfo->addrs); rtinfo->flags |= IP6T_RT_FST; *flags |= IP6T_RT_FST; break; |