Unify portrange-support in firewall rule generator fixes #4404

SVN-Revision: 13791
2009-01-01 13:05:16 +00:00 · 2009-01-01 13:05:16 +00:00 · d1049f535a
parent 35078a6a52
commit d1049f535a
1 changed files with 10 additions and 0 deletions
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@ -217,6 +217,16 @@ fw_rule() {
 	config_get proto $1 proto
 	config_get target $1 target
 	config_get ruleset $1 ruleset
+
+	src_port_first=${src_port%-*}
+	src_port_last=${src_port#*-}
+	[ "$src_port_first" -ne "$src_port_last" ] && { \
+		src_port="$src_port_first:$src_port_last"; }
+
+	dest_port_first=${dest_port%-*}
+	dest_port_last=${dest_port#*-}
+	[ "$dest_port_first" -ne "$dest_port_last" ] && { \
+		dest_port="$dest_port_first:$dest_port_last"; }
 	
 	ZONE=input
 	TARGET=$target