From: Daniel Dickinson Date: Wed, 6 Jul 2011 06:26:12 +0000 (+0000) Subject: firewall: fix udp rules for tcpudp proto rules using src_port and dest_port after... X-Git-Tag: v19.07.0-rc1~26998 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=05c45f0f5e9ef0209b6c105f911eca94a96eec49;p=openwrt%2Fstaging%2Fhauke.git firewall: fix udp rules for tcpudp proto rules using src_port and dest_port after modification by the parsing of the tcp rule SVN-Revision: 27469 --- diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh index 64a510df92..55381598b5 100644 --- a/package/firewall/files/lib/core_rule.sh +++ b/package/firewall/files/lib/core_rule.sh @@ -65,8 +65,15 @@ fw_load_rule() { fw_get_negation src_spec '-s' "${rule_src_ip:+$rule_src_ip/$rule_src_ip_prefixlen}" fw_get_negation dest_spec '-d' "${rule_dest_ip:+$rule_dest_ip/$rule_dest_ip_prefixlen}" + local rule_src_port_copy + local rule_dest_port_copy + [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp" + rule_src_port_copy="$rule_src_port" + rule_dest_port_copy="$rule_dest_port" for rule_proto in $rule_proto; do + rule_src_port="$rule_src_port_copy" + rule_dest_port="$rule_dest_port_copy" fw_get_negation rule_proto '-p' "$rule_proto" for rule_src_port in ${rule_src_port:-""}; do fw_get_port_range rule_src_port $rule_src_port