mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-11-18 14:47:46 +01:00
Code Issues

firewall: count rules per chain and family, fix wrong order of ip6tables rules when ipv4 only or dual family rules are defined

Browse Source 
SVN-Revision: 21533
This commit is contained in:
Jo-Philipp Wich 2010-05-22 02:01:19 +00:00
parent f3bce8f0db
commit 409edb1b8e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package/firewall/files/lib/core_rule.sh
View File

@ -29,7 +29,7 @@ fw_load_rule() {
rule_src_port=$(fw_get_port_range $rule_src_port) rule_src_port=$(fw_get_port_range $rule_src_port)
rule_dest_port=$(fw_get_port_range $rule_dest_port) rule_dest_port=$(fw_get_port_range $rule_dest_port)
local chain=input local chain=input
[ -n "$rule_src" ] && { [ -n "$rule_src" ] && {
[ -z "$rule_dest" ] && { [ -z "$rule_dest" ] && {
@ -47,11 +47,11 @@ fw_load_rule() {
target=zone_${rule_dest}_${target} target=zone_${rule_dest}_${target}
} }
local rule_pos
eval 'rule_pos=$((++FW__RULE_COUNT_'$chain'))'
local mode=$(fw_get_family_mode ${rule_family:-x} $rule_src I) local mode=$(fw_get_family_mode ${rule_family:-x} $rule_src I)
local rule_pos
eval 'rule_pos=$((++FW__RULE_COUNT_'$mode'_'$chain'))'
[ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp" [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
for rule_proto in $rule_proto; do for rule_proto in $rule_proto; do
fw add $mode f $chain $target $rule_pos { $rule_src_ip $rule_dest_ip } { \ fw add $mode f $chain $target $rule_pos { $rule_src_ip $rule_dest_ip } { \