fix kmod-ipt-imq module generation (closes: #3896)

[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 27e9dd7..ff82f8b 100755 (executable)
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -163,6 +163,7 @@ fw_rule() {
        local dest_port
        local proto
        local target
        local dest_port
        local proto
        local target

+       local ruleset

 
        config_get src $1 src
        config_get src_ip $1 src_ip
 
        config_get src $1 src
        config_get src_ip $1 src_ip


@@ -222,11 +223,11 @@ fw_redirect() {
        config_get protocol $1 protocol
        [ -z "$src" -o -z "$dest_ip" ] && { \
                echo "redirect needs src and dest_ip"; return ; }
        config_get protocol $1 protocol
        [ -z "$src" -o -z "$dest_ip" ] && { \
                echo "redirect needs src and dest_ip"; return ; }

-       [ -n "$dest_port" -a -z "$proto" ] && { \
+       [ -n "$dest_port" -a -z "$protocol" ] && { \

                echo "dport may only be used it proto is defined"; return; }
        $IPTABLES -A zone_${src}_prerouting -t nat \
                ${protocol:+-p $protocol} \
                echo "dport may only be used it proto is defined"; return; }
        $IPTABLES -A zone_${src}_prerouting -t nat \
                ${protocol:+-p $protocol} \

-               ${src_ip:+-s $srcdip} \
+               ${src_ip:+-s $src_ip} \

                ${src_port:+--sport $src_port} \
                ${src_dport:+--dport $src_dport} \
                ${src_mac:+-m mac --mac-source $src_mac} \
                ${src_port:+--sport $src_port} \
                ${src_dport:+--dport $src_dport} \
                ${src_mac:+-m mac --mac-source $src_mac} \


@@ -234,7 +235,7 @@ fw_redirect() {
        $IPTABLES -I zone_${src}_forward 1 \
                ${protocol:+-p $protocol} \
                -d $dest_ip \
        $IPTABLES -I zone_${src}_forward 1 \
                ${protocol:+-p $protocol} \
                -d $dest_ip \

-               ${src_ip:+-s $srcdip} \
+               ${src_ip:+-s $src_ip} \

                ${src_port:+--sport $src_port} \
                ${dest_port:+--dport $dest_port} \
                ${src_mac:+-m mac --mac-source $src_mac} \
                ${src_port:+--sport $src_port} \
                ${dest_port:+--dport $dest_port} \
                ${src_mac:+-m mac --mac-source $src_mac} \