diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-26 22:21:39 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-07-26 22:21:39 +0000 |
commit | 6292b0603fa50509274785b6c7f07b708d0dc248 (patch) | |
tree | 4c8cf8d552df6bd7ae7f0887170b72b06307c339 /package/firewall/files/lib/core_rule.sh | |
parent | f14e91f44dbcda3931768344e3e639c9ff53d7f7 (diff) | |
download | master-187ad058-6292b0603fa50509274785b6c7f07b708d0dc248.tar.gz master-187ad058-6292b0603fa50509274785b6c7f07b708d0dc248.tar.bz2 master-187ad058-6292b0603fa50509274785b6c7f07b708d0dc248.zip |
[package] firewall: prevent redundant rules if multiple ports and multiple icmp types are given in a rule block for both icmp and other protocols
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27792 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/firewall/files/lib/core_rule.sh')
-rw-r--r-- | package/firewall/files/lib/core_rule.sh | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/package/firewall/files/lib/core_rule.sh b/package/firewall/files/lib/core_rule.sh index 0a25fcd953..de8cd8ea35 100644 --- a/package/firewall/files/lib/core_rule.sh +++ b/package/firewall/files/lib/core_rule.sh @@ -67,21 +67,30 @@ fw_load_rule() { [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp" local pr; for pr in $rule_proto; do + local sports dports itypes + case "$pr" in + icmp|icmpv6|1|58) + sports=""; dports="" + itypes="$rule_icmp_type" + ;; + *) + sports="$rule_src_port" + dports="$rule_dest_port" + itypes="" + ;; + esac + fw_get_negation pr '-p' "$pr" - local sp; for sp in ${rule_src_port:-""}; do + local sp; for sp in ${sports:-""}; do fw_get_port_range sp $sp fw_get_negation sp '--sport' "$sp" - local dp; for dp in ${rule_dest_port:-""}; do + local dp; for dp in ${dports:-""}; do fw_get_port_range dp $dp fw_get_negation dp '--dport' "$dp" local sm; for sm in ${rule_src_mac:-""}; do fw_get_negation sm '--mac-source' "$sm" - local it; for it in ${rule_icmp_type:-""}; do + local it; for it in ${itypes:-""}; do fw_get_negation it '--icmp-type' "$it" - case "$pr" in - *" icmp"|*" icmpv6"|*" 1"|*" 58") sp=""; dp="" ;; - *) it="" ;; - esac fw add $mode $table $chain $target + \ { $rule_src_ip $rule_dest_ip } { \ $src_spec $dest_spec \ |