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_udp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extensions/libxt_udp.c') diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c index 8a80b6e2..135e7af7 100644 --- a/extensions/libxt_udp.c +++ b/extensions/libxt_udp.c @@ -73,7 +73,7 @@ udp_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "Only one `--source-port' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_udp_ports(argv[optind-1], udpinfo->spts); + parse_udp_ports(optarg, udpinfo->spts); if (invert) udpinfo->invflags |= XT_UDP_INV_SRCPT; *flags |= UDP_SRC_PORTS; @@ -84,7 +84,7 @@ udp_parse(int c, char **argv, int invert, unsigned int *flags, xtables_error(PARAMETER_PROBLEM, "Only one `--destination-port' allowed"); xtables_check_inverse(optarg, &invert, &optind, 0, argv); - parse_udp_ports(argv[optind-1], udpinfo->dpts); + parse_udp_ports(optarg, udpinfo->dpts); if (invert) udpinfo->invflags |= XT_UDP_INV_DSTPT; *flags |= UDP_DST_PORTS; -- cgit v1.2.3