From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 9 Jul 2012 12:23:36 +0000 (+0000)
Subject: firewall: also set up nat reflection rules for redirects with proto all and/or no... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4127e73b845b0bb7f656bea1d887a32cee0f2388;p=openwrt%2Fstaging%2Fadrian.git

firewall: also set up nat reflection rules for redirects with proto all and/or no src_dport set

SVN-Revision: 32652
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 0cfc9c6361..05f42a62ea 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=2
-PKG_RELEASE:=52
+PKG_RELEASE:=53
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/reflection.hotplug b/package/firewall/files/reflection.hotplug
index 2da0be9a05..843c615bcb 100644
--- a/package/firewall/files/reflection.hotplug
+++ b/package/firewall/files/reflection.hotplug
@@ -69,7 +69,7 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
 				config_get proto "$cfg" proto
 
 				local epmin epmax extport
-				config_get extport "$cfg" src_dport
+				config_get extport "$cfg" src_dport "1-65535"
 				[ -n "$extport" ] || return
 
 				epmin="${extport%[-:]*}"; epmax="${extport#*[-:]}"
@@ -88,6 +88,7 @@ if [ "$ACTION" = "add" ] && [ "$INTERFACE" = "wan" ]; then
 				config_get inthost "$cfg" dest_ip
 				[ -n "$inthost" ] || return
 
+				[ "$proto" = all    ] && proto="tcp udp"
 				[ "$proto" = tcpudp ] && proto="tcp udp"
 
 				[ "${inthost#!}" = "$inthost" ] || return 0