summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-16 06:03:15 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-07-16 06:03:15 +0000
commit5fbf6ca9e6af9be63bbd085f2feb3bcafe7d8dbc (patch)
tree698c98d72bc35de39515e1f96edd92ac1d1f82c6
parent70f06b0258b9edcf81246cca3480643082702860 (diff)
[package] firewall: allow redirecting only destination port (#7197)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22227 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/firewall/Makefile2
-rw-r--r--package/firewall/files/lib/core_redirect.sh5
2 files changed, 4 insertions, 3 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index b1969d9ab..c1f3f6eb2 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:=7
+PKG_RELEASE:=8
include $(INCLUDE_DIR)/package.mk
diff --git a/package/firewall/files/lib/core_redirect.sh b/package/firewall/files/lib/core_redirect.sh
index b51f79390..15d01b0a7 100644
--- a/package/firewall/files/lib/core_redirect.sh
+++ b/package/firewall/files/lib/core_redirect.sh
@@ -26,8 +26,8 @@ fw_load_redirect() {
fw_callback pre redirect
- [ -n "$redirect_src" -a -n "$redirect_dest_ip" ] || {
- fw_die "redirect ${redirect_name}: needs src and dest_ip"
+ [ -n "$redirect_src" -a -n "$redirect_dest_ip$redirect_dest_port" ] || {
+ fw_die "redirect ${redirect_name}: needs src and dest_ip or dest_port"
}
list_contains FW_CONNTRACK_ZONES $redirect_src || \
@@ -53,6 +53,7 @@ fw_load_redirect() {
--to-destination ${redirect_dest_ip}${redirect_dest_port:+:$nat_dest_port} \
}
+ [ -n "$redirect_dest_ip" ] && \
fw add $mode f zone_${redirect_src}_forward ACCEPT ^ { $redirect_src_ip $redirect_dest_ip } { \
-d $redirect_dest_ip \
${redirect_proto:+-p $redirect_proto} \