make sure uci firewall reverts its states when stopped

[openwrt.git] / package / firewall / files / uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index f6e82bc..5063d9e 100755 (executable)
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -229,6 +229,17 @@ fw_redirect() {
                echo "dport may only be used it proto is defined"; return; }
        [ -n "$src_port" -a -z "$proto" ] && { \
                echo "sport may only be used it proto is defined"; return; }
+
+       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"; }
+
+       src_dport_first=${src_dport%-*}
+       src_dport_last=${src_dport#*-}
+       [ "$src_dport_first" -ne "$src_dport_last" ] && { \
+               src_dport="$src_dport_first:$src_dport_last"; }
+
        $IPTABLES -A zone_${src}_prerouting -t nat \
                ${proto:+-p $proto} \
                ${src_ip:+-s $src_ip} \
@@ -236,6 +247,12 @@ fw_redirect() {
                ${src_dport:+--dport $src_dport} \
                ${src_mac:+-m mac --mac-source $src_mac} \
                -j DNAT --to-destination $dest_ip${dest_port:+:$dest_port}
+
+       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"; }
+
        $IPTABLES -I zone_${src}_forward 1 \
                ${proto:+-p $proto} \
                -d $dest_ip \
@@ -285,10 +302,10 @@ fw_init() {
        config_foreach fw_forwarding forwarding
        echo "Loading redirects"
        config_foreach fw_redirect redirect
-       echo "Loading includes"
-       config_foreach fw_include include
        echo "Adding custom chains"
        fw_custom_chains
+       echo "Loading includes"
+       config_foreach fw_include include
 
        uci_set_state firewall core "" firewall_state 
        uci_set_state firewall core loaded 1
@@ -306,4 +323,5 @@ fw_stop() {
        $IPTABLES -P INPUT ACCEPT
        $IPTABLES -P OUTPUT ACCEPT
        $IPTABLES -P FORWARD ACCEPT
+       uci_revert_state firewall core
 }