adds more sanity checks to uci firewall

[openwrt/svn-archive/archive.git] / package / firewall / files / uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index ff82f8bf0b49562c542549041a26a80112adc392..99663c67717d2402c52a13cec601d9a23b07a39a 100755 (executable)
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -181,6 +181,8 @@ fw_rule() {
        [ -n "$dest" ] && TARGET=zone_${dest}_$target || TARGET=$target
        [ -n "$dest_port" -a -z "$proto" ] && { \
                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; }
        $IPTABLES -I $ZONE 1 \
                ${proto:+-p $proto} \
                ${src_ip:+-s $src_ip} \
@@ -211,7 +213,7 @@ fw_redirect() {
        local src_mac
        local dest_ip
        local dest_port
-       local protocol
+       local proto
        
        config_get src $1 src
        config_get src_ip $1 src_ip
@@ -220,20 +222,22 @@ fw_redirect() {
        config_get src_mac $1 src_mac
        config_get dest_ip $1 dest_ip
        config_get dest_port $1 dest_port
-       config_get protocol $1 protocol
+       config_get proto $1 proto
        [ -z "$src" -o -z "$dest_ip" ] && { \
                echo "redirect needs src and dest_ip"; return ; }
-       [ -n "$dest_port" -a -z "$protocol" ] && { \
+       [ -n "$dest_port" -a -z "$proto" ] && { \
                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; }
        $IPTABLES -A zone_${src}_prerouting -t nat \
-               ${protocol:+-p $protocol} \
+               ${proto:+-p $proto} \
                ${src_ip:+-s $src_ip} \
                ${src_port:+--sport $src_port} \
                ${src_dport:+--dport $src_dport} \
                ${src_mac:+-m mac --mac-source $src_mac} \
                -j DNAT --to-destination $dest_ip${dest_port:+:$dest_port}
        $IPTABLES -I zone_${src}_forward 1 \
-               ${protocol:+-p $protocol} \
+               ${proto:+-p $proto} \
                -d $dest_ip \
                ${src_ip:+-s $src_ip} \
                ${src_port:+--sport $src_port} \