summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-22 02:01:19 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-05-22 02:01:19 +0000
commit81279ca0f1fc542b4eaac5e55a2a850a1f3063ff (patch)
treee85e991d6d24f75cb30725590d073385e5f80ee5
parent7962741d945c38aae17fe4e5f7ffdcabef5394da (diff)
[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
-rw-r--r--package/firewall/files/lib/core_rule.sh8
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 1dc3f1cde..7beb153ba 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 } { \