X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1d1f04a661e82d3ce92c6e32919e46643cba0a2b..eeaf181efcb6669808ce03cc95f744245cd789a7:/package/firewall/files/uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index 5798b7fc4..f46a533ef 100755
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -157,6 +157,9 @@ fw_defaults() {
 	config_get syn_rate $1 syn_rate
 	config_get syn_burst $1 syn_burst
 	[ "$syn_flood" == "1" ] && load_synflood $syn_rate $syn_burst
+	
+	echo "Adding custom chains"
+	fw_custom_chains
 
 	$IPTABLES -N input
 	$IPTABLES -N output
@@ -170,9 +173,6 @@ fw_defaults() {
 	$IPTABLES -A reject -p tcp -j REJECT --reject-with tcp-reset
 	$IPTABLES -A reject -j REJECT --reject-with icmp-port-unreachable
 
-	echo "Adding custom chains"
-	fw_custom_chains
-
 	fw_set_chain_policy INPUT "$DEF_INPUT"
 	fw_set_chain_policy OUTPUT "$DEF_OUTPUT"
 	fw_set_chain_policy FORWARD "$DEF_FORWARD"
@@ -216,10 +216,13 @@ fw_rule() {
 	config_get proto $1 proto
 	config_get target $1 target
 	config_get ruleset $1 ruleset
-
+	
+	ZONE=input
+	TARGET=$target
 	[ -z "$target" ] && target=DROP
-	[ -n "$src" ] && ZONE=zone_$src || ZONE=input
-	[ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target
+	[ -n "$src" -a -z "$dest" ] && ZONE=zone_$src
+	[ -n "$src" -a -n "$dest" ] && ZONE=zone_${src}_forward
+	[ -n "$dest" ] && TARGET=zone_${dest}_$target
 	add_rule() {
 		$IPTABLES -I $ZONE 1 \
 			${proto:+-p $proto} \