firewall: fix wrong rule order if multiple protocols are used

SVN-Revision: 25179
This commit is contained in:
Jo-Philipp Wich 2011-01-27 22:19:53 +00:00
parent ea0d6e6b1b
commit 04b20727d8
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -52,11 +52,11 @@ fw_load_rule() {
fw_get_negation src_spec '-s' "${rule_src_ip:+$rule_src_ip/$rule_src_ip_prefixlen}"
fw_get_negation dest_spec '-d' "${rule_dest_ip:+$rule_dest_ip/$rule_dest_ip_prefixlen}"
local rule_pos
eval 'rule_pos=$((++FW__RULE_COUNT_'${mode#G}'_'$chain'))'
[ "$rule_proto" == "tcpudp" ] && rule_proto="tcp udp"
for rule_proto in $rule_proto; do
local rule_pos
eval 'rule_pos=$((++FW__RULE_COUNT_'${mode#G}'_'$chain'))'
fw add $mode $table $chain $target $rule_pos { $rule_src_ip $rule_dest_ip } { \
$src_spec $dest_spec \
${rule_proto:+-p $rule_proto} \