diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-22 02:01:19 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2010-05-22 02:01:19 +0000 |
| commit | 40c91330edd4734576c675387861e4e2bd3e93fd (patch) | |
| tree | e85e991d6d24f75cb30725590d073385e5f80ee5 /package | |
| parent | 3bbc276e5dc43d53e9e89182ac308e28361ef0dc (diff) | |
| download | upstream-40c91330edd4734576c675387861e4e2bd3e93fd.tar.gz upstream-40c91330edd4734576c675387861e4e2bd3e93fd.tar.bz2 upstream-40c91330edd4734576c675387861e4e2bd3e93fd.zip | |
[package] firewall: count rules per chain and family, fix wrong order of ip6tables rules when ipv4 only or dual family rules are defined
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21533 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/firewall/files/lib/core_rule.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh index 1dc3f1cde6..7beb153ba7 100644 --- a/package/firewall/files/lib/core_rule.sh +++ b/package/firewall/files/lib/core_rule.sh @@ -29,7 +29,7 @@ fw_load_rule() { rule_src_port=$(fw_get_port_range $rule_src_port) rule_dest_port=$(fw_get_port_range $rule_dest_port) - + local chain=input [ -n "$rule_src" ] && { [ -z "$rule_dest" ] && { @@ -47,11 +47,11 @@ fw_load_rule() { 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 rule_pos + eval 'rule_pos=$((++FW__RULE_COUNT_'$mode'_'$chain'))' + [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp" for rule_proto in $rule_proto; do fw add $mode f $chain $target $rule_pos { $rule_src_ip $rule_dest_ip } { \ |