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 | 409edb1b8e679d036ea04f814e387254638021cb (patch) | |
| tree | fc8d862ef7338cb86c2612caaa8edf23bf5b8dd4 /package/firewall/files | |
| parent | f3bce8f0db923bf432fd26073146f9b852592118 (diff) | |
| download | upstream-409edb1b8e679d036ea04f814e387254638021cb.tar.gz upstream-409edb1b8e679d036ea04f814e387254638021cb.tar.bz2 upstream-409edb1b8e679d036ea04f814e387254638021cb.zip | |
firewall: count rules per chain and family, fix wrong order of ip6tables rules when ipv4 only or dual family rules are defined
SVN-Revision: 21533
Diffstat (limited to 'package/firewall/files')
| -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 } { \ |