qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-04 11:41:05 +02:00
Code

[package] firewall: prevent redundant rules if multiple ports and multiple icmp types are given in a rule block for both icmp and other protocols

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27792 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-07-26 22:21:39 +00:00
parent a71d342cb1
commit d572d07324
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/firewall/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall PKG_NAME:=firewall
PKG_VERSION:=2 PKG_VERSION:=2
PKG_RELEASE:=32 PKG_RELEASE:=33
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

23
package/firewall/files/lib/core_rule.sh
View File

@ -67,21 +67,30 @@ fw_load_rule() {
[ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp" [ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
local pr; for pr in $rule_proto; do 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" 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_port_range sp $sp
fw_get_negation sp '--sport' "$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_port_range dp $dp
fw_get_negation dp '--dport' "$dp" fw_get_negation dp '--dport' "$dp"
local sm; for sm in ${rule_src_mac:-""}; do local sm; for sm in ${rule_src_mac:-""}; do
fw_get_negation sm '--mac-source' "$sm" 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" fw_get_negation it '--icmp-type' "$it"
case "$pr" in
*" icmp"|*" icmpv6"|*" 1"|*" 58") sp=""; dp="" ;;
*) it="" ;;
esac
fw add $mode $table $chain $target + \ fw add $mode $table $chain $target + \
{ $rule_src_ip $rule_dest_ip } { \ { $rule_src_ip $rule_dest_ip } { \
$src_spec $dest_spec \ $src_spec $dest_spec \