qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-04 11:13:45 +02:00
Code

[package] firewall: add support for "local" port forwards which target an internal address on the router itself

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29687 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-01-08 15:29:24 +00:00
parent 6483a9f739
commit 57968b17ca
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/firewall/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2008-2011 OpenWrt.org # Copyright (C) 2008-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall PKG_NAME:=firewall
PKG_VERSION:=2 PKG_VERSION:=2
PKG_RELEASE:=43 PKG_RELEASE:=44
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

15
package/firewall/files/lib/core_redirect.sh
View File

@ -34,7 +34,17 @@ fw_load_redirect() {
return 0 return 0
} }
fwdchain="zone_${redirect_src}${redirect_dest_ip:+_forward}" fwdopt=""
fwdchain=""
# Check whether only ports are given or whether the given dest ip is local,
# in this case match only DNATed traffic and allow it on input, not forward
if [ -z "$redirect_dest_ip" ] || /sbin/ifconfig | grep -qE "addr:${redirect_dest_ip//./\\.}\b"; then
fwdopt="-m conntrack --ctstate DNAT"
fwdchain="zone_${redirect_src}"
else
fwdchain="zone_${redirect_src}_forward"
fi
natopt="--to-destination" natopt="--to-destination"
natchain="zone_${redirect_src}_prerouting" natchain="zone_${redirect_src}_prerouting"
@ -106,10 +116,11 @@ fw_load_redirect() {
fw add $mode f ${fwdchain:-forward} ACCEPT + \ fw add $mode f ${fwdchain:-forward} ACCEPT + \
{ $redirect_src_ip $redirect_dest_ip } { \ { $redirect_src_ip $redirect_dest_ip } { \
$srcaddr ${destaddr:--m conntrack --ctstate DNAT} \ $srcaddr $destaddr \
$pr \ $pr \
$srcports $destports \ $srcports $destports \
${sm:+-m mac $sm} \ ${sm:+-m mac $sm} \
$fwdopt \
$redirect_extra \ $redirect_extra \
} }
done done