firewall: count rules per chain and family, fix wrong order of ip6tables rules when...

SVN-Revision: 21533

diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh
index 1dc3f1cde6ff756997f924058db4a7111adae9ae..7beb153ba79aef0650646c180d5a0fe93373e23a 100644 (file)
--- 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 } { \