qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-17 14:44:44 +02:00
Code

[backfire] backport r23318

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23324 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-08 13:50:30 +00:00
parent 8da83a1c65
commit e03b255302
2 changed files with 8 additions and 4 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:=1 PKG_VERSION:=1
PKG_RELEASE:=19 PKG_RELEASE:=20
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

10
package/firewall/files/uci_firewall.sh
View File

@ -388,10 +388,11 @@ fw_rule() {
[ -n "$dest" ] && TARGET="zone_${dest}_${TARGET}" [ -n "$dest" ] && TARGET="zone_${dest}_${TARGET}"
fi fi
eval 'RULE_COUNT=$((++RULE_COUNT_'$ZONE'))' local pos
eval 'pos=$((++FW__RULE_COUNT_'$ZONE'))'
add_rule() { add_rule() {
$IPTABLES -t $TABLE -I $ZONE $RULE_COUNT \ $IPTABLES -t $TABLE -I $ZONE $pos \
$srcaddr $destaddr \ $srcaddr $destaddr \
${proto:+-p $proto} \ ${proto:+-p $proto} \
${icmp_type:+--icmp-type $icmp_type} \ ${icmp_type:+--icmp-type $icmp_type} \
@ -501,7 +502,10 @@ fw_redirect() {
get_portrange destports "${dest_port-$src_dport}" ":" get_portrange destports "${dest_port-$src_dport}" ":"
add_rule() { add_rule() {
$IPTABLES -I $natchain 1 -t nat \ local pos
eval 'pos=$((++FW__REDIR_COUNT_'$natchain'))'
$IPTABLES -I $natchain $pos -t nat \
$srcaddr $srcdaddr \ $srcaddr $srcdaddr \
${proto:+-p $proto} \ ${proto:+-p $proto} \
${srcports:+--sport $srcports} \ ${srcports:+--sport $srcports} \