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/libxt_dscp.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/libxt_dscp.c')
| -rw-r--r-- | extensions/libxt_dscp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c index 03e47633..1569f7d4 100644 --- a/extensions/libxt_dscp.c +++ b/extensions/libxt_dscp.c @@ -83,7 +83,7 @@ dscp_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "DSCP match: Only use --dscp ONCE!"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_dscp(argv[optind-1], dinfo); + parse_dscp(optarg, dinfo); if (invert) dinfo->invert = 1; *flags = 1; @@ -94,7 +94,7 @@ dscp_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "DSCP match: Only use --dscp-class ONCE!"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_class(argv[optind - 1], dinfo); + parse_class(optarg, dinfo); if (invert) dinfo->invert = 1; *flags = 1; |