From bbe83862a5e1baf15f7c923352d4afdf59bc70e2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 24 Oct 2009 00:45:33 +0200 Subject: 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 --- extensions/libxt_sctp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extensions/libxt_sctp.c') diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c index f4844e3f..441f12e2 100644 --- a/extensions/libxt_sctp.c +++ b/extensions/libxt_sctp.c @@ -258,7 +258,7 @@ sctp_parse(int c, char **argv, int invert, unsigned int *flags, "Only one `--source-port' allowed"); einfo->flags |= XT_SCTP_SRC_PORTS; xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_sctp_ports(argv[optind-1], einfo->spts); + parse_sctp_ports(optarg, einfo->spts); if (invert) einfo->invflags |= XT_SCTP_SRC_PORTS; *flags |= XT_SCTP_SRC_PORTS; @@ -270,7 +270,7 @@ sctp_parse(int c, char **argv, int invert, unsigned int *flags, "Only one `--destination-port' allowed"); einfo->flags |= XT_SCTP_DEST_PORTS; xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_sctp_ports(argv[optind-1], einfo->dpts); + parse_sctp_ports(optarg, einfo->dpts); if (invert) einfo->invflags |= XT_SCTP_DEST_PORTS; *flags |= XT_SCTP_DEST_PORTS; @@ -288,7 +288,7 @@ sctp_parse(int c, char **argv, int invert, unsigned int *flags, "--chunk-types requires two args"); einfo->flags |= XT_SCTP_CHUNK_TYPES; - parse_sctp_chunks(einfo, argv[optind-1], argv[optind]); + parse_sctp_chunks(einfo, optarg, argv[optind]); if (invert) einfo->invflags |= XT_SCTP_CHUNK_TYPES; optind++; -- cgit v1.2.3