[package] firewall: count rules per chain and family, fix wrong order of ip6tables...
[openwrt/svn-archive/archive.git] / package / firewall / files / lib / core_rule.sh
index e6a276e..7beb153 100644 (file)
@@ -16,6 +16,7 @@ fw_config_get_rule() {
                string icmp_type "" \
                string proto "tcpudp" \
                string target "" \
+               string family "" \
        } || return
        [ -n "$rule_name" ] || rule_name=$rule__name
        [ "$rule_proto" == "icmp" ] || rule_icmp_type=
@@ -28,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" ] && {
@@ -46,12 +47,14 @@ fw_load_rule() {
                target=zone_${rule_dest}_${target}
        }
 
+       local mode=$(fw_get_family_mode ${rule_family:-x} $rule_src I)
+
        local rule_pos
-       eval 'rule_pos=$((++FW__RULE_COUNT_'$chain'))'
+       eval 'rule_pos=$((++FW__RULE_COUNT_'$mode'_'$chain'))'
 
        [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
        for rule_proto in $rule_proto; do
-               fw add I 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 } { \
                        ${rule_proto:+-p $rule_proto} \
                        ${rule_src_ip:+-s $rule_src_ip} \
                        ${rule_src_port:+--sport $rule_src_port} \